From 7d6ea37da45ed86c65db823771e037c360c2a87e Mon Sep 17 00:00:00 2001
From: Jimbo <jimjam4real@gmail.com>
Date: Thu, 12 Sep 2024 23:08:45 -0400
Subject: [PATCH] This mail server gonna work soon brah I just know it

---
 flake.lock                  | 68 +++----------------------------------
 nixos/server/firewall.nix   |  1 -
 nixos/server/mailserver.nix |  8 +++++
 3 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/flake.lock b/flake.lock
index cddbb86..40bcd57 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,52 +104,11 @@
         "type": "github"
       }
     },
-    "jovian-nixos": {
-      "inputs": {
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1726031155,
-        "narHash": "sha256-QUv5cxy40HRC7vJz9JjbVEmlHT+q1VIuikNJUQZHre0=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "90c68db7d9430bd30e8c5096a0e3dc078b410050",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "jovian-nixos",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1690328911,
-        "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
-        "owner": "zhaofengli",
-        "repo": "nix-github-actions",
-        "rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "ref": "matrix-name",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nix-minecraft": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1726018847,
@@ -185,7 +144,7 @@
       "inputs": {
         "blobs": "blobs",
         "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-24_05": "nixpkgs-24_05",
         "utils": "utils"
       },
@@ -250,22 +209,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1723991338,
-        "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "8a3354191c0d7144db9756a74755672387b702ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1715266358,
         "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
@@ -281,7 +224,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1717602782,
         "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
@@ -296,7 +239,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1725930920,
         "narHash": "sha256-RVhD9hnlTT2nJzPHlAqrWqCkA7T6CYrP41IoVRkciZM=",
@@ -331,11 +274,10 @@
       "inputs": {
         "blender-bin": "blender-bin",
         "home-manager": "home-manager",
-        "jovian-nixos": "jovian-nixos",
         "nix-minecraft": "nix-minecraft",
         "nixos-hardware": "nixos-hardware",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
diff --git a/nixos/server/firewall.nix b/nixos/server/firewall.nix
index 3479b37..f7a3478 100644
--- a/nixos/server/firewall.nix
+++ b/nixos/server/firewall.nix
@@ -45,7 +45,6 @@
               type nat hook postrouting priority 100; policy accept;
               oifname "${ips.netInt}" masquerade
 	      ip saddr ${ips.wgSpan}.0/24 oifname "${ips.netInt}" masquerade comment "WireGuard"
-	      oifname "${ips.wgInt}" masquerade comment "Outgoing Wireguard"
             }
           '';
         };
diff --git a/nixos/server/mailserver.nix b/nixos/server/mailserver.nix
index 0b43647..295e79d 100644
--- a/nixos/server/mailserver.nix
+++ b/nixos/server/mailserver.nix
@@ -8,6 +8,14 @@
     certificateScheme = "acme-nginx";
     localDnsResolver = false;
     redis.port = 1515;
+
+    # Dmarc info
+    dmarcReporting = {
+      enable = true;
+      domain = "${outputs.secrets.jimDomain}";
+      localpart = "noreply";
+      organizationName = "Jimbo's Files";
+    };
         
     # A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
     loginAccounts = {