diff options
Diffstat (limited to 'flake.nix')
-rw-r--r-- | flake.nix | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -136,6 +136,8 @@ | |||
136 | packages = | 136 | packages = |
137 | let installerPackages = system: optionalAttrs (!(isNull installerConfig)) (mapAttrs' (profile: value: nameValuePair "installer-${profile}" value.output) installers.${system}); | 137 | let installerPackages = system: optionalAttrs (!(isNull installerConfig)) (mapAttrs' (profile: value: nameValuePair "installer-${profile}" value.output) installers.${system}); |
138 | in forAllSystems (system: systemPkgs: self.overlays.default (self.legacyPackages.${system}) systemPkgs // installerPackages system); | 138 | in forAllSystems (system: systemPkgs: self.overlays.default (self.legacyPackages.${system}) systemPkgs // installerPackages system); |
139 | |||
140 | activateHomeManager = system: base: (deploy-rs.lib.${system}.activate.custom // { dryActivate = "DRY_RUN=1 $PROFILE/activate"; }) base.activationPackage "$PROFILE/activate"; | ||
139 | in | 141 | in |
140 | { | 142 | { |
141 | nixosModules = | 143 | nixosModules = |
@@ -183,7 +185,7 @@ | |||
183 | }; | 185 | }; |
184 | } // (mapAttrs (_user: usercfg: { | 186 | } // (mapAttrs (_user: usercfg: { |
185 | user = usercfg.home.username; | 187 | user = usercfg.home.username; |
186 | path = deploy-rs.lib.${self.nixosConfigurations.${hostname}.config.nixpkgs.system}.activate.home-manager usercfg.home; | 188 | path = activateHomeManager (self.nixosConfigurations.${hostname}.config.nixpkgs.system) usercfg.home; |
187 | }) self.nixosConfigurations.${hostname}.config.home-manager.users); | 189 | }) self.nixosConfigurations.${hostname}.config.home-manager.users); |
188 | }) (nixImport { dir = ./hosts; _import = (_path: name: name); }); | 190 | }) (nixImport { dir = ./hosts; _import = (_path: name: name); }); |
189 | 191 | ||