hosts/bomberman/system/default.nix

@@ -1,4 +1,4 @@
-{ mailserver, config, ... }:
+{ config, ... }:
 {
   imports = [
     ./hardware
@@ -14,13 +14,11 @@
     ../../../modules/system/programs/git
     ../../../modules/system/programs/security
     ../../../modules/system/services/common
+    ../../../modules/system/services/server/mailserver/simplenix
 
     # Misc
     ../../../overlays
     ../../../variables
-
-    # Imports
-    mailserver.nixosModule
   ];
 
   networking.hostName = "bomberman";

hosts/cyberspark/system/default.nix

@@ -15,6 +15,7 @@
     ../../../modules/system/programs/security
     ../../../modules/system/services/common
     ../../../modules/system/services/server
+    ../../../modules/system/services/server/mailserver/roundcube
 
     # Misc
     ../../../overlays

modules/system/services/server/mailserver/default.nix

@@ -1,49 +1,7 @@
-{ pkgs, config, ... }: 
+{ ... }: 
 {
   imports = [
-    ./nginx
+    ./simplenix
     ./roundcube
   ];
-
-  mailserver = rec {
-    enable = true;
-    openFirewall = false;
-    domains = [ "${config.secrets.jimDomain}" ];
-    fqdn = "mx.${config.secrets.jimDomain}";
-    certificateScheme = "acme-nginx";
-    localDnsResolver = false;
-    redis.port = 1515;
-
-    # Dmarc info
-    dmarcReporting = {
-      enable = true;
-      domain = "${config.secrets.jimDomain}";
-      localpart = "noreply";
-      organizationName = "Jimbo's Files";
-    };
-        
-    # A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
-    loginAccounts = {
-      "noreply@${config.secrets.jimDomain}" = {
-        hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
-        sendOnly = true;
-      };    
-      "jimbo@${config.secrets.jimDomain}" = {
-        hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
-        aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ];
-      };
-      "lunamoonlight@${config.secrets.jimDomain}" = {
-        hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
-      };
-      "freecorn1854@${config.secrets.jimDomain}" = {
-        hashedPasswordFile = pkgs.writeText "freecorn" config.secrets.freecornMailHash;
-      };
-      "tinyattack09@${config.secrets.jimDomain}" = {
-        hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
-      };
-    };
-  };
-
-  # Assign the correct port
-  services.redis.servers.rspamd.port = 1515;
 }

modules/system/services/server/mailserver/simplenix/default.nix

@@ -0,0 +1,49 @@
+{ mailserver, pkgs, config, ... }: 
+{
+  imports = [
+    ./nginx
+    mailserver.nixosModule
+  ];
+
+  mailserver = rec {
+    enable = true;
+    openFirewall = false;
+    domains = [ "${config.secrets.jimDomain}" ];
+    fqdn = "mx.${config.secrets.jimDomain}";
+    certificateScheme = "acme-nginx";
+    localDnsResolver = false;
+    redis.port = 1515;
+
+    # Dmarc info
+    dmarcReporting = {
+      enable = true;
+      domain = "${config.secrets.jimDomain}";
+      localpart = "noreply";
+      organizationName = "Jimbo's Files";
+    };
+        
+    # A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
+    loginAccounts = {
+      "noreply@${config.secrets.jimDomain}" = {
+        hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
+        sendOnly = true;
+      };    
+      "jimbo@${config.secrets.jimDomain}" = {
+        hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
+        aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ];
+      };
+      "lunamoonlight@${config.secrets.jimDomain}" = {
+        hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
+      };
+      "freecorn1854@${config.secrets.jimDomain}" = {
+        hashedPasswordFile = pkgs.writeText "freecorn" config.secrets.freecornMailHash;
+      };
+      "tinyattack09@${config.secrets.jimDomain}" = {
+        hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
+      };
+    };
+  };
+
+  # Assign the correct port
+  services.redis.servers.rspamd.port = 1515;
+}