summaryrefslogtreecommitdiff
path: root/flake.nix
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-01-03 14:41:45 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-01-03 20:18:01 +0100
commit20ea49851dfd6e37d40d8a8a924676b95bf0d98d (patch)
tree23b1415f78b67ec810bc4065418b67d9a13cd312 /flake.nix
parentccc22d94f88fdff18dfb5758c1974148e32770db (diff)
downloadnixos-20ea49851dfd6e37d40d8a8a924676b95bf0d98d.tar
nixos-20ea49851dfd6e37d40d8a8a924676b95bf0d98d.tar.gz
nixos-20ea49851dfd6e37d40d8a8a924676b95bf0d98d.tar.bz2
nixos-20ea49851dfd6e37d40d8a8a924676b95bf0d98d.tar.xz
nixos-20ea49851dfd6e37d40d8a8a924676b95bf0d98d.zip
remove broken home-manager activation
Diffstat (limited to 'flake.nix')
-rw-r--r--flake.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index 8faa9aa9..fd139d63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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