From b8490f2b074388a4c372dbc641a5a1b83f11d22f Mon Sep 17 00:00:00 2001 From: Jacob Hinkle Date: Mon, 26 Sep 2022 10:09:49 -0400 Subject: [PATCH] Factor user home out and place in homeManagerConfigurations --- flake.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 7c413c0..b5ee6d1 100644 --- a/flake.nix +++ b/flake.nix @@ -37,7 +37,15 @@ #nixpkgs.overlays = [ nur.overlay ]; imports = [config]; }; - in { + jacobHome = homeManagerConfFor ./home/jacob.nix; + jacobHomeMod = { + home-manager.useUserPackages = true; + home-manager.users.jacob = jacobHome; + }; + in rec { + homeManagerConfigurations = { + jacob = jacobHome; + }; nixosConfigurations = { # Thinkpad T470 laptop buck = nixpkgs.lib.nixosSystem { @@ -46,10 +54,7 @@ nixos-hardware.nixosModules.lenovo-thinkpad-t470s ./machines/buck/configuration.nix home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.users.jacob = homeManagerConfFor ./home/jacob.nix; - } + jacobHomeMod sops-nix.nixosModules.sops ]; }; @@ -61,10 +66,7 @@ nixos-hardware.nixosModules.common-cpu-intel-cpu-only ./machines/pedro/configuration.nix home-manager.nixosModules.home-manager - { - home-manager.useUserPackages = true; - home-manager.users.jacob = homeManagerConfFor ./home/jacob.nix; - } + jacobHomeMod sops-nix.nixosModules.sops ]; };