about summary refs log tree commit diff
path: root/hosts/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'hosts/default.nix')
-rw-r--r--hosts/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/hosts/default.nix b/hosts/default.nix
index 8dc5674..7d1a4f1 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -28,9 +28,7 @@ let
         ];
       };
       extraArgs = { inherit pkgs inputs isIso isHardware user secrets timezone location; hostname = host; };
-      #TODO: FIXME
-      extraSpecialModules = if isIso then extraModules ++ [ "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" ] else extraModules;
-      megaSpecialModules = if isHardware then extraSpecialModules ++ [ ../hardware/${hardware} ] else extraSpecialModules;
+      extraSpecialModules = extraModules ++ lib.optional isHardware  ../hardware/${hardware} ++ lib.optional isIso "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix";
     in
     if isNixOS
     then
@@ -53,7 +51,7 @@ let
                 ];
               };
             }
-          ] ++ megaSpecialModules;
+          ] ++ extraSpecialModules;
         }
     else
       home-manager.lib.homeManagerConfiguration