Replaced substituteAll to replaceVars
This commit is contained in:
parent
8e56cbad99
commit
548b3ad02a
@ -1,21 +1,28 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
user = "olaf";
|
||||
xdg_configHome = "/home/${user}/.config";
|
||||
xdg_configHome = "/home/${user}/.config";
|
||||
shared-programs = import ../shared/home-manager.nix { inherit config pkgs lib; };
|
||||
shared-files = import ../shared/files.nix { inherit config pkgs; };
|
||||
|
||||
polybar-user_modules = builtins.readFile (pkgs.substituteAll {
|
||||
src = ./config/polybar/user_modules.ini;
|
||||
packages = "${xdg_configHome}/polybar/bin/check-nixos-updates.sh";
|
||||
searchpkgs = "${xdg_configHome}/polybar/bin/search-nixos-updates.sh";
|
||||
launcher = "${xdg_configHome}/polybar/bin/launcher.sh";
|
||||
powermenu = "${xdg_configHome}/rofi/bin/powermenu.sh";
|
||||
calendar = "${xdg_configHome}/polybar/bin/popup-calendar.sh";
|
||||
});
|
||||
polybar-user_modules = builtins.readFile (
|
||||
pkgs.replaceVars {
|
||||
src = ./config/polybar/user_modules.ini;
|
||||
packages = "${xdg_configHome}/polybar/bin/check-nixos-updates.sh";
|
||||
searchpkgs = "${xdg_configHome}/polybar/bin/search-nixos-updates.sh";
|
||||
launcher = "${xdg_configHome}/polybar/bin/launcher.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;
|
||||
font0 = "DejaVu Sans:size=12;3";
|
||||
font1 = "feather:size=12;3"; # from overlay
|
||||
@ -31,7 +38,7 @@ in
|
||||
enableNixpkgsReleaseCheck = false;
|
||||
username = "${user}";
|
||||
homeDirectory = "/home/${user}";
|
||||
packages = pkgs.callPackage ./packages.nix {};
|
||||
packages = pkgs.callPackage ./packages.nix { };
|
||||
file = shared-files // import ./files.nix { inherit user; };
|
||||
stateVersion = "21.05";
|
||||
};
|
||||
@ -114,6 +121,8 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
programs = shared-programs // { gpg.enable = true; };
|
||||
programs = shared-programs // {
|
||||
gpg.enable = true;
|
||||
};
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user