modularise lenovo?

1 files changed, 3 insertions, 13 deletions

diff --git a/flake.nix b/flake.nix
index e6cf000..0b3eafa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -67,6 +67,7 @@
             impermanence.nixosModules.impermanence
             agenix.nixosModules.default
             nixos-mailserver.nixosModule
+            noshell.nixosModules.default
             phoenix.nixosModules.default
             nix-zulip'.nixosModules.zulip
             {
@@ -76,18 +77,8 @@
                 nix-zulip'.overlays.default
               ];
             }
-            (
-              if machine.hostname != "109-199-104-83"
-              then
-                {config, ...}: {
-                  imports = [
-                    ./machines/${machine.hostname}/configuration.nix
-                  ];
-                  networking.domain = config.networking.hostName; # temporary fix
-                }
-              else {imports = machine.modules;}
-            )
-          ];
+          ]
+          ++ machine.modules;
       };
     configurationWithHomeManager = machine: (configuration machine
       [
@@ -113,7 +104,6 @@
               )
             );
         }
-        noshell.nixosModules.default
       ]);
   in {
     nixosConfigurations =