diff --git a/home/eww.nix b/home/eww.nix index 328583dd..02abad8b 100644 --- a/home/eww.nix +++ b/home/eww.nix @@ -1,8 +1,9 @@ -{ pkgs, config, ... }: +{ nix-config, pkgs, config, ... }: let inherit (config.home) homeDirectory; inherit (config.lib.stylix.colors.withHashtag) base00 base05; + inherit (nix-config.packages.${pkgs.system}) fluent-icons; inherit (config.xdg.userDirs) download @@ -11,8 +12,6 @@ let pictures videos ; - - fluent-icons = pkgs.callPackage ../packages/fluent-icons.nix { }; in { home.packages = with pkgs; [ eww ]; diff --git a/home/hyprland.nix b/home/hyprland.nix index a5584889..135d0304 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,13 +1,12 @@ -{ pkgs, lib, ... }: +{ nix-config, pkgs, lib, ... }: let inherit (lib) mkForce; + inherit (nix-config.packages.${pkgs.system}) osu-backgrounds; opacity = "0.95"; super = "SUPER"; - osu-backgrounds = pkgs.callPackage ../packages/osu-backgrounds.nix { }; - gapsScript = "hypr/gaps.fish"; randomBackgroundScript = "hypr/random-bg.fish"; swapBackgroundScript = "hypr/swap-bg.fish"; diff --git a/home/librewolf.nix b/home/librewolf.nix index 5617c3e9..3b687f62 100644 --- a/home/librewolf.nix +++ b/home/librewolf.nix @@ -8,8 +8,7 @@ let inherit (lib) mkIf singleton; - - friendlyfox = pkgs.callPackage ../packages/friendlyfox.nix { }; + inherit (nix-config.packages.${pkgs.system}) friendlyfox; in { programs.librewolf = { diff --git a/hosts/phone/configuration.nix b/hosts/phone/configuration.nix index a0fa7a7e..20e6dafd 100644 --- a/hosts/phone/configuration.nix +++ b/hosts/phone/configuration.nix @@ -11,8 +11,7 @@ let inherit (lib.gvariant) mkTuple mkUint32; inherit (config.modules.system) username; inherit (builtins) attrValues; - - phosh-backgrounds = pkgs.callPackage ../../packages/phosh-backgrounds.nix { }; + inherit (self.packages.${pkgs.system}) phosh-backgrounds; getColorCh = colorName: channel: config.lib.stylix.colors."${colorName}-rgb-${channel}"; diff --git a/modules/desktop.nix b/modules/desktop.nix index a6382699..a72655eb 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -35,7 +35,7 @@ let noto-fonts-emoji ; - stylix-background = pkgs.callPackage ../packages/stylix-background.nix { + stylix-background = nix-config.packages.${pkgs.system}.stylix-background.override { color = config.lib.stylix.colors.base00; };