olaf/nixos-config_to_rule_them_all
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced substituteAll to replaceVars

Browse Source
This commit is contained in:
Olaf Kolkman 2025-05-17 21:34:42 +02:00
parent 8e56cbad99
commit 548b3ad02a
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modules/nixos/home-manager.nix
View File

@ -1,21 +1,28 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
let let
user = "olaf"; user = "olaf";
xdg_configHome = "/home/${user}/.config"; xdg_configHome = "/home/${user}/.config";
shared-programs = import ../shared/home-manager.nix { inherit config pkgs lib; }; shared-programs = import ../shared/home-manager.nix { inherit config pkgs lib; };
shared-files = import ../shared/files.nix { inherit config pkgs; }; shared-files = import ../shared/files.nix { inherit config pkgs; };
polybar-user_modules = builtins.readFile (pkgs.substituteAll { polybar-user_modules = builtins.readFile (
src = ./config/polybar/user_modules.ini; pkgs.replaceVars {
packages = "${xdg_configHome}/polybar/bin/check-nixos-updates.sh"; src = ./config/polybar/user_modules.ini;
searchpkgs = "${xdg_configHome}/polybar/bin/search-nixos-updates.sh"; packages = "${xdg_configHome}/polybar/bin/check-nixos-updates.sh";
launcher = "${xdg_configHome}/polybar/bin/launcher.sh"; searchpkgs = "${xdg_configHome}/polybar/bin/search-nixos-updates.sh";
powermenu = "${xdg_configHome}/rofi/bin/powermenu.sh"; launcher = "${xdg_configHome}/polybar/bin/launcher.sh";
calendar = "${xdg_configHome}/polybar/bin/popup-calendar.sh"; powermenu = "${xdg_configHome}/rofi/bin/powermenu.sh";
}); calendar = "${xdg_configHome}/polybar/bin/popup-calendar.sh";
}
);
polybar-config = pkgs.substituteAll { polybar-config = pkgs.replaceVars {
src = ./config/polybar/config.ini; src = ./config/polybar/config.ini;
font0 = "DejaVu Sans:size=12;3"; font0 = "DejaVu Sans:size=12;3";
font1 = "feather:size=12;3"; # from overlay font1 = "feather:size=12;3"; # from overlay
@ -31,7 +38,7 @@ in
enableNixpkgsReleaseCheck = false; enableNixpkgsReleaseCheck = false;
username = "${user}"; username = "${user}";
homeDirectory = "/home/${user}"; homeDirectory = "/home/${user}";
packages = pkgs.callPackage ./packages.nix {}; packages = pkgs.callPackage ./packages.nix { };
file = shared-files // import ./files.nix { inherit user; }; file = shared-files // import ./files.nix { inherit user; };
stateVersion = "21.05"; stateVersion = "21.05";
}; };
@ -114,6 +121,8 @@ in
}; };
}; };
programs = shared-programs // { gpg.enable = true; }; programs = shared-programs // {
gpg.enable = true;
};
} }