diff --git a/modules/mailserver.nix b/modules/mailserver.nix
new file mode 100644
index 0000000..372bfa7
--- /dev/null
+++ b/modules/mailserver.nix
@@ -0,0 +1,52 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+{
+ mailserver = {
+  enable = true;
+  fqdn = "mail.cochrun.xyz";
+  domains = [ "cochrun.xyz" ];
+  enableManageSieve = true;
+  mailDirectory = "/home/chris/mailserver/docker-data/mail-data";
+  mailboxes = {
+    Archive = {
+      auto = "subsribe";
+      specialUse = "Archive";
+    }
+    Drafts = {
+      auto = "subscribe";
+      specialUse = "Drafts";
+    };
+    Junk = {
+      auto = "subscribe";
+      specialUse = "Junk";
+    };
+    Sent = {
+      auto = "subscribe";
+      specialUse = "Sent";
+    };
+    Trash = {
+      auto = "no";
+      specialUse = "Trash";
+    };
+  };
+  useFsLayout = true;
+  hierarchySeparator = "/";
+  certificateScheme = "acme";
+  certificateFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mail.cochrun.xyz/mail.cochrun.xyz.crt";
+  keyFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mail.cochrun.xyz/mail.cochrun.xyz.key";
+  loginAccounts = {
+    "chris@cochrun.xyz" = {
+      hashedPasswordFile = "/home/chris/mailp";
+      aliases = [
+        "postmaster@cochrun.xyz"
+        "cxda@cochrun.xyz"
+        "ceth@cochrun.xyz"
+        "clocb@cochrun.xyz"
+        "higdry@cochrun.xyz"
+        "clin@cochrun.xyz"
+      ]
+    }
+  }
+ }
+}
diff --git a/systems/dalinar/configuration.nix b/systems/dalinar/configuration.nix
index 9dad816..c567ebd 100644
--- a/systems/dalinar/configuration.nix
+++ b/systems/dalinar/configuration.nix
@@ -182,54 +182,6 @@
   #   nodes.clightning.enable = true;
   # };
 
- #mailserver = {
- #  enable = true;
- #  fqdn = "mail.cochrun.xyz";
- #  domains = [ "cochrun.xyz" ];
- #  enableManageSieve = true;
- #  mailDirectory = "/storage/vmail";
- #  mailboxes = {
- #    Archive = {
- #      auto = "subsribe";
- #      specialUse = "Archive";
- #    }
- #    Drafts = {
- #      auto = "subscribe";
- #      specialUse = "Drafts";
- #    };
- #    Junk = {
- #      auto = "subscribe";
- #      specialUse = "Junk";
- #    };
- #    Sent = {
- #      auto = "subscribe";
- #      specialUse = "Sent";
- #    };
- #    Trash = {
- #      auto = "no";
- #      specialUse = "Trash";
- #    };
- #  };
- #  useFsLayout = true;
- #  hierarchySeparator = "/";
- #  certificateScheme = 1;
- #  certificateFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mail.cochrun.xyz/mail.cochrun.xyz.crt";
- #  keyFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/mail.cochrun.xyz/mail.cochrun.xyz.key";
- #  loginAccounts = {
- #    "chris@cochrun.xyz" = {
- #      hashedPasswordFile = "/home/chris/mailp";
- #      aliases = [
- #        "postmaster@cochrun.xyz"
- #        "cxda@cochrun.xyz"
- #        "ceth@cochrun.xyz"
- #        "clocb@cochrun.xyz"
- #        "higdry@cochrun.xyz"
- #        "clin@cochrun.xyz"
- #      ]
- #    }
- #  }
- #}
-
   # DDCLIENT
   services.ddclient = {
     enable = true;