From 633135b9099b913dfd1ccf18f4c59d858bd57c2e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 3 Jan 2021 14:41:45 +0100 Subject: remove broken home-manager activation --- flake.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 8faa9aa9..fd139d63 100644 --- a/flake.nix +++ b/flake.nix @@ -107,7 +107,6 @@ forAllSystems = f: mapAttrs f nixpkgs.legacyPackages; forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); - activateHomeManagerConfigurations = forAllSystems (system: _pkgs: mapAttrs' (configName: hmConfig: nameValuePair "${configName}-activate" { type = "app"; program = "${hmConfig.home.activationPackage}/activate"; }) self.homeManagerConfigurations); activateNixosConfigurations = forAllSystems (system: _pkgs: mapAttrs' (hostName: nixosConfig: nameValuePair "${hostName}-activate" { type = "app"; program = "${nixosConfig.config.system.build.toplevel}/bin/switch-to-configuration"; }) self.nixosConfigurations); overlayPaths = recImport rec { dir = ./overlays; _import = (path: _name: dir + "/${path}"); } // { pkgs = ./pkgs; }; @@ -124,7 +123,6 @@ nixosConfigurations = recImport rec { dir = ./hosts; _import = mkNixosConfiguration dir; }; homeManagerModules = recImport rec { dir = ./home-modules; }; - 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))); overlay = import overlayPaths.pkgs; overlays = mapAttrs (_name: path: import path) overlayPaths; @@ -136,7 +134,7 @@ legacyPackages = forAllSystems (system: systemPkgs: recursiveUpdate systemPkgs self.packages.${system}); - apps = recursiveUpdate activateNixosConfigurations activateHomeManagerConfigurations; + apps = activateNixosConfigurations; devShell = forAllSystems (system: systemPkgs: import ./shell.nix { pkgs = self.legacyPackages.${system}; }); -- cgit v1.2.3