diff options
-rw-r--r-- | flake.nix | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -107,7 +107,6 @@ | |||
107 | forAllSystems = f: mapAttrs f nixpkgs.legacyPackages; | 107 | forAllSystems = f: mapAttrs f nixpkgs.legacyPackages; |
108 | forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); | 108 | forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); |
109 | 109 | ||
110 | activateHomeManagerConfigurations = forAllSystems (system: _pkgs: mapAttrs' (configName: hmConfig: nameValuePair "${configName}-activate" { type = "app"; program = "${hmConfig.home.activationPackage}/activate"; }) self.homeManagerConfigurations); | ||
111 | activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations); | 110 | activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations); |
112 | 111 | ||
113 | overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; }; | 112 | overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; }; |
@@ -124,7 +123,6 @@ | |||
124 | nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration dir; }; | 123 | nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration dir; }; |
125 | 124 | ||
126 | homeManagerModules = recImport rec { dir = ./home-modules; }; | 125 | homeManagerModules = recImport rec { dir = ./home-modules; }; |
127 | homeManagerConfigurations = listToAttrs (concatMap ({hostName, users}: mapAttrsToList (userName: homeConfig: nameValuePair "${userName}@${hostName}" homeConfig) users) (mapAttrsToList (hostName: nixosConfig: { inherit hostName; users = nixosConfig.config.home-manager.users; }) (self.nixosConfigurations))); | ||
128 | 126 | ||
129 | overlay = import overlayPaths.pkgs; | 127 | overlay = import overlayPaths.pkgs; |
130 | overlays = mapAttrs (_name: path: import path) overlayPaths; | 128 | overlays = mapAttrs (_name: path: import path) overlayPaths; |
@@ -136,7 +134,7 @@ | |||
136 | 134 | ||
137 | legacyPackages = forAllSystems (system: systemPkgs: recursiveUpdate systemPkgs self.packages.${system}); | 135 | legacyPackages = forAllSystems (system: systemPkgs: recursiveUpdate systemPkgs self.packages.${system}); |
138 | 136 | ||
139 | apps = recursiveUpdate activateNixosConfigurations activateHomeManagerConfigurations; | 137 | apps = activateNixosConfigurations; |
140 | 138 | ||
141 | devShell = forAllSystems (system: systemPkgs: import ./shell.nix { pkgs = self.legacyPackages.${system}; }); | 139 | devShell = forAllSystems (system: systemPkgs: import ./shell.nix { pkgs = self.legacyPackages.${system}; }); |
142 | 140 | ||