extern/nix-config
1
0
Fork 1
mirror of https://github.com/donovanglover/nix-config.git synced 2025-02-16 09:49:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: Replace callPackage with flake package

Browse Source 
Removes the possibility of ../paths breaking.
This commit is contained in:
Donovan Glover 2024-08-30 13:37:28 -04:00
parent 3c89c82ced
commit 0b44a17ca9
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
home/eww.nix
View File

@ -1,8 +1,9 @@
{ pkgs, config, ... }: { nix-config, pkgs, config, ... }:
let let
inherit (config.home) homeDirectory; inherit (config.home) homeDirectory;
inherit (config.lib.stylix.colors.withHashtag) base00 base05; inherit (config.lib.stylix.colors.withHashtag) base00 base05;
inherit (nix-config.packages.${pkgs.system}) fluent-icons;
inherit (config.xdg.userDirs) inherit (config.xdg.userDirs)
download download
@ -11,8 +12,6 @@ let
pictures pictures
videos videos
; ;
fluent-icons = pkgs.callPackage ../packages/fluent-icons.nix { };
in in
{ {
home.packages = with pkgs; [ eww ]; home.packages = with pkgs; [ eww ];

5
home/hyprland.nix
View File

@ -1,13 +1,12 @@
{ pkgs, lib, ... }: { nix-config, pkgs, lib, ... }:
let let
inherit (lib) mkForce; inherit (lib) mkForce;
inherit (nix-config.packages.${pkgs.system}) osu-backgrounds;
opacity = "0.95"; opacity = "0.95";
super = "SUPER"; super = "SUPER";
osu-backgrounds = pkgs.callPackage ../packages/osu-backgrounds.nix { };
gapsScript = "hypr/gaps.fish"; gapsScript = "hypr/gaps.fish";
randomBackgroundScript = "hypr/random-bg.fish"; randomBackgroundScript = "hypr/random-bg.fish";
swapBackgroundScript = "hypr/swap-bg.fish"; swapBackgroundScript = "hypr/swap-bg.fish";

3
home/librewolf.nix
View File

@ -8,8 +8,7 @@
let let
inherit (lib) mkIf singleton; inherit (lib) mkIf singleton;
inherit (nix-config.packages.${pkgs.system}) friendlyfox;
friendlyfox = pkgs.callPackage ../packages/friendlyfox.nix { };
in in
{ {
programs.librewolf = { programs.librewolf = {

3
hosts/phone/configuration.nix
View File

@ -11,8 +11,7 @@ let
inherit (lib.gvariant) mkTuple mkUint32; inherit (lib.gvariant) mkTuple mkUint32;
inherit (config.modules.system) username; inherit (config.modules.system) username;
inherit (builtins) attrValues; inherit (builtins) attrValues;
inherit (self.packages.${pkgs.system}) phosh-backgrounds;
phosh-backgrounds = pkgs.callPackage ../../packages/phosh-backgrounds.nix { };
getColorCh = colorName: channel: config.lib.stylix.colors."${colorName}-rgb-${channel}"; getColorCh = colorName: channel: config.lib.stylix.colors."${colorName}-rgb-${channel}";

2
modules/desktop.nix
View File

@ -35,7 +35,7 @@ let
noto-fonts-emoji 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; color = config.lib.stylix.colors.base00;
}; };