diff --git a/flake.lock b/flake.lock
index 4288432..8210253 100644
--- a/flake.lock
+++ b/flake.lock
@@ -104,6 +104,54 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "simple-nixos-mailserver",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "simple-nixos-mailserver",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1702272962,
@@ -120,19 +168,20 @@
         "type": "github"
       }
     },
-    "nixpkgs-24_11": {
+    "nixpkgs-25_05": {
       "locked": {
-        "lastModified": 1734083684,
-        "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=",
+        "lastModified": 1748302896,
+        "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84",
+        "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.11",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "nixos-25.05",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-unstable": {
@@ -185,33 +234,34 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1740932899,
-        "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=",
+        "lastModified": 1748302896,
+        "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347",
+        "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1732014248,
-        "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
+        "lastModified": 1748370509,
+        "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
+        "rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "root": {
@@ -229,20 +279,21 @@
       "inputs": {
         "blobs": "blobs",
         "flake-compat": "flake-compat_2",
+        "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-24_11": "nixpkgs-24_11"
+        "nixpkgs-25_05": "nixpkgs-25_05"
       },
       "locked": {
-        "lastModified": 1734884447,
-        "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=",
+        "lastModified": 1747965231,
+        "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "63209b1def2c9fc891ad271f474a3464a5833294",
+        "rev": "53007af63fade28853408370c4c600a63dd97f41",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.11",
+        "ref": "nixos-25.05",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
diff --git a/flake.nix b/flake.nix
index e949aa2..5c38181 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,12 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     disko.url = "github:nix-community/disko";
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.url = "github:serokell/deploy-rs";
-    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11";
+    simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
     foundryvtt.url = "github:reckenrode/nix-foundryvtt";
   };
 
diff --git a/modules/dokuwiki.nix b/modules/dokuwiki.nix
index aca7648..276799b 100644
--- a/modules/dokuwiki.nix
+++ b/modules/dokuwiki.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.custom.services.dokuwiki;
 
@@ -27,13 +32,11 @@ let
     sops.secrets."usersFile-${name}" = {
       owner = "dokuwiki";
       key = "wiki/${name}/users_file";
-      restartUnits =
-        [ "phpfpm-dokuwiki-${name}.${config.networking.domain}.service" ];
+      restartUnits = [ "phpfpm-dokuwiki-${name}.${config.networking.domain}.service" ];
     };
 
     services.dokuwiki.sites = {
       "${name}.${config.networking.domain}" = {
-        enable = true;
         stateDir = "/nix/var/data/dokuwiki/${name}/data";
         usersFile = config.sops.secrets."usersFile-${name}".path;
         templates = [ templatePackage ];
@@ -42,7 +45,10 @@ let
           title = title;
           template = templateName;
           disableactions = "register";
-          dontlog = [ "debug" "deprecated" ];
+          dontlog = [
+            "debug"
+            "deprecated"
+          ];
         };
       };
     };
@@ -53,7 +59,8 @@ let
       extraConfig = "client_max_body_size 25M;";
     };
   };
-in {
+in
+{
   options.custom.services.dokuwiki = {
 
     enable = lib.mkEnableOption "dokuwiki";
@@ -61,11 +68,11 @@ in {
     secretKeyFile = lib.mkOption { type = lib.types.path; };
   };
 
-  config = lib.mkIf cfg.enable (lib.mkMerge [
-    (configureWiki "anderia" "Choniques d`Arkadia" template-chippedsnow
-      "chippedsnow")
-    (configureWiki "arkadia" "Choniques d`Arkadia" template-chippedsnow
-      "chippedsnow")
-    (configureWiki "scifirpg" "2324" template-darkblue "darkblue")
-  ]);
+  config = lib.mkIf cfg.enable (
+    lib.mkMerge [
+      (configureWiki "anderia" "Choniques d`Arkadia" template-chippedsnow "chippedsnow")
+      (configureWiki "arkadia" "Choniques d`Arkadia" template-chippedsnow "chippedsnow")
+      (configureWiki "scifirpg" "2324" template-darkblue "darkblue")
+    ]
+  );
 }
diff --git a/profiles/hel.nix b/profiles/hel.nix
index 8ba739b..785b7e6 100644
--- a/profiles/hel.nix
+++ b/profiles/hel.nix
@@ -430,9 +430,9 @@
     localDnsResolver = false;
     enableManageSieve = true;
     lmtpSaveToDetailMailbox = "no";
-    policydSPFExtraConfig = ''
-      Domain_Whitelist = skynet.be
-    '';
+    # policydSPFExtraConfig = ''
+    #   Domain_Whitelist = skynet.be
+    # '';
     loginAccounts = {
       "paultrial@banditlair.com" = {
         # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2 > /hashed/password/file/location