cleanup config imports

common/auto-update.nix

@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-# Modify auto-update so that it pulls a flake and much 
+# Modify auto-update so that it pulls a flake
 
 let
   cfg = config.system.autoUpgrade;

common/boot/default.nix

@@ -0,0 +1,10 @@
+{ lib, config, pkgs, ... }:
+
+{
+  imports = [
+    ./firmware.nix
+    ./efi.nix
+    ./bios.nix
+    ./luks.nix
+  ];
+}

common/default.nix

@@ -6,22 +6,9 @@
     ./pia.nix
     ./zerotier.nix
     ./auto-update.nix
-    ./boot/firmware.nix
+    ./boot
-    ./boot/efi.nix
+    ./server
-    ./boot/bios.nix
+    ./pc
-    ./boot/luks.nix
-    ./server/nginx.nix
-    ./server/thelounge.nix
-    ./server/mumble.nix
-    ./server/icecast.nix
-    ./server/nginx-stream.nix
-    ./server/matrix.nix
-    ./server/zerobin.nix
-    ./server/gitea.nix
-    ./server/privatebin/privatebin.nix
-    ./server/drastikbot.nix
-    ./server/radio.nix
-    ./pc/de.nix
   ];
 
   system.stateVersion = "20.09";
@@ -48,4 +35,6 @@
     hashedPassword = "$6$TuDO46rILr$gkPUuLKZe3psexhs8WFZMpzgEBGksE.c3Tjh1f8sD0KMC4oV89K2pqAABfl.Lpxu2jVdr5bgvR5cWnZRnji/r/";
   };
   nix.trustedUsers = [ "root" "googlebot" ];
+
+  nix.gc.automatic = true;
 }

common/server/default.nix

@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ./nginx.nix
+    ./thelounge.nix
+    ./mumble.nix
+    ./icecast.nix
+    ./nginx-stream.nix
+    ./matrix.nix
+    ./zerobin.nix
+    ./gitea.nix
+    ./privatebin/privatebin.nix
+    ./drastikbot.nix
+    ./radio.nix
+  ];
+}

flake.nix

@@ -30,7 +30,7 @@
           inherit system;
           modules = [
             path
-            ./common/common.nix
+            ./common
             inputs.simple-nixos-mailserver.nixosModule
             inputs.agenix.nixosModules.age
             ({ lib, ... }: {