diff --git a/nix/nixos-modules/frontend/default.nix b/nix/nixos-modules/frontend/default.nix index f82e1f3..1f34c93 100644 --- a/nix/nixos-modules/frontend/default.nix +++ b/nix/nixos-modules/frontend/default.nix @@ -72,9 +72,6 @@ in useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { - nixosConfig = config; - }; users."${cfg.username}" = import ./home.nix; }; diff --git a/nix/nixos-modules/frontend/home.nix b/nix/nixos-modules/frontend/home.nix index bd82fbd..411c360 100644 --- a/nix/nixos-modules/frontend/home.nix +++ b/nix/nixos-modules/frontend/home.nix @@ -1,7 +1,7 @@ { - nixosConfig, config, lib, + osConfig, pkgs, ... }: @@ -21,7 +21,7 @@ in # TODO exclude in own home-manager module assertions = let - hwSmartcards = nixosConfig.hardware.gpgSmartcards.enable; + hwSmartcards = osConfig.hardware.gpgSmartcards.enable; scDaemon = with config.services.gpg-agent; enable && enableScDaemon; in [ @@ -35,7 +35,7 @@ in } ]; - home.stateVersion = nixosConfig.system.stateVersion; + home.stateVersion = osConfig.system.stateVersion; home.file = { @@ -170,7 +170,7 @@ in } ]; scdaemonSettings = { - disable-ccid = lib.mkIf nixosConfig.services.pcscd.enable true; + disable-ccid = lib.mkIf osConfig.services.pcscd.enable true; }; };