Refactor: Use better file layout

17 files changed, 42 insertions, 42 deletions

diff --git a/flake.nix b/flake.nix
index 554e168..36ae34e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,32 +20,7 @@
         ./hosts/server1/configuration.nix
         simple-nixos-mailserver.nixosModule
         {
-          mailserver = {
-            enable = true;
-            fqdn = "server1.vhack.eu";
-            domains = ["vhack.eu"];
-
-            mailDirectory = "/srv/mail/vmail";
-            dkimKeyDirectory = "/srv/mail/dkim";
-            backup.snapshotRoot = "/srv/mail/backup";
-
-            loginAccounts = {
-              "sils@vhack.eu" = {
-                hashedPasswordFile = "/srv/mail/.secrets/silsmailpswd";
-              };
-            };
-
-            extraVirtualAliases = {
-              "abuse@vhack.eu" = ["sils@vhack.eu"];
-              "postmaster@vhack.eu" = ["sils@vhack.eu"];
-              "admin@vhack.eu" = ["sils@vhack.eu"];
-            };
-
-            sieveDirectory = "/srv/mail/sieve";
-            keyFile = "/var/lib/acme/server1.vhack.eu/key.pem";
-            certificateScheme = 1;
-            certificateFile = "/var/lib/acme/server1.vhack.eu/fullchain.pem";
-          };
+          mailserver = import ./system/mail {};
         }
       ];
     };
diff --git a/hosts/server1/configuration.nix b/hosts/server1/configuration.nix
index 729ef0f..694b6b4 100644
--- a/hosts/server1/configuration.nix
+++ b/hosts/server1/configuration.nix
@@ -3,8 +3,6 @@
     ./networking.nix # network configuration that just works
 
     ../../system
-
-    ../../services
   ];
 
   boot.cleanTmpDir = true;
diff --git a/hosts/server1/networking.nix b/hosts/server1/networking.nix
index cc6d816..027bc27 100644
--- a/hosts/server1/networking.nix
+++ b/hosts/server1/networking.nix
@@ -44,6 +44,5 @@
   };
   services.udev.extraRules = ''
     ATTR{address}=="66:22:6d:82:93:9b", NAME="eth0"
-
   '';
 }
diff --git a/services/default.nix b/services/default.nix
deleted file mode 100644
index c301ba1..0000000
--- a/services/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{config, ...}: {
-  imports = [
-    ./services/acme.nix
-    ./services/nginx.nix
-    ./services/nix.nix
-    ./services/opensshd.nix
-    ./services/rust-motd.nix
-  ];
-}
diff --git a/system/default.nix b/system/default.nix
index 2af4982..9aa5d9e 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -1,8 +1,9 @@
 {config, ...}: {
   imports = [
-    ./system/fileSystemLayouts.nix
-    ./system/hardware.nix
-    ./system/packages.nix
-    ./system/users.nix
+    ./file_system_layouts
+    ./hardware
+    ./packages
+    ./services
+    ./users
   ];
 }
diff --git a/system/system/fileSystemLayouts.nix b/system/file_system_layouts/default.nix
index 9d03a05..9d03a05 100644
--- a/system/system/fileSystemLayouts.nix
+++ b/system/file_system_layouts/default.nix
diff --git a/system/system/hardware.nix b/system/hardware/default.nix
index c4c7dc9..c4c7dc9 100644
--- a/system/system/hardware.nix
+++ b/system/hardware/default.nix
diff --git a/system/mail/default.nix b/system/mail/default.nix
new file mode 100644
index 0000000..b09f8f1
--- /dev/null
+++ b/system/mail/default.nix
@@ -0,0 +1,27 @@
+# vim: ts=2
+{...}: {
+  enable = true;
+  fqdn = "server1.vhack.eu";
+  domains = ["vhack.eu"];
+
+  mailDirectory = "/srv/mail/vmail";
+  dkimKeyDirectory = "/srv/mail/dkim";
+  backup.snapshotRoot = "/srv/mail/backup";
+
+  loginAccounts = {
+    "sils@vhack.eu" = {
+      hashedPasswordFile = "/srv/mail/.secrets/silsmailpswd";
+    };
+  };
+
+  extraVirtualAliases = {
+    "abuse@vhack.eu" = ["sils@vhack.eu"];
+    "postmaster@vhack.eu" = ["sils@vhack.eu"];
+    "admin@vhack.eu" = ["sils@vhack.eu"];
+  };
+
+  sieveDirectory = "/srv/mail/sieve";
+  keyFile = "/var/lib/acme/server1.vhack.eu/key.pem";
+  certificateScheme = 1;
+  certificateFile = "/var/lib/acme/server1.vhack.eu/fullchain.pem";
+}
diff --git a/system/system/packages.nix b/system/packages/default.nix
index 4d33c6e..4d33c6e 100644
--- a/system/system/packages.nix
+++ b/system/packages/default.nix
diff --git a/services/services/acme.nix b/system/services/acme/default.nix
index a163e77..a163e77 100644
--- a/services/services/acme.nix
+++ b/system/services/acme/default.nix
diff --git a/system/services/default.nix b/system/services/default.nix
new file mode 100644
index 0000000..acf20f5
--- /dev/null
+++ b/system/services/default.nix
@@ -0,0 +1,9 @@
+{config, ...}: {
+  imports = [
+    ./acme
+    ./nginx
+    ./nix
+    ./opensshd
+    ./rust-motd
+  ];
+}
diff --git a/services/services/minecraft.nix b/system/services/minecraft/default.nix
index 754c974..754c974 100644
--- a/services/services/minecraft.nix
+++ b/system/services/minecraft/default.nix
diff --git a/services/services/nginx.nix b/system/services/nginx/default.nix
index 204783b..204783b 100644
--- a/services/services/nginx.nix
+++ b/system/services/nginx/default.nix
diff --git a/services/services/nix.nix b/system/services/nix/default.nix
index bd562ec..bd562ec 100644
--- a/services/services/nix.nix
+++ b/system/services/nix/default.nix
diff --git a/services/services/opensshd.nix b/system/services/opensshd/default.nix
index cb9f2ba..cb9f2ba 100644
--- a/services/services/opensshd.nix
+++ b/system/services/opensshd/default.nix
diff --git a/services/services/rust-motd.nix b/system/services/rust-motd/default.nix
index 21bc1cd..21bc1cd 100644
--- a/services/services/rust-motd.nix
+++ b/system/services/rust-motd/default.nix
diff --git a/system/system/users.nix b/system/users/default.nix
index 34e1648..34e1648 100644
--- a/system/system/users.nix
+++ b/system/users/default.nix