flake: only use and export home if input exists

divnix · Apr 1, 2021 · 480e024 · 480e024
1 parent 87b5f98
commit 480e024
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 39 deletions.
diff --git a/flake.nix b/flake.nix
@@ -54,16 +54,10 @@
           inherit multiPkgs suites extern;
         };
 
-        homeConfigurations = os.mkHomeConfigurations;
-
         nixosModules =
           let moduleList = import ./modules/module-list.nix;
           in lib.pathsToImportedAttrs moduleList;
 
-        homeModules =
-          let moduleList = import ./users/modules/module-list.nix;
-          in lib.pathsToImportedAttrs moduleList;
-
         overlay = import ./pkgs;
         overlays = lib.pathsToImportedAttrs (lib.pathsIn ./overlays);
 
@@ -72,6 +66,11 @@
         templates.flk.path = ./.;
         templates.flk.description = "flk template";
         defaultTemplate = self.templates.flk;
+      } // nixos.lib.optionalAttrs (inputs ? home) {
+        homeConfigurations = os.mkHomeConfigurations;
+        homeModules =
+          let moduleList = import ./users/modules/module-list.nix;
+          in lib.pathsToImportedAttrs moduleList;
 
       } // nixos.lib.optionalAttrs (inputs ? deploy) {
         deploy.nodes = os.mkNodes deploy self.nixosConfigurations;

diff --git a/lib/devos/devosSystem.nix b/lib/devos/devosSystem.nix
@@ -94,10 +94,11 @@ lib.nixosSystem (args // {
           ];
         })).config;
     in
-    moduleList ++ [{
+    moduleList ++ [({ options, ... }: {
       system.build = {
         iso = isoConfig.system.build.isoImage;
+      } // lib.optionalAttrs (options ? home-manager) {
         homes = hmConfig.home-manager.users;
       };
-    }];
+    })];
 })
diff --git a/lib/devos/mkHosts.nix b/lib/devos/mkHosts.nix
@@ -24,39 +24,41 @@ let
           modules;
       };
 
-    global = { config, ... }: {
-      home-manager = {
-        useGlobalPkgs = true;
-        useUserPackages = true;
-
-        extraSpecialArgs = extern.userSpecialArgs // { suites = suites.user; };
-        sharedModules = extern.userModules ++ (builtins.attrValues self.homeModules);
-      };
-
-      hardware.enableRedistributableFirmware = lib.mkDefault true;
+    global = { config, options, ... }: lib.mkMerge [
+      {
+        hardware.enableRedistributableFirmware = lib.mkDefault true;
 
-      nix.nixPath = [
-        "nixpkgs=${nixos}"
-        "nixos-config=${self}/compat/nixos"
-        "home-manager=${inputs.home}"
-      ];
+        nix.nixPath = [
+          "nixpkgs=${nixos}"
+          "nixos-config=${self}/compat/nixos"
+        ] ++ lib.optional (inputs ? home) "home-manager=${inputs.home}";
 
-      nixpkgs.pkgs = lib.mkDefault multiPkgs.${config.nixpkgs.system};
+        nixpkgs.pkgs = lib.mkDefault multiPkgs.${config.nixpkgs.system};
 
-      nix.registry = {
-        devos.flake = self;
-        nixos.flake = nixos;
-        override.flake = inputs.override;
-      };
-
-      nix.extraOptions = ''
-        experimental-features = ${lib.concatStringsSep " "
-          experimentalFeatures
-        }
-      '';
+        nix.registry = {
+          devos.flake = self;
+          nixos.flake = nixos;
+          override.flake = inputs.override;
+        };
 
-      system.configurationRevision = lib.mkIf (self ? rev) self.rev;
-    };
+        nix.extraOptions = ''
+          experimental-features = ${lib.concatStringsSep " "
+            experimentalFeatures
+          }
+        '';
+
+        system.configurationRevision = lib.mkIf (self ? rev) self.rev;
+      }
+      (lib.optionalAttrs (options ? home-manager) {
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+
+          extraSpecialArgs = extern.userSpecialArgs // { suites = suites.user; };
+          sharedModules = extern.userModules ++ (builtins.attrValues self.homeModules);
+        };
+      })
+    ];
 
     # Everything in `./modules/list.nix`.
     flakeModules = { imports = builtins.attrValues self.nixosModules ++ extern.modules; };

diff --git a/tests/default.nix b/tests/default.nix
@@ -41,8 +41,6 @@ in
     '';
   };
 
-  homeTest = self.homeConfigurations."nixos@NixOS".home.activationPackage;
-
   libTests = pkgs.runCommandNoCC "devos-lib-tests"
     {
       buildInputs = [
@@ -70,5 +68,7 @@ in
 
     touch $out
   '';
+} // pkgs.lib.optionalAttrs (self ? homeConfigurations) {
+  homeTest = self.homeConfigurations."nixos@NixOS".home.activationPackage;
 }