use home-manager native osConfig passing

instead of custom specialArgs nixosConfig
main
Felix Stupp 2 months ago
parent 33ec3380dc
commit a6f40827eb
Signed by: zocker
GPG Key ID: 93E1BD26F6B02FB7

@ -72,9 +72,6 @@ in
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = {
nixosConfig = config;
};
users."${cfg.username}" = import ./home.nix; users."${cfg.username}" = import ./home.nix;
}; };

@ -1,7 +1,7 @@
{ {
nixosConfig,
config, config,
lib, lib,
osConfig,
pkgs, pkgs,
... ...
}: }:
@ -21,7 +21,7 @@ in
# TODO exclude in own home-manager module # TODO exclude in own home-manager module
assertions = assertions =
let let
hwSmartcards = nixosConfig.hardware.gpgSmartcards.enable; hwSmartcards = osConfig.hardware.gpgSmartcards.enable;
scDaemon = with config.services.gpg-agent; enable && enableScDaemon; scDaemon = with config.services.gpg-agent; enable && enableScDaemon;
in in
[ [
@ -35,7 +35,7 @@ in
} }
]; ];
home.stateVersion = nixosConfig.system.stateVersion; home.stateVersion = osConfig.system.stateVersion;
home.file = { home.file = {
@ -170,7 +170,7 @@ in
} }
]; ];
scdaemonSettings = { scdaemonSettings = {
disable-ccid = lib.mkIf nixosConfig.services.pcscd.enable true; disable-ccid = lib.mkIf osConfig.services.pcscd.enable true;
}; };
}; };

Loading…
Cancel
Save