diff --git a/flake.nix b/flake.nix index 12b6120..57464ec 100644 --- a/flake.nix +++ b/flake.nix @@ -99,10 +99,7 @@ { "zweili@co-ws-con4" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ - ./home-manager/profiles/work-wsl.nix - inputs.agenix.homeManagerModules.age - ]; + modules = [ ./home-manager/profiles/work-wsl.nix ]; extraSpecialArgs = { inherit inputs; nixosConfig = { diff --git a/lib/mk_computer.nix b/lib/mk_computer.nix index b7c8827..833a9b5 100644 --- a/lib/mk_computer.nix +++ b/lib/mk_computer.nix @@ -48,13 +48,7 @@ inputs.nixpkgs.lib.nixosSystem { { az-username = username; } - inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit inputs system; - }; home-manager.users.${username}.imports = [ "${inputs.self}/home-manager/profiles/${home-module}.nix" ]; diff --git a/lib/mk_raspi.nix b/lib/mk_raspi.nix index 0e7fef8..95c3a7f 100644 --- a/lib/mk_raspi.nix +++ b/lib/mk_raspi.nix @@ -55,13 +55,7 @@ inputs.nixpkgs.lib.nixosSystem { { az-username = username; } - inputs.home-manager.nixosModules.home-manager { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.extraSpecialArgs = { - inherit inputs system; - }; home-manager.users.${username}.imports = [ "${inputs.self}/home-manager/profiles/${home-module}.nix" ]; diff --git a/modules/default.nix b/modules/default.nix index 7f03ad7..7fe7214 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,6 +2,7 @@ { imports = [ inputs.agenix.nixosModules.age + inputs.home-manager.nixosModules.home-manager ./hardware/bluetooth ./hardware/dvd ./hardware/nvidia diff --git a/modules/misc/common/default.nix b/modules/misc/common/default.nix index eb81180..0619cec 100644 --- a/modules/misc/common/default.nix +++ b/modules/misc/common/default.nix @@ -183,6 +183,11 @@ in ''; }; + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { + inherit inputs system; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave