about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBaitinq <manuelpalenzuelamerino@gmail.com>2022-09-20 15:28:23 +0200
committerBaitinq <manuelpalenzuelamerino@gmail.com>2022-09-20 15:28:23 +0200
commit77d203d631d7e903a3f2528ee7027a407bc2b6c2 (patch)
treed4edd089c341412ced4a8528edbaae86b15f5f4b
parentHosts: Remove uneeded "vm" host (diff)
downloadnixos-config-77d203d631d7e903a3f2528ee7027a407bc2b6c2.tar.gz
nixos-config-77d203d631d7e903a3f2528ee7027a407bc2b6c2.tar.bz2
nixos-config-77d203d631d7e903a3f2528ee7027a407bc2b6c2.zip
fmt
-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