big revert

flake lock
2025-10-04 20:49:00 +02:00 · 2025-10-04 20:42:31 +02:00
96 changed files with 2353 additions and 2318 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1761656077,
-        "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=",
+        "lastModified": 1754433428,
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
        "type": "github"
      },
      "original": {
@@ -29,11 +29,11 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1761806975,
-        "narHash": "sha256-GLGdVJSPH0LnsO64Biw0WFJaj1PlltYxgH13f+FGWgQ=",
+        "lastModified": 1758874004,
+        "narHash": "sha256-+RUCBtT01Z595NpGc6Tvms+dJ/C/cn1zdjT9+gE6dbU=",
        "owner": "anyrun-org",
        "repo": "anyrun",
-        "rev": "329d31af9ba038ef65db9914eb94de695c738377",
+        "rev": "3c571bc1514c4211d1d6c011a1d482f97efd9c5f",
        "type": "github"
      },
      "original": {
@@ -83,11 +83,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760101617,
-        "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=",
+        "lastModified": 1759499898,
+        "narHash": "sha256-UNzYHLWfkSzLHDep5Ckb5tXc0fdxwPIrT+MY4kpQttM=",
        "owner": "hyprwm",
        "repo": "aquamarine",
-        "rev": "1826a9923881320306231b1c2090379ebf9fa4f8",
+        "rev": "655e067f96fd44b3f5685e17f566b0e4d535d798",
        "type": "github"
      },
      "original": {
@@ -100,10 +100,14 @@
      "inputs": {
        "authentik-src": "authentik-src",
        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": [
+          "flake-parts"
+        ],
        "flake-utils": "flake-utils",
        "napalm": "napalm",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
        "pyproject-build-systems": "pyproject-build-systems",
        "pyproject-nix": "pyproject-nix",
        "systems": "systems_3",
@@ -119,7 +123,6 @@
      },
      "original": {
        "owner": "nix-community",
-        "ref": "version/2025.8.4",
        "repo": "authentik-nix",
        "type": "github"
      }
@@ -146,15 +149,15 @@
        "flake-schemas": "flake-schemas",
        "home-manager": "home-manager_2",
        "jovian": "jovian",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
        "rust-overlay": "rust-overlay"
      },
      "locked": {
-        "lastModified": 1762036128,
-        "narHash": "sha256-0VgVPYq5upSXc+LSn3ubxJhH+DLdakYW4QXeabo0Ivg=",
+        "lastModified": 1759532138,
+        "narHash": "sha256-sLQIlgDwMP3mEY2PwjGW+cL56QQ2n2WXoZ3GpG5QWOY=",
        "owner": "chaotic-cx",
        "repo": "nyx",
-        "rev": "499783c86e6e9436534d1a23b35da98c7f6af3f4",
+        "rev": "bad02bbca5b5c6d45539a0d740ad0e21b1ba9afc",
        "type": "github"
      },
      "original": {
@@ -209,11 +212,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1762065744,
-        "narHash": "sha256-c04mxJoCb8f6BBrdaREWmdQq+pfp395olXhC+B0G7DI=",
+        "lastModified": 1759560021,
+        "narHash": "sha256-J/rtMKVUAEqOFj0ogvcHKK8HbaKhw+tiNrDOpEM+ZDY=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "e0f24085a4a0da1c32adc308ec4c518ae886ff35",
+        "rev": "6ffcbf59c119b0c6384c7d98f18cea06a9af7e9c",
        "type": "github"
      },
      "original": {
@@ -240,11 +243,11 @@
    },
    "flake-compat_2": {
      "locked": {
-        "lastModified": 1761588595,
-        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
        "type": "github"
      },
      "original": {
@@ -324,14 +327,16 @@
    },
    "flake-parts_2": {
      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
+        "nixpkgs-lib": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
        "type": "github"
      },
      "original": {
@@ -342,27 +347,7 @@
    },
    "flake-parts_3": {
      "inputs": {
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762040540,
-        "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "0010412d62a25d959151790968765a70c436598b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_4": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
        "lastModified": 1753121425,
@@ -378,7 +363,7 @@
        "type": "github"
      }
    },
-    "flake-parts_5": {
+    "flake-parts_4": {
      "inputs": {
        "nixpkgs-lib": [
          "lanzaboote",
@@ -399,7 +384,7 @@
        "type": "github"
      }
    },
-    "flake-parts_6": {
+    "flake-parts_5": {
      "inputs": {
        "nixpkgs-lib": [
          "nvf",
@@ -407,11 +392,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760948891,
-        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
+        "lastModified": 1759362264,
+        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
        "type": "github"
      },
      "original": {
@@ -420,7 +405,7 @@
        "type": "github"
      }
    },
-    "flake-parts_7": {
+    "flake-parts_6": {
      "inputs": {
        "nixpkgs-lib": [
          "tuirun",
@@ -478,8 +463,8 @@
    },
    "fonts": {
      "inputs": {
-        "flake-parts": "flake-parts_4",
-        "nixpkgs": "nixpkgs_5"
+        "flake-parts": "flake-parts_3",
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
        "lastModified": 1753431871,
@@ -506,11 +491,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1759523803,
+        "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
        "type": "github"
      },
      "original": {
@@ -586,11 +571,11 @@
    },
    "hardware": {
      "locked": {
-        "lastModified": 1761933221,
-        "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=",
+        "lastModified": 1759582739,
+        "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "7467f155fcba189eb088a7601f44fbef7688669b",
+        "rev": "3441b5242af7577230a78ffb03542add264179ab",
        "type": "github"
      },
      "original": {
@@ -601,15 +586,15 @@
    },
    "helix-flake": {
      "inputs": {
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
        "rust-overlay": "rust-overlay_2"
      },
      "locked": {
-        "lastModified": 1762054696,
-        "narHash": "sha256-4wyNPyycaPDS13OC+YPkQOrrf3ZCS/ipAh9lfo121Nw=",
+        "lastModified": 1759201995,
+        "narHash": "sha256-3STv6fITv8Ar/kl0H7vIA7VV0d2gyLh8UL0BOiVacXg=",
        "owner": "helix-editor",
        "repo": "helix",
-        "rev": "0b61e721aaae794c950c72f765388dcc5f9f32fa",
+        "rev": "bfcbef10c513108c7b43317569416c2eefc4ed44",
        "type": "github"
      },
      "original": {
@@ -625,11 +610,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762087455,
-        "narHash": "sha256-hpbPma1eUKwLAmiVRoMgIHbHiIKFkcACobJLbDt6ABw=",
+        "lastModified": 1759573136,
+        "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "43e205606aeb253bfcee15fd8a4a01d8ce8384ca",
+        "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
        "type": "github"
      },
      "original": {
@@ -667,11 +652,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761878381,
-        "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",
+        "lastModified": 1759337100,
+        "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",
+        "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
        "type": "github"
      },
      "original": {
@@ -725,11 +710,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760445448,
-        "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=",
+        "lastModified": 1759490292,
+        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757",
+        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
        "type": "github"
      },
      "original": {
@@ -754,11 +739,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759490292,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "lastModified": 1750621377,
+        "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=",
        "owner": "hyprwm",
        "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310",
        "type": "github"
      },
      "original": {
@@ -789,11 +774,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762027241,
-        "narHash": "sha256-w0NhWx95Xao6Dh3G1p7G1cHwGBknwPVPG5VRghk3LSg=",
+        "lastModified": 1757420192,
+        "narHash": "sha256-jVkY2ax7e+V+M4RwLZTJnOVTdjR5Bj10VstJuK60tl4=",
        "owner": "hyprwm",
        "repo": "hypridle",
-        "rev": "f3d1f3b232a5e3267008568196397b03fab244d2",
+        "rev": "f158b2fe9293f9b25f681b8e46d84674e7bc7f01",
        "type": "github"
      },
      "original": {
@@ -812,17 +797,17 @@
        "hyprlang": "hyprlang",
        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner_2",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_6",
        "pre-commit-hooks": "pre-commit-hooks",
        "systems": "systems_4",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1761869718,
-        "narHash": "sha256-jLfwwlPGpnGRAtVDyoGj9FgH2D9hWwyEu0yHkflG2EI=",
+        "lastModified": 1759530922,
+        "narHash": "sha256-9NgZKpibALekGTPDc2O8lP8vFealQSZkXe+L+S7MMZU=",
        "owner": "hyprwm",
        "repo": "hyprland",
-        "rev": "8e9add2afda58d233a75e4c5ce8503b24fa59ceb",
+        "rev": "76d998743ac10e712238c1016db4d8e8d16f1049",
        "type": "github"
      },
      "original": {
@@ -839,11 +824,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759613406,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
+        "lastModified": 1759238633,
+        "narHash": "sha256-4/AtRCQKXuU49ozZZouWuC+T7vCjQh9HAz3N8Tt5OZE=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
+        "rev": "513d71d3f42c05d6a38e215382c5a6ce971bd77d",
        "type": "github"
      },
      "original": {
@@ -889,11 +874,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759610243,
-        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
+        "lastModified": 1749046714,
+        "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
+        "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330",
        "type": "github"
      },
      "original": {
@@ -1021,11 +1006,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761675634,
-        "narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=",
+        "lastModified": 1759572448,
+        "narHash": "sha256-o+r44fqPQM+/hQdjFy9qV9C51Jhty6M4icFVYocyJfA=",
        "owner": "hyprwm",
        "repo": "hyprlock",
-        "rev": "98b86752fe4867bd14ef96a92ea788229af93130",
+        "rev": "c8a6768dca626cf7d7cbc333095f048bc007b6d9",
        "type": "github"
      },
      "original": {
@@ -1059,11 +1044,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760120448,
-        "narHash": "sha256-l/OxM4q/nLVv47OuS4bG2J7k0m+G7/3AMtvrV64XLb0=",
+        "lastModified": 1754481642,
+        "narHash": "sha256-e1phd6KwtUsS9C2ShD+fQvfk2Dgr2JQi+rTDQUW15iE=",
        "owner": "hyprwm",
        "repo": "hyprpaper",
-        "rev": "1733e0025b194c9bc083f4cd8782c5f151858a58",
+        "rev": "bcb1ffa322369c4898347ab5a7399a3d18494c8f",
        "type": "github"
      },
      "original": {
@@ -1084,11 +1069,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759619523,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "lastModified": 1759490926,
+        "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=",
        "owner": "hyprwm",
        "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3",
        "type": "github"
      },
      "original": {
@@ -1159,11 +1144,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1755184602,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "lastModified": 1750371869,
+        "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd",
        "type": "github"
      },
      "original": {
@@ -1206,11 +1191,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761748321,
-        "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=",
+        "lastModified": 1759387127,
+        "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=",
        "owner": "Jovian-Experiments",
        "repo": "Jovian-NixOS",
-        "rev": "533db5857c9e00ca352558a928417116ee08a824",
+        "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7",
        "type": "github"
      },
      "original": {
@@ -1223,8 +1208,8 @@
      "inputs": {
        "crane": "crane",
        "flake-compat": "flake-compat_4",
-        "flake-parts": "flake-parts_5",
-        "nixpkgs": "nixpkgs_8",
+        "flake-parts": "flake-parts_4",
+        "nixpkgs": "nixpkgs_7",
        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
        "rust-overlay": "rust-overlay_3"
      },
@@ -1293,11 +1278,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762088055,
-        "narHash": "sha256-zh7fDPmhmoXVTtODiDhOLlutwNLJmwOlLphVKuCCiZA=",
+        "lastModified": 1759455985,
+        "narHash": "sha256-8qDv7NXH3fj1CDXed7c7vJLtrRKDZSo0x6TaWSfelVg=",
        "owner": "fufexan",
        "repo": "nix-gaming",
-        "rev": "d74c3702fdc737276baccab80c2053e8cde5dba5",
+        "rev": "eb5ab503cbd3cb386e8d85a55a9faed73ec7dc37",
        "type": "github"
      },
      "original": {
@@ -1346,21 +1331,6 @@
      }
    },
    "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1754788789,
-        "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
      "locked": {
        "lastModified": 1751159883,
        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
@@ -1375,22 +1345,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_10": {
-      "locked": {
-        "lastModified": 1761880412,
-        "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_2": {
      "locked": {
        "lastModified": 1758690382,
@@ -1409,11 +1363,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
-        "owner": "NixOS",
+        "lastModified": 1759147044,
+        "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=",
+        "owner": "PedroHLC",
        "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b",
        "type": "github"
      },
      "original": {
@@ -1424,22 +1378,6 @@
      }
    },
    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1761907660,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
      "locked": {
        "lastModified": 1753250450,
        "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=",
@@ -1455,39 +1393,39 @@
        "type": "github"
      }
    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1740560979,
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_6": {
      "locked": {
        "lastModified": 1759381078,
        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
-        "owner": "nixos",
+        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
      "locked": {
        "lastModified": 1754243818,
        "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=",
@@ -1503,13 +1441,13 @@
        "type": "github"
      }
    },
-    "nixpkgs_9": {
+    "nixpkgs_8": {
      "locked": {
-        "lastModified": 1761907660,
-        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
+        "lastModified": 1759381078,
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
        "type": "github"
      },
      "original": {
@@ -1519,20 +1457,36 @@
        "type": "github"
      }
    },
+    "nixpkgs_9": {
+      "locked": {
+        "lastModified": 1759386674,
+        "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "625ad6366178f03acd79f9e3822606dd7985b657",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nvf": {
      "inputs": {
        "flake-compat": "flake-compat_5",
-        "flake-parts": "flake-parts_6",
+        "flake-parts": "flake-parts_5",
        "mnw": "mnw",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_9",
        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1762093557,
-        "narHash": "sha256-esmyNNa8TvduITLfqYPSMroyZ9vxJr2nsvjYmHmO+Ag=",
+        "lastModified": 1759469269,
+        "narHash": "sha256-DP833ejGUNRRHsJOB3WRTaWWXLNucaDga2ju/fGe+sc=",
        "owner": "notashelf",
        "repo": "nvf",
-        "rev": "20d8fca94dceaf943686598da7fba31b37100e50",
+        "rev": "e48638aef3a95377689de0ef940443c64f870a09",
        "type": "github"
      },
      "original": {
@@ -1551,11 +1505,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760663237,
-        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
+        "lastModified": 1758108966,
+        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
+        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
        "type": "github"
      },
      "original": {
@@ -1648,7 +1602,7 @@
        "chaotic": "chaotic",
        "fenix": "fenix",
        "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
        "fonts": "fonts",
        "git-hooks": "git-hooks",
        "hardware": "hardware",
@@ -1661,7 +1615,7 @@
        "hyprpaper": "hyprpaper",
        "lanzaboote": "lanzaboote",
        "nix-gaming": "nix-gaming",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_8",
        "nvf": "nvf",
        "systems": "systems_6",
        "treefmt-nix": "treefmt-nix",
@@ -1672,11 +1626,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1762016333,
-        "narHash": "sha256-PT8hXDYyeRjh9BGyLF/nZWm9TqRwP2EzeKuqUFH0M3w=",
+        "lastModified": 1759301569,
+        "narHash": "sha256-7StxDed3v2fAWLkl+Hse9FlpjT7Dk7Cn/4vxTFyEhIg=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "fca718c0f2074bdccf9a996bb37b0fcaff80dc97",
+        "rev": "472037b789cf593172d6adf3b8d9f7a429f6cd9b",
        "type": "github"
      },
      "original": {
@@ -1694,11 +1648,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761964689,
-        "narHash": "sha256-Zo3LQQDz+64EQ9zor/WmeNTFLoZkjmhp0UY3G0D3seE=",
+        "lastModified": 1759458749,
+        "narHash": "sha256-WKnbJnm1B2+TO2ZUudgS39EzecQeLl4/bnRtd3y46LI=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "63d22578600f70d293aede6bc737efef60ebd97f",
+        "rev": "bbc3a8ae797d1700e57a4f4bcc4e79af727d4138",
        "type": "github"
      },
      "original": {
@@ -1715,11 +1669,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759631821,
-        "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=",
+        "lastModified": 1740623427,
+        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
+        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
        "type": "github"
      },
      "original": {
@@ -1861,11 +1815,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1761311587,
-        "narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
+        "lastModified": 1758728421,
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
        "type": "github"
      },
      "original": {
@@ -1876,7 +1830,7 @@
    },
    "tuirun": {
      "inputs": {
-        "flake-parts": "flake-parts_7",
+        "flake-parts": "flake-parts_6",
        "nixpkgs": [
          "nixpkgs"
        ],
@@ -1949,11 +1903,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760713634,
-        "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=",
+        "lastModified": 1755354946,
+        "narHash": "sha256-zdov5f/GcoLQc9qYIS1dUTqtJMeDqmBmo59PAxze6e4=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "753bbbdf6a052994da94062e5b753288cef28dfb",
+        "rev": "a10726d6a8d0ef1a0c645378f983b6278c42eaa0",
        "type": "github"
      },
      "original": {
@@ -1969,11 +1923,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762074512,
-        "narHash": "sha256-m8ZY0rmq9QXnIR08/vOyK9MnEbiziZG8mPGAVwoYEPQ=",
+        "lastModified": 1759590499,
+        "narHash": "sha256-EBToRzqe5WMz4DQyxOp9/CP+rWjdaZ2EUwbItfNf3VI=",
        "ref": "refs/heads/main",
-        "rev": "eb05f21bcf0f380e45537db6c5df13b50acaa4a6",
-        "revCount": 143,
+        "rev": "6e606c8bfa6a88209488790388b1005bc489fa66",
+        "revCount": 136,
        "type": "git",
        "url": "https://git.sr.ht/~canasta/zen-browser-flake"
      },
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,8 @@
 {
  description = "cnix nix";

-  outputs = inputs:
+  outputs =
+    inputs:
    inputs.flake-parts.lib.mkFlake { inherit inputs; } {
      systems = [
        "x86_64-linux"
@@ -16,11 +17,13 @@
        ./fmt-hooks.nix
      ];

-      perSystem = {
+      perSystem =
+        {
          config,
          pkgs,
          ...
-      }: {
+        }:
+        {
          devShells.default = pkgs.mkShell {
            packages = [
              pkgs.git
@@ -53,7 +56,11 @@
    };

    authentik = {
-      url = "github:nix-community/authentik-nix/version/2025.8.4";
+      url = "github:nix-community/authentik-nix";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-parts.follows = "flake-parts";
+      };
    };

    flake-compat.url = "github:edolstra/flake-compat";
--- a/hosts/bunk/default.nix
+++ b/hosts/bunk/default.nix
@@ -38,11 +38,17 @@ in
    ./settings.nix
  ];

-  boot.initrd.luks.devices."luks-0ad53967-bb38-4485-be75-ca55ae4c3b68".device = "/dev/disk/by-uuid/0ad53967-bb38-4485-be75-ca55ae4c3b68";
  networking.hostName = "bunk";

+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 32 * 1024;
+    }
+  ];
+
  environment.variables.NH_FLAKE = "/home/cnst/.nix-config";

  # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  system.stateVersion = lib.mkDefault "25.05";
+  system.stateVersion = lib.mkDefault "23.11";
 }
--- a/hosts/bunk/hardware-configuration.nix
+++ b/hosts/bunk/hardware-configuration.nix
@@ -1,35 +1,47 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  config,
+  lib,
+  modulesPath,
+  ...
+}:
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  boot = {
+    initrd = {
+      availableKernelModules = [
+        "nvme"
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "usb_storage"
+        "sd_mod"
      ];
-
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/d15672b5-dc97-4f99-9ad2-70f9ddf20447";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
+      kernelModules = [ "amdgpu" ];
    };

-  boot.initrd.luks.devices."luks-2f0dfe96-bc63-4f38-b190-3d9fa45dc560".device = "/dev/disk/by-uuid/2f0dfe96-bc63-4f38-b190-3d9fa45dc560";
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/F3FC-3CDF";
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/da41c89a-7ab8-4697-9a14-0d115b97cc2e";
+    fsType = "ext4";
+  };
+
+  boot.initrd.luks.devices."luks-e75ac560-748f-4071-bbe7-479678400be3".device =
+    "/dev/disk/by-uuid/e75ac560-748f-4071-bbe7-479678400be3";
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/7E84-D168";
    fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/e6464248-0d1e-4950-bf48-4cebeabaf871"; }
+    options = [
+      "fmask=0022"
+      "dmask=0022"
    ];
+  };

  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
  # (the default) this is the recommended approach. When using systemd-networkd it's
--- a/hosts/bunk/modules.nix
+++ b/hosts/bunk/modules.nix
@@ -27,13 +27,6 @@
      };
      network = {
        enable = true;
-        nameservers = [
-          "192.168.88.1"
-          "192.168.88.69"
-        ];
-        search = [
-          "taila7448a.ts.net"
-        ];
        interfaces = {
          "wlp6s0" = {
            allowedTCPPorts = [
@@ -80,8 +73,8 @@
        enable = false;
      };
      hyprland = {
-        enable = true;
-        withUWSM = true;
+        enable = false;
+        withUWSM = false;
      };
      inkscape = {
        enable = false;
@@ -93,7 +86,7 @@
        enable = true;
      };
      niri = {
-        enable = false;
+        enable = true;
      };
      pkgs = {
        enable = true;
@@ -130,10 +123,10 @@
        enable = false;
      };
      thunar = {
-        enable = false;
+        enable = true;
      };
      yubikey = {
-        enable = false;
+        enable = true;
      };
      zsh = {
        enable = false;
@@ -175,7 +168,7 @@
        enable = true;
      };
      mullvad = {
-        enable = false;
+        enable = true;
      };
      nix-ld = {
        enable = false;
@@ -198,14 +191,11 @@
      samba = {
        enable = false;
      };
-      tailscale = {
-        enable = true;
-      };
      udisks = {
        enable = true;
      };
      zram = {
-        enable = true;
+        enable = false;
      };
    };
    system = {
--- a/hosts/bunk/settings.nix
+++ b/hosts/bunk/settings.nix
@@ -10,7 +10,7 @@
        name = "DP-3";
        width = 2560;
        height = 1440;
-        refreshRate = "143.99";
+        refreshRate = 240;
        position = "0x0";
        transform = 0;
        bitDepth = 10;
@@ -20,7 +20,7 @@
        name = "HDMI-A-1";
        width = 1920;
        height = 1080;
-        refreshRate = "60";
+        refreshRate = 60;
        position = "2560x0";
        # transform = 3;
        workspace = "5";
@@ -29,7 +29,7 @@
        name = "eDP-1";
        width = 1920;
        height = 1200;
-        refreshRate = "60";
+        refreshRate = 60;
        workspace = "1";
      }
    ];
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -8,7 +8,7 @@
 {
  flake.nixosConfigurations =
    let
-      clib = import ../lib inputs.nixpkgs.lib;
+      cLib = import ../lib inputs.nixpkgs.lib;
      userConfig = "${self}/home";
      systemConfig = "${self}/system";
      hostConfig = "${self}/hosts";
@@ -24,6 +24,7 @@

      specialArgs = {
        inherit
+          cLib
          inputs
          outputs
          self
@@ -36,20 +37,17 @@
          smodPath
          ;
      };
-      specialArgsWithClib = specialArgs // {
-        inherit clib;
-      };
    in
    {
      kima = nixosSystem {
-        specialArgs = specialArgsWithClib;
+        inherit specialArgs;
        modules = [
          ./kima
          "${self}/nix"
          {
            home-manager = {
              users.cnst.imports = homeImports."cnst@kima";
-              extraSpecialArgs = specialArgsWithClib;
+              extraSpecialArgs = specialArgs;
            };
          }
          self.nixosModules.nixos
@@ -59,14 +57,14 @@
        ];
      };
      bunk = nixosSystem {
-        specialArgs = specialArgsWithClib;
+        inherit specialArgs;
        modules = [
          ./bunk
          "${self}/nix"
          {
            home-manager = {
              users.cnst.imports = homeImports."cnst@bunk";
-              extraSpecialArgs = specialArgsWithClib;
+              extraSpecialArgs = specialArgs;
            };
          }
          self.nixosModules.nixos
@@ -99,14 +97,14 @@
        ];
      };
      toothpc = nixosSystem {
-        specialArgs = specialArgsWithClib;
+        inherit specialArgs;
        modules = [
          ./toothpc
          "${self}/nix"
          {
            home-manager = {
              users.toothpick.imports = homeImports."toothpick@toothpc";
-              extraSpecialArgs = specialArgsWithClib;
+              extraSpecialArgs = specialArgs;
            };
          }
          self.nixosModules.nixos
--- a/hosts/kima/modules.nix
+++ b/hosts/kima/modules.nix
@@ -29,13 +29,6 @@
      };
      network = {
        enable = true;
-        nameservers = [
-          "192.168.88.1"
-          "192.168.88.69"
-        ];
-        search = [
-          "taila7448a.ts.net"
-        ];
        interfaces = {
          "eno1" = {
            allowedTCPPorts = [
@@ -73,7 +66,7 @@
        };
      };
      gamescope = {
-        enable = false;
+        enable = true;
      };
      gimp = {
        enable = true;
@@ -82,8 +75,8 @@
        enable = false;
      };
      hyprland = {
-        enable = true;
-        withUWSM = true;
+        enable = false;
+        withUWSM = false;
      };
      inkscape = {
        enable = false;
@@ -98,7 +91,7 @@
        enable = true;
      };
      niri = {
-        enable = false;
+        enable = true;
      };
      pkgs = {
        enable = true;
--- a/hosts/kima/settings.nix
+++ b/hosts/kima/settings.nix
@@ -10,7 +10,7 @@
        name = "DP-3";
        width = 2560;
        height = 1440;
-        refreshRate = "143.99";
+        refreshRate = 240;
        position = "0x0";
        transform = 0;
        bitDepth = 10;
@@ -20,7 +20,7 @@
        name = "HDMI-A-1";
        width = 1920;
        height = 1080;
-        refreshRate = "60";
+        refreshRate = 60;
        position = "2560x0";
        transform = 3;
        workspace = "5";
@@ -29,7 +29,7 @@
        name = "eDP-1";
        width = 1920;
        height = 1200;
-        refreshRate = "60";
+        refreshRate = 60;
        workspace = "1";
      }
    ];
--- a/hosts/sobotka/default.nix
+++ b/hosts/sobotka/default.nix
@@ -68,10 +68,7 @@ in {

  boot = {
    supportedFilesystems = ["zfs"];
-    zfs = {
-      package = pkgs.zfs_unstable;
-      extraPools = ["data"];
-    };
+    zfs.extraPools = ["data"];
  };

  services.zfs = {
--- a/hosts/sobotka/modules.nix
+++ b/hosts/sobotka/modules.nix
@@ -109,7 +109,7 @@
          enable = true;
        };
        dev = {
-          enable = true;
+          enable = false;
        };
      };
      mysql-workbench = {
@@ -214,7 +214,7 @@
        flags = "--performance";
      };
      tailscale = {
-        enable = false;
+        enable = true;
      };
      udisks = {
        enable = true;
--- a/hosts/sobotka/server.nix
+++ b/hosts/sobotka/server.nix
@@ -3,30 +3,77 @@
    enable = true;
    email = "adam@cnst.dev";
    domain = "cnix.dev";
-    ip = "192.168.88.14";
    user = "share";
    group = "share";
    uid = 994;
    gid = 993;

-    infra = {
+    traefik = {
+      enable = true;
+    };
+    gitea = {
+      enable = true;
+    };
+    unbound = {
+      enable = true;
+    };
+    homepage-dashboard = {
+      enable = true;
+    };
+    n8n = {
+      enable = true;
+    };
+    bazarr = {
+      enable = true;
+    };
+    prowlarr = {
+      enable = true;
+    };
+    lidarr = {
+      enable = true;
+    };
+    sonarr = {
+      enable = true;
+    };
+    radarr = {
+      enable = true;
+    };
+    jellyseerr = {
+      enable = true;
+    };
+    jellyfin = {
+      enable = true;
+    };
+    uptime-kuma = {
+      enable = true;
+    };
+    vaultwarden = {
+      enable = true;
+      url = "vault.cnst.dev";
+      cloudflared = {
+        tunnelId = "fdd98086-6a4c-44f2-bba0-eb86b833cce5";
+        credentialsFile = config.age.secrets.vaultwardenCloudflared.path;
+      };
+    };
+    www = {
+      enable = true;
+      url = "cnst.dev";
+      cloudflared = {
+        tunnelId = "e5076186-efb7-405a-998c-6155af7fb221";
+        credentialsFile = config.age.secrets.wwwCloudflared.path;
+      };
+    };
    authentik = {
      enable = true;
      url = "auth.cnst.dev";
-        port = 9000;
      cloudflared = {
        tunnelId = "b66f9368-db9e-4302-8b48-527cda34a635";
        credentialsFile = config.age.secrets.authentikCloudflared.path;
      };
    };
-      traefik = {
-        enable = true;
-      };
-      tailscale = {
-        enable = true;
-      };
-      unbound = {
+    nextcloud = {
      enable = true;
+      adminpassFile = config.age.secrets.nextcloudAdminPass.path;
    };
    fail2ban = {
      enable = true;
@@ -37,242 +84,19 @@
      enable = true;
      interface = "enp6s0";
    };
-      gluetun = {
-        enable = true;
-      };
    podman = {
      enable = true;
-      };
-      www = {
-        enable = true;
-        url = "cnst.dev";
-        port = 8283;
-        cloudflared = {
-          tunnelId = "e5076186-efb7-405a-998c-6155af7fb221";
-          credentialsFile = config.age.secrets.wwwCloudflared.path;
-        };
-      };
-    };
-
-    services = {
-      homepage-dashboard = {
-        enable = true;
-        subdomain = "dash";
-        exposure = "local";
-        port = 8082;
-      };
-      n8n = {
-        enable = true;
-        subdomain = "n8n";
-        exposure = "local";
-        port = 5678;
-        homepage = {
-          name = "n8n";
-          description = "A workflow automation platform";
-          icon = "n8n.svg";
-          category = "Services";
-        };
-      };
-      ollama = {
-        enable = true;
-        subdomain = "ai";
-        exposure = "local";
-        port = 8001;
-        homepage = {
-          name = "ollama";
-          description = "AI platform";
-          icon = "ollama.svg";
-          category = "Services";
-        };
-      };
-      bazarr = {
-        enable = true;
-        subdomain = "bazarr";
-        exposure = "local";
-        port = 6767;
-        homepage = {
-          name = "Bazarr";
-          description = "Subtitle manager";
-          icon = "bazarr.svg";
-          category = "Arr";
-        };
-      };
-      prowlarr = {
-        enable = true;
-        subdomain = "prowlarr";
-        exposure = "local";
-        port = 9696;
-        homepage = {
-          name = "Prowlarr";
-          description = "PVR indexer";
-          icon = "prowlarr.svg";
-          category = "Arr";
-        };
-      };
-      flaresolverr = {
-        enable = true;
-        subdomain = "flaresolverr";
-        exposure = "local";
-        port = 8191;
-        homepage = {
-          name = "FlareSolverr";
-          description = "Proxy to bypass Cloudflare/DDoS-GUARD protection";
-          icon = "flaresolverr.svg";
-          category = "Arr";
-        };
-      };
-      lidarr = {
-        enable = true;
-        subdomain = "lidarr";
-        exposure = "local";
-        port = 8686;
-        homepage = {
-          name = "Lidarr";
-          description = "Music collection manager";
-          icon = "lidarr.svg";
-          category = "Arr";
-        };
-      };
-      sonarr = {
-        enable = true;
-        subdomain = "sonarr";
-        exposure = "local";
-        port = 8989;
-        homepage = {
-          name = "Sonarr";
-          description = "Internet PVR for Usenet and Torrents";
-          icon = "sonarr.svg";
-          category = "Arr";
-        };
-      };
-      radarr = {
-        enable = true;
-        subdomain = "radarr";
-        exposure = "local";
-        port = 7878;
-        homepage = {
-          name = "Radarr";
-          description = "Movie collection manager";
-          icon = "radarr.svg";
-          category = "Arr";
-        };
-      };
-      jellyseerr = {
-        enable = true;
-        subdomain = "jellyseerr";
-        exposure = "local";
-        port = 5055;
-        homepage = {
-          name = "Jellyseerr";
-          description = "Media request and discovery manager";
-          icon = "jellyseerr.svg";
-          category = "Arr";
-        };
-      };
-      jellyfin = {
-        enable = true;
-        subdomain = "fin";
-        exposure = "tailscale";
-        port = 8096;
-        homepage = {
-          name = "Jellyfin";
-          description = "The Free Software Media System";
-          icon = "jellyfin.svg";
-          category = "Media";
-        };
-      };
-      uptime-kuma = {
-        enable = true;
-        subdomain = "uptime";
-        exposure = "local";
-        port = 3001;
-        homepage = {
-          name = "Uptime Kuma";
-          description = "Service monitoring tool";
-          icon = "uptime-kuma.svg";
-          category = "Services";
-        };
-      };
-      gitea = {
-        enable = true;
-        subdomain = "git";
-        exposure = "tunnel";
-        port = 5003;
-        cloudflared = {
-          tunnelId = "33e2fb8e-ecef-4d42-b845-6d15e216e448";
-          credentialsFile = config.age.secrets.giteaCloudflared.path;
-        };
-        homepage = {
-          name = "Gitea";
-          description = "Git with a cup of tea";
-          icon = "gitea.svg";
-          category = "Services";
-        };
-      };
-      vaultwarden = {
-        enable = true;
-        subdomain = "vault";
-        exposure = "tunnel";
-        port = 8222;
-        cloudflared = {
-          tunnelId = "fdd98086-6a4c-44f2-bba0-eb86b833cce5";
-          credentialsFile = config.age.secrets.vaultwardenCloudflared.path;
-        };
-        homepage = {
-          name = "Vaultwarden";
-          description = "Password manager";
-          icon = "vaultwarden-light.svg";
-          category = "Services";
-        };
-      };
-      nextcloud = {
-        enable = true;
-        subdomain = "cloud";
-        exposure = "local";
-        port = 8182;
-        homepage = {
-          name = "Nextcloud";
-          description = "A safe home for all your data";
-          icon = "nextcloud.svg";
-          category = "Services";
-        };
-      };
+      gluetun.enable = true;
      qbittorrent = {
        enable = true;
-        subdomain = "qbt";
-        exposure = "local";
        port = 8080;
-        homepage = {
-          name = "qBittorrent";
-          description = "Torrent client";
-          icon = "qbittorrent.svg";
-          category = "Downloads";
-        };
      };
      slskd = {
        enable = true;
-        subdomain = "slskd";
-        exposure = "local";
-        port = 5030;
-        homepage = {
-          name = "Soulseek";
-          description = "Web-based Soulseek client";
-          icon = "slskd.svg";
-          category = "Downloads";
-        };
      };
      pihole = {
        enable = true;
-        subdomain = "pihole";
-        exposure = "local";
        port = 8053;
-        homepage = {
-          name = "PiHole";
-          description = "Adblocking and DNS service";
-          icon = "pi-hole.svg";
-          category = "Services";
-          path = "/admin";
-        };
      };
    };
  };
--- a/hosts/sobotka/settings.nix
+++ b/hosts/sobotka/settings.nix
@@ -4,10 +4,6 @@
      username = "cnst";
      mail = "adam@cnst.dev";
      sshUser = "sobotka";
-      domains = {
-        local = "cnix.dev";
-        public = "cnst.dev";
-      };
    };
  };
 }
--- a/hosts/toothpc/settings.nix
+++ b/hosts/toothpc/settings.nix
@@ -10,7 +10,7 @@
        name = "DVI-D-1";
        width = 1920;
        height = 1080;
-        refreshRate = "144";
+        refreshRate = 144;
        position = "0x0";
        transform = 0;
        workspace = "1";
--- a/lib/server/default.nix
+++ b/lib/server/default.nix
@@ -1,26 +0,0 @@
-{lib}: let
-  server = {
-    mkDomain = config: service: let
-      localDomain = config.settings.accounts.domains.local;
-      publicDomain = config.settings.accounts.domains.public;
-      tailscaleDomain = "ts.${publicDomain}";
-    in
-      if service.exposure == "tunnel"
-      then publicDomain
-      else if service.exposure == "tailscale"
-      then tailscaleDomain
-      else localDomain;
-
-    mkFullDomain = config: service: let
-      domain = server.mkDomain config service;
-    in "${service.subdomain}.${domain}";
-
-    mkHostDomain = config: service: let
-      domain = server.mkDomain config service;
-    in "${domain}";
-
-    mkSubDomain = config: service: "${service.subdomain}";
-  };
-in {
-  server = server;
-}
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -123,6 +123,27 @@
    server = {
      imports = [
        ./server
+        ./server/fail2ban
+        ./server/homepage-dashboard
+        ./server/nextcloud
+        ./server/vaultwarden
+        ./server/bazarr
+        ./server/prowlarr
+        ./server/lidarr
+        ./server/radarr
+        ./server/sonarr
+        ./server/jellyseerr
+        ./server/jellyfin
+        ./server/n8n
+        ./server/podman
+        ./server/unbound
+        ./server/uptime-kuma
+        ./server/keepalived
+        ./server/gitea
+        ./server/postgres
+        ./server/traefik
+        ./server/www
+        ./server/authentik
      ];
    };
    settings = {
--- a/modules/home/programs/fish/default.nix
+++ b/modules/home/programs/fish/default.nix
@@ -6,9 +6,8 @@
 }:
 let
  inherit (lib) mkIf mkEnableOption;
-  packageNames = map (p: p.pname or p.name or null) config.home.packages;
-  hasPackage = name: lib.any (x: x == name) packageNames;
-  hasEza = hasPackage "eza";
+  inherit (lib.meta) getExe;
+  inherit (pkgs) eza bat;
  cfg = config.home.programs.fish;
 in
 {
@@ -29,9 +28,7 @@ in
        nixclean = "nh clean all --keep 3";
        nixdev = "nix develop ~/.nix-config -c $SHELL";
        nixup = "nh os switch -H $hostname";
-        nixupn = "nh os switch -n -H $hostname";
-        nixupv = "nh os switch -v --show-trace -H $hostname";
-        nixupvn = "nh os switch -n -v --show-trace -H $hostname";
+        nixupv = "nh os switch -v -H $hostname";
        flakeup = "nix flake update";
      };
      shellAliases = {
@@ -47,8 +44,12 @@ in
        nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
        nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
        nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
-        ls = mkIf hasEza "eza";
-        tree = mkIf hasEza "eza --tree --icons=always";
+        tree = "${getExe eza} --tree --icons=always";
+        cat = "${getExe bat} --style=plain";
+        ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
+        ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
+        lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
+        la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
        # Clear screen and scrollback
        clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
      };
@@ -58,12 +59,14 @@ in
        # Merge history when pressing up
        up-or-search = lib.readFile ./up-or-search.fish;
        # Check stuff in PATH
-        nix-inspect = # fish
+        nix-inspect =
+          # fish
          ''
            set -s PATH | grep "PATH\[.*/nix/store" | cut -d '|' -f2 |  grep -v -e "-man" -e "-terminfo" | perl -pe 's:^/nix/store/\w{32}-([^/]*)/bin$:\1:' | sort | uniq
          '';
      };
-      interactiveShellInit = # fish
+      interactiveShellInit =
+        # fish
        ''
          # Open command buffer in vim when alt+e is pressed
          bind \ee edit_command_buffer
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -15,16 +15,17 @@ in
  };
  config = mkIf cfg.enable {
    home.packages = [ pkgs.gh ];
-    programs = {
-      git = {
+    programs.git = {
      enable = true;
-        settings = {
-          # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
-          user = {
-            name = osConfig.settings.accounts.username;
-            email = osConfig.settings.accounts.mail;
-            signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
+      userName = osConfig.settings.accounts.username;
+      userEmail = osConfig.settings.accounts.mail;
+      delta = {
+        enable = true;
+        options.dark = true;
      };
+      extraConfig = {
+        # user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
+        user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
        signing = {
          format = lib.mkDefault "ssh";
          key = "${config.home.homeDirectory}/.ssh/id_ed25519";
@@ -55,14 +56,6 @@ in
        ".jj"
      ];
    };
-
-      delta = {
-        enableGitIntegration = true;
-        enable = true;
-        options.dark = true;
-      };
-    };
-
    xdg.configFile."git/allowed_signers".text = ''
      ${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
    '';
--- a/modules/home/programs/hyprlock/default.nix
+++ b/modules/home/programs/hyprlock/default.nix
@@ -1,20 +1,26 @@
 {
+  inputs,
+  pkgs,
  lib,
  osConfig,
-  clib,
+  cLib,
  ...
 }:
 let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkEnableOption;
  cfg = osConfig.nixos.programs.hyprland;

+  hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
+  # hyprlockPkg = pkgs.hyprlock;
+  #
  bg = osConfig.settings.theme.background;
-  inherit (clib.theme.bgs) resolve;
+  inherit (cLib.theme.bgs) resolve;
 in
 {
  config = mkIf cfg.enable {
    programs.hyprlock = {
      enable = true;
+      package = hyprlockFlake;
      settings = {
        general = {
          # disable_loading_bar = true;
@@ -54,7 +60,6 @@ in
            position = "0, 20";
            halign = "center";
            valign = "center";
-            font_family = "DepartureMono Nerd Font Mono Italic";
          }
        ];
        label = [
@@ -66,7 +71,7 @@ in
            shadow_boost = 0.5;
            color = "rgba(FFFFFFFF)";
            font_size = 25;
-            font_family = "DepartureMono Nerd Font Mono Regular";
+            font_family = "Input Mono Compressed";
            position = "0, 230";
            halign = "center";
            valign = "center";
@@ -79,7 +84,7 @@ in
            shadow_boost = 0.5;
            color = "rgba(FFFFFFFF)";
            font_size = 85;
-            font_family = "DepartureMono Nerd Font Mono Regular";
+            font_family = "Input Mono Compressed";
            position = "0, 300";
            halign = "center";
            valign = "center";
--- a/modules/home/programs/pkgs/default.nix
+++ b/modules/home/programs/pkgs/default.nix
@@ -62,8 +62,16 @@ in
        [
          cmatrix
          xcur2png
+          ripgrep
+          file
+          fd
+          gnused
          nix-tree
          wireguard-tools
+          unzip
+          zip
+          gnutar
+          p7zip
        ]

        (mkIf cfg.common.enable [
@@ -80,7 +88,7 @@ in
          hyprpicker
          libnotify
          pamixer
-          loupe
+          oculante
          adwaita-icon-theme
          qt5.qtwayland
          qt6.qtwayland
--- a/modules/home/programs/waybar/config/config.jsonc
+++ b/modules/home/programs/waybar/config/config.jsonc
@@ -10,7 +10,7 @@
      "group/system"
    ],
    "modules-center": [
-      "hyprland/workspaces"
+      "niri/workspaces"
    ],
    "modules-right": [
      "custom/progress",
@@ -126,28 +126,16 @@
      "all-outputs": false,
      "format": "{icon}",
      "format-icons": {
-        "1": "1",
-        "2": "2",
-        "3": "3",
-        "4": "4",
-        "5": "5",
-        "6": "6",
-        "7": "7",
-        "8": "8",
-        "9": "9",
-        "default": "_",
-        "active": "_"
+        "urgent": "",
+        "visible": "",
+        "empty": ""
      },
      "on-click": "activate",
      "show-special": false,
      "on-scroll-up": "hyprctl dispatch workspace r-1",
      "on-scroll-down": "hyprctl dispatch workspace r+1",
      "persistent-workspaces": {
-        "1": [],
-        "2": [],
-        "3": [],
-        "4": [],
-        "5": []
+        "*": 3
      }
    },
    "niri/workspaces": {
--- a/modules/home/programs/waybar/config/style.css
+++ b/modules/home/programs/waybar/config/style.css
@@ -28,8 +28,8 @@ tooltip label {
  margin: 0 0px;
  background-color: transparent;
  color: #fbf1c7;
-  border-top: 4px solid transparent;
-  border-bottom: 4px solid transparent;
+  border-top: 3px solid transparent;
+  border-bottom: 3px solid transparent;
 }

 #workspaces button:hover {
@@ -45,7 +45,7 @@ tooltip label {
  background-image: url("assets/button.svg");
  background-position: center;
  background-repeat: no-repeat;
-  background-size: 21px 18px;
+  background-size: 18px 15px;
 }

 #custom-trayicon {
--- a/modules/home/services/hypridle/default.nix
+++ b/modules/home/services/hypridle/default.nix
@@ -1,14 +1,22 @@
 {
  osConfig,
  lib,
+  pkgs,
+  inputs,
  ...
-}: let
+}:
+let
  inherit (lib) mkIf;
  cfg = osConfig.nixos.programs.hyprland;
-in {
+
+  hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle;
+  # hypridlePkg = pkgs.hypridle;
+in
+{
  config = mkIf cfg.enable {
    services.hypridle = {
      enable = true;
+      package = hypridleFlake;
      settings = {
        general = {
          lock_cmd = "hyprlock";
--- a/modules/home/services/hyprpaper/default.nix
+++ b/modules/home/services/hyprpaper/default.nix
@@ -1,14 +1,18 @@
 {
  lib,
+  pkgs,
+  inputs,
  osConfig,
-  clib,
+  cLib,
  ...
-}: let
+}:
+let
  inherit (lib) mkIf;

  cfg = osConfig.nixos.programs.hyprland;
+  hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default;
  bg = osConfig.settings.theme.background;
-  bgs = clib.theme.bgs;
+  bgs = cLib.theme.bgs;

  monitorMappings = [
    {
@@ -28,10 +32,12 @@
      bg = bg.primary;
    }
  ];
-in {
+in
+{
  config = mkIf cfg.enable {
    services.hyprpaper = {
      enable = true;
+      package = hyprpaperFlake;

      settings = {
        ipc = "on";
--- a/modules/home/services/xdg/default.nix
+++ b/modules/home/services/xdg/default.nix
@@ -84,15 +84,15 @@ in
          "application/pdf" = "org.pwmt.zathura-pdf-mupdf.desktop";
          "inode/directory" = "thunar.desktop";

-          "image/apng" = "feh.desktop";
-          "image/avif" = "feh.desktop";
-          "image/bmp" = "feh.desktop";
-          "image/gif" = "feh.desktop";
-          "image/jpeg" = "feh.desktop";
-          "image/png" = "feh.desktop";
-          "image/svg+xml" = "feh.desktop";
-          "image/tiff" = "feh.desktop";
-          "image/webp" = "feh.desktop";
+          "image/apng" = "oculante.desktop";
+          "image/avif" = "oculante.desktop";
+          "image/bmp" = "oculante.desktop";
+          "image/gif" = "oculante.desktop";
+          "image/jpeg" = "oculante.desktop";
+          "image/png" = "oculante.desktop";
+          "image/svg+xml" = "oculante.desktop";
+          "image/tiff" = "oculante.desktop";
+          "image/webp" = "oculante.desktop";

          "video/H264" = [
            "mpv.desktop"
--- a/modules/nixos/hardware/graphics/default.nix
+++ b/modules/nixos/hardware/graphics/default.nix
@@ -19,13 +19,13 @@ let

  commonPackages = with pkgs; [
    libva
-    libva-vdpau-driver
+    vaapiVdpau
    libvdpau-va-gl
  ];

  commonPackages32 = with pkgs.pkgsi686Linux; [
    libva
-    libva-vdpau-driver
+    vaapiVdpau
    libvdpau-va-gl
  ];

--- a/modules/nixos/hardware/network/default.nix
+++ b/modules/nixos/hardware/network/default.nix
@@ -2,29 +2,20 @@
  config,
  lib,
  ...
-}: let
-  inherit
-    (lib)
+}:
+let
+  inherit (lib)
    mkIf
    mkEnableOption
    mkOption
    types
    ;
  cfg = config.nixos.hardware.network;
-in {
+in
+{
  options = {
    nixos.hardware.network = {
      enable = mkEnableOption "Enable the custom networking module";
-      nameservers = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = "The list of nameservers ";
-      };
-      search = mkOption {
-        type = types.listOf types.str;
-        default = [];
-        description = "Domain search paths";
-      };
      interfaces = mkOption {
        type = types.attrsOf (
          types.submodule {
@@ -64,8 +55,6 @@ in {
    networking = {
      networkmanager.enable = true;
      nftables.enable = true;
-      nameservers = cfg.nameservers;
-      search = cfg.search;
      firewall = {
        enable = true;
        inherit (cfg) interfaces;
--- a/modules/nixos/programs/fish/default.nix
+++ b/modules/nixos/programs/fish/default.nix
@@ -3,11 +3,14 @@
  lib,
  pkgs,
  ...
-}: let
+}:
+let
+  inherit (lib.meta) getExe;
+  inherit (pkgs) eza bat;
  inherit (lib) mkIf mkEnableOption mkMerge;
-
  cfg = config.nixos.programs.fish;
-in {
+in
+{
  options = {
    nixos.programs.fish = {
      enable = mkEnableOption "Enables fish shell";
@@ -19,7 +22,6 @@ in {
    (mkIf cfg.enable {
      programs.fish = {
        enable = true;
-        useBabelfish = true;
        vendor = {
          completions.enable = true;
          config.enable = true;
@@ -35,9 +37,7 @@ in {
          nixclean = "nh clean all --keep 3";
          nixdev = "nix develop ~/.nix-config -c $SHELL";
          nixup = "nh os switch -H $hostname";
-          nixupn = "nh os switch -n -H $hostname";
-          nixupv = "nh os switch -v --show-trace -H $hostname";
-          nixupvn = "nh os switch -n -v --show-trace -H $hostname";
+          nixupv = "nh os switch -v -H $hostname";
          flakeup = "nix flake update";
        };
        shellAliases = {
@@ -53,8 +53,12 @@ in {
          nset = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/settings.nix";
          nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
          nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
-          ls = lib.getExe pkgs.eza;
-          tree = "${lib.getExe pkgs.eza} --tree --icons=always";
+          tree = "${getExe eza} --tree --icons=always";
+          cat = "${getExe bat} --style=plain";
+          ls = "${getExe eza} -h --git --icons --color=auto --group-directories-first -s extension";
+          ll = "${getExe eza} -l --git --icons --color=auto --group-directories-first -s extension";
+          lat = "${getExe eza} -lah --tree --color=auto --group-directories-first -s extension";
+          la = "${getExe eza} -lah --color=auto --group-directories-first -s extension";
          # Clear screen and scrollback
          clear = "printf '\\033[2J\\033[3J\\033[1;1H'";
        };
--- a/modules/nixos/programs/hyprland/inputs.nix
+++ b/modules/nixos/programs/hyprland/inputs.nix
@@ -37,9 +37,9 @@ in
        };

        gestures = {
-          # workspace_swipe = true;
+          workspace_swipe = true;
          workspace_swipe_distance = 400;
-          # workspace_swipe_fingers = 3;
+          workspace_swipe_fingers = 3;
          workspace_swipe_cancel_ratio = 0.2;
          workspace_swipe_min_speed_to_force = 5;
          workspace_swipe_direction_lock = true;
--- a/modules/nixos/programs/hyprland/keybinds.nix
+++ b/modules/nixos/programs/hyprland/keybinds.nix
@@ -49,6 +49,20 @@ in
          "$mod, P, pseudo,"
          "$mod, J, togglesplit,"
          "$mod, C, exec, hyprctl dispatch exec copyq toggle"
+          "$mod, left, movefocus, l"
+          "$mod, right, movefocus, r"
+          "$mod, up, movefocus, u"
+          "$mod, down, movefocus, d"
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
+          "$mod, 0, workspace, 10"
          "$mod SHIFT, 1, movetoworkspace, 1"
          "$mod SHIFT, 2, movetoworkspace, 2"
          "$mod SHIFT, 3, movetoworkspace, 3"
@@ -61,30 +75,6 @@ in
          "$mod SHIFT, 0, movetoworkspace, 10"
          "CTRL SHIFT, Escape, exec, ${runOnce "resources"}"

-          "$mod, 1, workspace, 1"
-          "$mod, 2, workspace, 2"
-          "$mod, 3, workspace, 3"
-          "$mod, 4, workspace, 4"
-          "$mod, 5, workspace, 5"
-          "$mod, 6, workspace, 6"
-          "$mod, 7, workspace, 7"
-          "$mod, 8, workspace, 8"
-          "$mod, 9, workspace, 9"
-          "$mod, 0, workspace, 10"
-
-          "$mod, left, movefocus, l"
-          "$mod, right, movefocus, r"
-          "$mod, up, movefocus, u"
-          "$mod, down, movefocus, d"
-          "$mod SHIFT, left, resizeactive, -20 0"
-          "$mod SHIFT, right, resizeactive, 20 0"
-          "$mod SHIFT, up, resizeactive, 0 -20"
-          "$mod SHIFT, down, resizeactive, 0 20"
-          "$mod CTRL, left, swapwindow, l"
-          "$mod CTRL, right, swapwindow, r"
-          "$mod CTRL, up, swapwindow, u"
-          "$mod CTRL, down, swapwindow, d"
-
          ",XF86AudioLowerVolume, exec, volume-control.sh --dec"
          ",XF86AudioRaiseVolume, exec, volume-control.sh --inc"
          ",XF86AudioMute, exec, volume-control.sh --toggle"
@@ -109,7 +99,7 @@ in

    (mkIf (host == "kima") {
      programs.hyprland.settings = {
-        "$terminal" = "alacritty";
+        "$terminal" = "ghostty";
        "$browser" = "zen";
        "$browserinc" = "zen --private-window";
        "$mod" = "SUPER";
@@ -121,7 +111,7 @@ in

    (mkIf (host == "bunk") {
      programs.hyprland.settings = {
-        "$terminal" = "alacritty";
+        "$terminal" = "foot";
        "$browser" = "zen";
        "$browserinc" = "zen --private-window";
        "$mod" = "ALT_L";
--- a/modules/nixos/programs/hyprland/layout.nix
+++ b/modules/nixos/programs/hyprland/layout.nix
@@ -21,7 +21,7 @@ in
          let
            resolution =
              if m.width != null && m.height != null then
-                "${toString m.width}x${toString m.height}@${m.refreshRate}"
+                "${toString m.width}x${toString m.height}@${toString m.refreshRate}"
              else
                "preferred";

--- a/modules/nixos/programs/pkgs/default.nix
+++ b/modules/nixos/programs/pkgs/default.nix
@@ -78,17 +78,10 @@ in
          openssl
          xmrig
          ocl-icd
-          dig
-          unzip
-          zip
-          gnutar
-          gnused
-          p7zip
-          ripgrep
-          file
        ]

        (mkIf cfg.common.enable [
+          qt6.full
          swappy
          wayfreeze
          imagemagick
@@ -103,6 +96,9 @@ in
        ])

        (mkIf cfg.desktop.enable [
+          protonup
+          winetricks
+          wine
          geekbench
          unigine-heaven
        ])
@@ -113,13 +109,15 @@ in

        (mkIf cfg.server.enable [
          nvtopPackages.intel
+          nvtopPackages.amd
+          dig
          helix
+          zfs
          zfstools
        ])

        (mkIf cfg.dev.enable [
          # lldb_20 # some biuld error atm
-          sqlite
          gemini-cli
          nfs-utils
          gcc
@@ -146,6 +144,7 @@ in
          prettierd
          # php84Packages.php-cs-fixer
          shfmt
+          luaformatter
          black
        ])
      ];
--- a/modules/nixos/programs/steam/default.nix
+++ b/modules/nixos/programs/steam/default.nix
@@ -1,7 +1,6 @@
 {
  config,
  lib,
-  pkgs,
  ...
 }:
 let
@@ -18,20 +17,6 @@ in
        enable = true;
        gamescopeSession.enable = true;
      };
-      gamescope = {
-        enable = true;
-        capSysNice = true;
-        args = [
-          "--rt"
-          "--expose-wayland"
-        ];
    };
  };
-    environment.systemPackages = with pkgs; [
-      protonup-ng
-      wine
-      winetricks
-      wine-wayland
-    ];
-  };
 }
--- a/modules/nixos/services/kanata/default.nix
+++ b/modules/nixos/services/kanata/default.nix
@@ -16,10 +16,14 @@ in
    services.kanata = {
      enable = true;
      package = pkgs.kanata-with-cmd;
-      keyboards.default = {
+      keyboards.hhkbse = {
        extraDefCfg = ''
          process-unmapped-keys yes
        '';
+        devices = [
+          "/dev/input/by-id/usb-PFU_Limited_HHKB-Hybrid-event-kbd"
+          "/dev/input/event2"
+        ];
        config = builtins.readFile (./. + "/hhkbse.kbd");
      };
    };
--- a/modules/nixos/services/kanata/hhkbse.kbd
+++ b/modules/nixos/services/kanata/hhkbse.kbd
@@ -18,7 +18,6 @@
  2 3 4 5 6 7 8 9 0 + ´ ' §
  e p ¨
  l ö ä
-  -
  z x rmet
 )

@@ -26,16 +25,13 @@
  _ _ _ _ _ _ _ _ _ _ pgdn pgup del
  _ _ '
  _ _ _
-  _
  _ _ @level3
 )

-
 (deflayer level3
  RA-2 RA-3 S-4 RA-5 S-¨ RA-7 RA-8 RA-9 RA-0 RA-+ ⇥ ⇤ S-'
  RA-5 ▲ RA-¨
  ◀ ▼ ▶
-  RA-<
  RA-S-z RA-S-x @level3
 )

--- a/modules/nixos/system/devpkgs/default.nix
+++ b/modules/nixos/system/devpkgs/default.nix
@@ -45,6 +45,7 @@ in
      # nodePackages_latest.sql-formatter
      prettierd
      shfmt
+      luaformatter
      black
    ];
  };
--- a/modules/nixos/system/fonts/default.nix
+++ b/modules/nixos/system/fonts/default.nix
@@ -26,7 +26,7 @@ in
        inputs.fonts.packages.${pkgs.system}.vcr-mono
        noto-fonts
        noto-fonts-cjk-sans
-        noto-fonts-color-emoji
+        noto-fonts-emoji
        liberation_ttf
        fira-code-symbols
        font-awesome
--- a/modules/server/infra/authentik/default.nix
+++ b/modules/server/infra/authentik/default.nix
@@ -1,24 +1,21 @@
 {
  config,
  lib,
+  pkgs,
  self,
  ...
 }: let
  unit = "authentik";
-  cfg = config.server.infra.${unit};
-  srv = config.server.infra;
+  cfg = config.server.${unit};
+  srv = config.server;
 in {
-  options.server.infra.${unit} = {
+  options.server.${unit} = {
    enable = lib.mkEnableOption {
      description = "Enable ${unit}";
    };
    url = lib.mkOption {
      type = lib.types.str;
-      default = "auth.${srv.www.url}";
-    };
-    port = lib.mkOption {
-      type = lib.types.port;
-      description = "The local port the service runs on";
+      default = "auth.${srv.www.domain}";
    };
    cloudflared = {
      credentialsFile = lib.mkOption {
@@ -34,11 +31,21 @@ in {
        example = "00000000-0000-0000-0000-000000000000";
      };
    };
-    homepage = {
-      name = "Authentik";
-      description = "An open-source IdP for modern SSO";
-      icon = "authentik.svg";
-      category = "Services";
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Authentik";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "An open-source IdP for modern SSO";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "authentik.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Services";
    };
  };

@@ -46,18 +53,20 @@ in {
    age.secrets = {
      authentikEnv = {
        file = "${self}/secrets/authentikEnv.age";
+        owner = "authentik";
      };
      authentikCloudflared = {
        file = "${self}/secrets/authentikCloudflared.age";
+        owner = "authentik";
      };
    };

-    server.infra = {
-      fail2ban = {
+    server = {
+      fail2ban = lib.mkIf cfg.enable {
        jails = {
          authentik = {
-            serviceName = "authentik";
-            failRegex = ''^.*Username or password is incorrect.*IP:\s*<HOST>'';
+            serviceName = "${cfg.url}";
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
          };
        };
      };
@@ -90,6 +99,7 @@ in {
            middlewares = {
              authentik = {
                forwardAuth = {
+                  tls.insecureSkipVerify = true;
                  address = "https://localhost:9443/outpost.goauthentik.io/auth/traefik";
                  trustForwardHeader = true;
                  authResponseHeaders = [
@@ -120,7 +130,7 @@ in {
            routers = {
              auth = {
                entryPoints = ["websecure"];
-                rule = "Host(`${cfg.url}`) && PathPrefix(`/outpost.goauthentik.io/`)";
+                rule = "Host(`${cfg.url}`) || HostRegexp(`{subdomain:[a-z0-9]+}.${srv.www.url}`) && PathPrefix(`/outpost.goauthentik.io/`)";
                service = "auth";
                tls.certResolver = "letsencrypt";
              };
--- a/modules/server/bazarr/default.nix
+++ b/modules/server/bazarr/default.nix
@@ -0,0 +1,62 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "bazarr";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Bazarr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Subtitle manager";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "bazarr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${unit} = {
+      enable = true;
+      user = srv.user;
+      group = srv.group;
+    };
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.bazarr.loadBalancer.servers = [{url = "http://127.0.0.1:${toString config.services.${unit}.listenPort}";}];
+          routers = {
+            bazarr = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "bazarr";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -1,16 +1,101 @@
 {
-  self,
  lib,
+  config,
+  pkgs,
  ...
 }: let
-  clib = import "${self}/lib/server" {inherit lib;};
-in {
-  imports = [
-    {
-      _module.args.clib = clib;
-    }
-    ./options.nix
-    ./infra
-    ./services
+  hardDrives = [
+    "/dev/disk/by-label/data"
  ];
+  inherit (lib) mkOption types;
+  cfg = config.server;
+  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in {
+  options.server = {
+    enable = lib.mkEnableOption "The server services and configuration variables";
+    email = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        Email name to be used to access the server services via Caddy reverse proxy
+      '';
+    };
+    domain = mkOption {
+      default = "";
+      type = types.str;
+      description = ''
+        Domain name to be used to access the server services via Caddy reverse proxy
+      '';
+    };
+    user = lib.mkOption {
+      default = "share";
+      type = lib.types.str;
+      description = ''
+        User to run the server services as
+      '';
+    };
+    group = lib.mkOption {
+      default = "share";
+      type = lib.types.str;
+      description = ''
+        Group to run the server services as
+      '';
+    };
+    uid = lib.mkOption {
+      default = 1000;
+      type = lib.types.int;
+      description = ''
+        UID to run the server services as
+      '';
+    };
+    gid = lib.mkOption {
+      default = 1000;
+      type = lib.types.int;
+      description = ''
+        GID to run the server services as
+      '';
+    };
+    timeZone = lib.mkOption {
+      default = "Europe/Stockholm";
+      type = lib.types.str;
+      description = ''
+        Time zone to be used for the server services
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users = {
+      groups.${cfg.group} = {
+        gid = cfg.gid;
+      };
+      users.${cfg.user} = {
+        uid = cfg.uid;
+        isSystemUser = true;
+        group = cfg.group;
+        extraGroups = ifTheyExist [
+          "audio"
+          "video"
+          "docker"
+          "libvirtd"
+          "qemu-libvirtd"
+          "rtkit"
+          "fail2ban"
+          "vaultwarden"
+          "qbittorrent"
+          "lidarr"
+          "prowlarr"
+          "bazarr"
+          "sonarr"
+          "radarr"
+          "media"
+          "share"
+          "render"
+          "input"
+          "authentik"
+          "traefik"
+        ];
+      };
+    };
+  };
 }
--- a/modules/server/fail2ban/default.nix
+++ b/modules/server/fail2ban/default.nix
@@ -0,0 +1,111 @@
+# from @notthebee
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.server.fail2ban;
+in
+{
+  options.server.fail2ban = {
+    enable = lib.mkEnableOption {
+      description = "Enable cloudflare fail2ban";
+    };
+    apiKeyFile = lib.mkOption {
+      description = "File containing your API key, scoped to Firewall Rules: Edit";
+      type = lib.types.str;
+      example = lib.literalExpression ''
+        Authorization: Bearer Qj06My1wXJEzcW46QCyjFbSMgVtwIGfX63Ki3NOj79o=
+        '''
+      '';
+    };
+    zoneId = lib.mkOption {
+      type = lib.types.str;
+    };
+    jails = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options = {
+            serviceName = lib.mkOption {
+              example = "vaultwarden";
+              type = lib.types.str;
+            };
+            failRegex = lib.mkOption {
+              type = lib.types.str;
+              example = "Login failed from IP: <HOST>";
+            };
+            ignoreRegex = lib.mkOption {
+              type = lib.types.str;
+              default = "";
+            };
+            maxRetry = lib.mkOption {
+              type = lib.types.int;
+              default = 3;
+            };
+          };
+        }
+      );
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.fail2ban = {
+      enable = true;
+      extraPackages = [
+        pkgs.curl
+        pkgs.jq
+      ];
+
+      jails = lib.attrsets.mapAttrs (name: value: {
+        settings = {
+          bantime = "30d";
+          findtime = "1h";
+          enabled = true;
+          backend = "systemd";
+          journalmatch = "_SYSTEMD_UNIT=${value.serviceName}.service";
+          port = "http,https";
+          filter = "${name}";
+          maxretry = 3;
+          action = "cloudflare-token-agenix";
+        };
+      }) cfg.jails;
+    };
+
+    environment.etc = lib.attrsets.mergeAttrsList [
+      (lib.attrsets.mapAttrs' (
+        name: value:
+        (lib.nameValuePair "fail2ban/filter.d/${name}.conf" {
+          text = ''
+            [Definition]
+            failregex = ${value.failRegex}
+            ignoreregex = ${value.ignoreRegex}
+          '';
+        })
+      ) cfg.jails)
+      {
+        "fail2ban/action.d/cloudflare-token-agenix.conf".text =
+          let
+            notes = "Fail2Ban on ${config.networking.hostName}";
+            cfapi = "https://api.cloudflare.com/client/v4/zones/${cfg.zoneId}/firewall/access_rules/rules";
+          in
+          ''
+            [Definition]
+            actionstart =
+            actionstop =
+            actioncheck =
+            actionunban = id=$(curl -s -X GET "${cfapi}" \
+                -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
+                    | jq -r '.result[] | select(.notes == "${notes}" and .configuration.target == "ip" and .configuration.value == "<ip>") | .id')
+                if [ -z "$id" ]; then echo "id for <ip> cannot be found"; exit 0; fi; \
+                curl -s -X DELETE "${cfapi}/$id" \
+                    -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
+                    --data '{"cascade": "none"}'
+            actionban = curl -X POST "${cfapi}" -H @${cfg.apiKeyFile} -H "Content-Type: application/json" --data '{"mode":"block","configuration":{"target":"ip","value":"<ip>"},"notes":"${notes}"}'
+            [Init]
+            name = cloudflare-token-agenix
+          '';
+      }
+    ];
+  };
+}
--- a/modules/server/gitea/default.nix
+++ b/modules/server/gitea/default.nix
@@ -0,0 +1,125 @@
+# taken from @jtojnar
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "gitea";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "git.${srv.domain}";
+    };
+    port = lib.mkOption {
+      type = lib.types.int;
+      default = 5003;
+      description = "The port to host Gitea on.";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Gitea";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Git with a cup of tea";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "gitea.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Services";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${unit} = {
+      enable = true;
+      appName = "cnix code forge";
+
+      database = {
+        type = "postgres";
+        socket = "/run/postgresql";
+        name = "gitea";
+        user = "gitea";
+        createDatabase = false;
+      };
+
+      lfs = {
+        enable = true;
+      };
+
+      settings = {
+        cors = {
+          ENABLED = true;
+          SCHEME = "https";
+          ALLOW_DOMAIN = cfg.url;
+        };
+        log = {
+          MODE = "console";
+        };
+        mailer = {
+          ENABLED = false;
+          MAILER_TYPE = "sendmail";
+          FROM = "noreply+adam@cnst.dev";
+          SENDMAIL_PATH = "/run/wrappers/bin/sendmail";
+        };
+        picture = {
+          DISABLE_GRAVATAR = true;
+        };
+        repository = {
+          DEFAULT_BRANCH = "main";
+          DEFAULT_REPO_UNITS = "repo.code,repo.issues,repo.pulls";
+          DISABLE_DOWNLOAD_SOURCE_ARCHIVES = true;
+        };
+        indexer = {
+          REPO_INDEXER_ENABLED = true;
+        };
+        server = {
+          DOMAIN = cfg.url;
+          LANDING_PAGE = "explore";
+          HTTP_PORT = cfg.port;
+          ROOT_URL = "https://${cfg.url}/";
+        };
+        security = {
+          DISABLE_GIT_HOOKS = false;
+        };
+        service = {
+          DISABLE_REGISTRATION = true;
+        };
+        session = {
+          COOKIE_SECURE = true;
+        };
+      };
+    };
+
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.gitea.loadBalancer.servers = [{url = "http://127.0.0.1:5003";}];
+          routers = {
+            gitea = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "gitea";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+
+    server.postgresql.databases = [
+      {
+        database = "gitea";
+      }
+    ];
+  };
+}
--- a/modules/server/homepage-dashboard/default.nix
+++ b/modules/server/homepage-dashboard/default.nix
@@ -0,0 +1,236 @@
+{
+  config,
+  lib,
+  self,
+  ...
+}: let
+  unit = "homepage-dashboard";
+  cfg = config.server.homepage-dashboard;
+  srv = config.server;
+in {
+  options.server.homepage-dashboard = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    misc = lib.mkOption {
+      default = [];
+      type = lib.types.listOf (
+        lib.types.attrsOf (
+          lib.types.submodule {
+            options = {
+              description = lib.mkOption {
+                type = lib.types.str;
+              };
+              href = lib.mkOption {
+                type = lib.types.str;
+              };
+              siteMonitor = lib.mkOption {
+                type = lib.types.str;
+              };
+              icon = lib.mkOption {
+                type = lib.types.str;
+              };
+            };
+          }
+        )
+      );
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    age.secrets = {
+      homepageEnvironment = {
+        file = "${self}/secrets/homepageEnvironment.age";
+      };
+    };
+    services = {
+      glances.enable = true;
+      ${unit} = {
+        enable = true;
+        environmentFile = config.age.secrets.homepageEnvironment.path;
+        settings = {
+          layout = [
+            {
+              Glances = {
+                header = false;
+                style = "row";
+                columns = 4;
+              };
+            }
+            {
+              Arr = {
+                header = true;
+                style = "column";
+              };
+            }
+            {
+              Downloads = {
+                header = true;
+                style = "column";
+              };
+            }
+            {
+              Media = {
+                header = true;
+                style = "column";
+              };
+            }
+            {
+              Services = {
+                header = true;
+                style = "column";
+              };
+            }
+          ];
+          headerStyle = "clean";
+          statusStyle = "dot";
+          hideVersion = "true";
+        };
+        widgets = [
+          {
+            openmeteo = {
+              label = "Kalmar";
+              timezone = "Europe/Stockholm";
+              units = "metric";
+              cache = 5;
+              latitude = 56.707262;
+              longitude = 16.324541;
+            };
+          }
+          {
+            resources = {
+              label = "SYSTEM";
+              memory = true;
+              cpu = true;
+              uptime = true;
+            };
+          }
+        ];
+        services = let
+          homepageCategories = [
+            "Arr"
+            "Media"
+            "Downloads"
+            "Services"
+          ];
+          hl = config.server;
+          mergedServices = hl // hl.podman;
+          homepageServices = x: (lib.attrsets.filterAttrs (
+              name: value: value ? homepage && value.homepage.category == x
+            )
+            mergedServices);
+        in
+          lib.lists.forEach homepageCategories (cat: {
+            "${cat}" =
+              lib.lists.forEach
+              (lib.attrsets.mapAttrsToList (name: value: {
+                inherit name;
+                url = value.url;
+                homepage = value.homepage;
+              }) (homepageServices "${cat}"))
+              (x: {
+                "${x.homepage.name}" = {
+                  icon = x.homepage.icon;
+                  description = x.homepage.description;
+                  href = "https://${x.url}${x.homepage.path or ""}";
+                  siteMonitor = "https://${x.url}${x.homepage.path or ""}";
+                };
+              });
+          })
+          ++ [{Misc = cfg.misc;}]
+          ++ [
+            {
+              Glances = let
+                port = toString config.services.glances.port;
+              in [
+                {
+                  Info = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "info";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+                {
+                  "CPU Temp" = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "sensor:Tctl";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+                {
+                  "GPU Radeon" = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "sensor:junction";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+                {
+                  "GPU Intel" = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "sensor:pkg";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+                {
+                  Processes = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "process";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+                {
+                  Network = {
+                    widget = {
+                      type = "glances";
+                      url = "http://localhost:${port}";
+                      metric = "network:enp6s0";
+                      chart = false;
+                      version = 4;
+                    };
+                  };
+                }
+              ];
+            }
+          ];
+      };
+
+      traefik = {
+        dynamicConfigOptions = {
+          http = {
+            services.homepage.loadBalancer.servers = [
+              {url = "http://127.0.0.1:${toString config.services.${unit}.listenPort}";}
+            ];
+            routers = {
+              homepage = {
+                entryPoints = ["websecure"];
+                rule = "Host(`cnix.dev`)";
+                service = "homepage";
+                tls.certResolver = "letsencrypt";
+                # middlewares = ["authentik"];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/infra/default.nix
+++ b/modules/server/infra/default.nix
@@ -1,13 +0,0 @@
-{
-  imports = [
-    ./authentik
-    ./fail2ban
-    ./keepalived
-    ./podman
-    ./postgres
-    ./tailscale
-    ./traefik
-    ./unbound
-    ./www
-  ];
-}
--- a/modules/server/infra/fail2ban/default.nix
+++ b/modules/server/infra/fail2ban/default.nix
@@ -1,131 +0,0 @@
-# from @notthebee
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.server.infra.fail2ban;
-in {
-  options.server.infra.fail2ban = {
-    enable = lib.mkEnableOption {
-      description = "Enable cloudflare fail2ban";
-    };
-    apiKeyFile = lib.mkOption {
-      description = "File containing your API key, scoped to Firewall Rules: Edit";
-      type = lib.types.str;
-      example = lib.literalExpression ''
-        Authorization: Bearer vH6-p0y=i4w3n7TjKqZ@x8D_lR!A9b2cOezXgUuJdE5F
-        '''
-      '';
-    };
-    zoneId = lib.mkOption {
-      type = lib.types.str;
-    };
-    jails = lib.mkOption {
-      type = lib.types.attrsOf (
-        lib.types.submodule {
-          options = {
-            serviceName = lib.mkOption {
-              example = "vaultwarden";
-              type = lib.types.str;
-            };
-            _groupsre = lib.mkOption {
-              type = lib.types.lines;
-              example = ''(?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*)'';
-              default = "";
-            };
-            failRegex = lib.mkOption {
-              type = lib.types.lines;
-              example = ''
-                ^Login failed from IP: <HOST>$
-                ^Two-factor challenge failed from <HOST>$
-              '';
-            };
-            ignoreRegex = lib.mkOption {
-              type = lib.types.str;
-              default = "";
-            };
-            datePattern = lib.mkOption {
-              type = lib.types.str;
-              default = "";
-              example = '',?\s*"time"\s*:\s*"%%Y-%%m-%%d[T ]%%H:%%M:%%S(%%z)?"'';
-              description = "Optional datepattern line for the fail2ban filter.";
-            };
-            maxRetry = lib.mkOption {
-              type = lib.types.int;
-              default = 3;
-            };
-          };
-        }
-      );
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.fail2ban = {
-      enable = true;
-      extraPackages = [
-        pkgs.curl
-        pkgs.jq
-      ];
-
-      jails =
-        lib.attrsets.mapAttrs (name: value: {
-          settings = {
-            bantime = "24h";
-            findtime = "10m";
-            enabled = true;
-            backend = "systemd";
-            journalmatch = "_SYSTEMD_UNIT=${value.serviceName}.service";
-            port = "http,https";
-            filter = "${name}";
-            maxretry = 3;
-            action = "cloudflare-token-agenix";
-          };
-        })
-        cfg.jails;
-    };
-
-    environment.etc = lib.attrsets.mergeAttrsList [
-      (lib.attrsets.mapAttrs' (
-          name: value: (lib.nameValuePair "fail2ban/filter.d/${name}.conf" {
-            text =
-              ''
-                [Definition]
-                failregex = ${value.failRegex}
-                ignoreregex = ${value.ignoreRegex}
-              ''
-              + lib.optionalString (value.datePattern != "") ''
-                datepattern = ${value.datePattern}
-              ''
-              + lib.optionalString (value._groupsre != "") ''
-                _groupsre = ${value._groupsre}
-              '';
-          })
-        )
-        cfg.jails)
-      {
-        "fail2ban/action.d/cloudflare-token-agenix.conf".text = let
-          notes = "Fail2Ban on ${config.networking.hostName}";
-          cfapi = "https://api.cloudflare.com/client/v4/zones/${cfg.zoneId}/firewall/access_rules/rules";
-        in ''
-          [Definition]
-          actionstart =
-          actionstop =
-          actioncheck =
-          actionunban = id=$(curl -s -X GET "${cfapi}" \
-              -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
-                  | jq -r '.result[] | select(.notes == "${notes}" and .configuration.target == "ip" and .configuration.value == "<ip>") | .id')
-              if [ -z "$id" ]; then echo "id for <ip> cannot be found"; exit 0; fi; \
-              curl -s -X DELETE "${cfapi}/$id" \
-                  -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
-                  --data '{"cascade": "none"}'
-          actionban = curl -X POST "${cfapi}" -H @${cfg.apiKeyFile} -H "Content-Type: application/json" --data '{"mode":"block","configuration":{"target":"ip","value":"<ip>"},"notes":"${notes}"}'
-          [Init]
-          name = cloudflare-token-agenix
-        '';
-      }
-    ];
-  };
-}
--- a/modules/server/infra/podman/acquis.yaml
+++ b/modules/server/infra/podman/acquis.yaml
@@ -1,6 +0,0 @@
---
-filenames:
-  - /var/log/traefik/access.log
-poll_without_inotify: true
-labels:
-  type: traefik
--- a/modules/server/infra/podman/default.nix
+++ b/modules/server/infra/podman/default.nix
@@ -1,194 +0,0 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}: let
-  infra = config.server.infra;
-  cfg = config.server.services;
-
-  getPiholeSecret = hostname:
-    if hostname == "ziggy"
-    then [config.age.secrets.piholeZiggy.path]
-    else if hostname == "sobotka"
-    then [config.age.secrets.pihole.path]
-    else throw "Unknown hostname: ${hostname}";
-in {
-  options.server.infra = {
-    podman.enable = lib.mkEnableOption "Enables Podman";
-    gluetun.enable = lib.mkEnableOption "Enables gluetun";
-  };
-  config = lib.mkIf infra.podman.enable {
-    age.secrets = {
-      pihole.file = "${self}/secrets/${config.networking.hostName}Pihole.age";
-      slskd.file = "${self}/secrets/slskd.age";
-    };
-
-    virtualisation = {
-      containers.enable = true;
-      podman.enable = true;
-    };
-
-    networking.firewall = lib.mkIf cfg.pihole.enable {
-      allowedTCPPorts = [
-        53
-        5335
-      ];
-      allowedUDPPorts = [
-        53
-        5335
-      ];
-    };
-
-    virtualisation.oci-containers.containers = lib.mkMerge [
-      (lib.mkIf infra.gluetun.enable {
-        gluetun = {
-          image = "qmcgaw/gluetun";
-          ports = [
-            "8388:8388"
-            "58846:58846"
-            "8080:8080"
-            "5030:5030"
-            "5031:5031"
-            "50300:50300"
-          ];
-          devices = ["/dev/net/tun:/dev/net/tun"];
-          autoStart = true;
-          extraOptions = [
-            "--cap-add=NET_ADMIN"
-          ];
-          volumes = ["/var:/gluetun"];
-          environmentFiles = [
-            config.age.secrets.gluetunEnvironment.path
-          ];
-          environment = {
-            DEV_MODE = "false";
-            VPN_SERVICE_PROVIDER = "mullvad";
-            VPN_TYPE = "wireguard";
-            SERVER_CITIES = "Stockholm";
-          };
-        };
-      })
-
-      (lib.mkIf cfg.qbittorrent.enable {
-        qbittorrent = {
-          image = "ghcr.io/hotio/qbittorrent:latest";
-          autoStart = true;
-          dependsOn = ["gluetun"];
-          ports = [
-            "8080:8080"
-            "58846:58846"
-          ];
-          extraOptions = [
-            "--network=container:gluetun"
-          ];
-          volumes = [
-            "/var/lib/qbittorrent:/config:rw"
-            "/mnt/data/media/downloads:/downloads:rw"
-          ];
-          environmentFiles = [
-            config.age.secrets.gluetunEnvironment.path
-          ];
-          environment = {
-            PUID = "994";
-            PGID = "993";
-            TZ = "Europe/Stockholm";
-            WEBUI_PORT = "${builtins.toString cfg.qbittorrent.port}";
-          };
-        };
-      })
-
-      (lib.mkIf cfg.slskd.enable {
-        slskd = {
-          image = "slskd/slskd:latest";
-          autoStart = true;
-          dependsOn = ["gluetun"];
-          ports = [
-            "5030:5030"
-            "5031:5031"
-            "50300:50300"
-          ];
-          extraOptions = [
-            "--network=container:gluetun"
-          ];
-          volumes = [
-            "/var/lib/slskd:/app:rw"
-            "/mnt/data/media/downloads:/downloads:rw"
-          ];
-          environmentFiles = [
-            config.age.secrets.gluetunEnvironment.path
-            config.age.secrets.slskd.path
-          ];
-          environment = {
-            TZ = "Europe/Stockholm";
-            PUID = "981";
-            PGID = "982";
-            SLSKD_REMOTE_CONFIGURATION = "true";
-            SLSKD_REMOTE_FILE_MANAGEMENT = "true";
-            SLSKD_DOWNLOADS_DIR = "/downloads";
-            SLSKD_UMASK = "022";
-          };
-        };
-      })
-
-      (lib.mkIf cfg.pihole.enable {
-        pihole = {
-          autoStart = true;
-          image = "pihole/pihole:2025.08.0";
-          volumes = [
-            "/var/lib/pihole:/etc/pihole/"
-            "/var/lib/dnsmasq.d:/etc/dnsmasq.d/"
-          ];
-          environment = {
-            TZ = "Europe/Stockholm";
-            CUSTOM_CACHE_SIZE = "0";
-            WEBTHEME = "default-darker";
-          };
-          environmentFiles = getPiholeSecret config.networking.hostName;
-          ports = [
-            "53:53/tcp"
-            "53:53/udp"
-            "8053:80/tcp"
-          ];
-          extraOptions = [
-            "--cap-add=NET_ADMIN"
-            "--cap-add=SYS_NICE"
-            "--cap-add=SYS_TIME"
-          ];
-        };
-      })
-      (lib.mkIf cfg.ollama.enable {
-        intel-llm = {
-          autoStart = true;
-          image = "intelanalytics/ipex-llm-inference-cpp-xpu:latest";
-          devices = [
-            "/dev/dri:/dev/dri:rwm"
-          ];
-          volumes = [
-            "/var/lib/ollama:/models"
-          ];
-          environment = {
-            OLLAMA_ORIGINS = "http://192.168.*";
-            SYCL_PI_LEVEL_ZERO_USE_IMMEDIATE_COMMANDLISTS = "1";
-            ONEAPI_DEVICE_SELECTOR = "level_zero:0";
-            OLLAMA_HOST = "[::]:11434";
-            no_proxy = "localhost,127.0.0.1";
-            DEVICE = "Arc";
-            OLLAMA_NUM_GPU = "999";
-            ZES_ENABLE_SYSMAN = "1";
-          };
-          cmd = [
-            "/bin/sh"
-            "-c"
-            "/llm/scripts/start-ollama.sh && echo 'Startup script finished, container is now idling.' && sleep infinity"
-          ];
-          extraOptions = [
-            "--net=host"
-            "--memory=32G"
-            "--shm-size=16g"
-          ];
-        };
-      })
-    ];
-  };
-}
--- a/modules/server/infra/tailscale/default.nix
+++ b/modules/server/infra/tailscale/default.nix
@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
-with lib; let
-  cfg = config.server.infra.tailscale;
-in {
-  options.server.infra.tailscale = {
-    enable = mkEnableOption "Enable tailscale server configuration";
-  };
-  config = mkIf cfg.enable {
-    age.secrets.sobotkaTsAuth.file = "${self}/secrets/sobotkaTsAuth.age";
-
-    services.tailscale = {
-      enable = true;
-      openFirewall = true;
-      useRoutingFeatures = "server";
-      authKeyFile = config.age.secrets.sobotkaTsAuth.path;
-      extraSetFlags = [
-        "--advertise-exit-node"
-      ];
-    };
-  };
-}
--- a/modules/server/infra/traefik/default.nix
+++ b/modules/server/infra/traefik/default.nix
@@ -1,183 +0,0 @@
-{
-  lib,
-  clib,
-  config,
-  pkgs,
-  self,
-  ...
-}: let
-  inherit (lib) mkEnableOption mkIf types;
-
-  cfg = config.server.infra.traefik;
-  srv = config.server;
-
-  generateRouters = services: config:
-    lib.mapAttrs' (
-      name: service:
-        lib.nameValuePair name {
-          entryPoints = ["websecure"];
-          # FIX 3: Use backticks for the Host rule and interpolation
-          rule = "Host(`${clib.server.mkFullDomain config service}`)";
-          service = name;
-          tls.certResolver = "letsencrypt";
-        }
-    ) (lib.filterAttrs (_: s: s.enable) services);
-
-  generateServices = services:
-    lib.mapAttrs' (name: service:
-      lib.nameValuePair name {
-        loadBalancer.servers = [{url = "http://localhost:${toString service.port}";}];
-      }) (lib.filterAttrs (name: service: service.enable) services);
-
-  getCloudflareCredentials = hostname:
-    if hostname == "ziggy"
-    then config.age.secrets.cloudflareDnsCredentialsZiggy.path
-    else if hostname == "sobotka"
-    then config.age.secrets.cloudflareDnsCredentials.path
-    else throw "Unknown hostname: ${hostname}";
-in {
-  options.server.infra.traefik = {
-    enable = mkEnableOption "Enable global Traefik reverse proxy with ACME";
-  };
-
-  config = mkIf cfg.enable {
-    age.secrets = {
-      traefikEnv = {
-        file = "${self}/secrets/traefikEnv.age";
-        mode = "640";
-        owner = "traefik";
-        group = "traefik";
-      };
-      crowdsecApi.file = "${self}/secrets/crowdsecApi.age";
-    };
-
-    systemd.services.traefik = {
-      serviceConfig = {
-        EnvironmentFile = [config.age.secrets.traefikEnv.path];
-      };
-    };
-    networking.firewall.allowedTCPPorts = [80 443];
-
-    services = {
-      tailscale.permitCertUid = "traefik";
-      traefik = {
-        enable = true;
-
-        staticConfigOptions = {
-          log = {
-            level = "DEBUG";
-          };
-
-          accesslog = {filepath = "/var/lib/traefik/logs/access.log";};
-
-          tracing = {};
-          api = {
-            dashboard = true;
-            insecure = false;
-          };
-
-          certificatesResolvers = {
-            vpn.tailscale = {};
-            letsencrypt = {
-              acme = {
-                email = "adam@cnst.dev";
-                storage = "/var/lib/traefik/cert.json";
-                dnsChallenge = {
-                  provider = "cloudflare";
-                  resolvers = [
-                    "1.1.1.1:53"
-                    "1.0.0.1:53"
-                  ];
-                };
-              };
-            };
-          };
-
-          entryPoints = {
-            # redis = {
-            #   address = "0.0.0.0:6381";
-            # };
-            # postgres = {
-            #   address = "0.0.0.0:5433";
-            # };
-            web = {
-              address = ":80";
-              forwardedHeaders.insecure = true;
-              http.redirections.entryPoint = {
-                to = "websecure";
-                scheme = "https";
-                permanent = true;
-              };
-              # http.middlewares = "crowdsec@file";
-            };
-
-            websecure = {
-              address = ":443";
-              forwardedHeaders.insecure = true;
-              http.tls = {
-                certResolver = "letsencrypt";
-                domains = [
-                  {
-                    main = "cnix.dev";
-                    sans = ["*.cnix.dev"];
-                  }
-                  {
-                    main = "ts.cnst.dev";
-                    sans = ["*ts.cnst.dev"];
-                  }
-                ];
-              };
-              # http.middlewares = "crowdsec@file";
-            };
-
-            experimental = {
-              address = ":1111";
-              forwardedHeaders.insecure = true;
-            };
-          };
-
-          experimental = {
-            # Install the Crowdsec Bouncer plugin
-            plugins = {
-              #enabled = "true";
-              bouncer = {
-                moduleName = "github.com/maxlerebourg/crowdsec-bouncer-traefik-plugin";
-                version = "v1.4.5";
-              };
-            };
-          };
-        };
-
-        dynamicConfigOptions = {
-          http = {
-            services = generateServices srv.services;
-
-            routers =
-              (generateRouters srv.services config)
-              // {
-                api = {
-                  entryPoints = ["websecure"];
-                  rule = "Host(`traefik.${srv.domain}`)";
-                  service = "api@internal";
-                  tls.certResolver = "letsencrypt";
-                };
-              };
-            # middlewares = {
-            #   crowdsec = {
-            #     plugin = {
-            #       bouncer = {
-            #         enabled = "true";
-            #         logLevel = "DEBUG";
-            #         crowdsecLapiKeyFile = config.age.secrets.crowdsecApi.path;
-            #         crowdsecMode = "live";
-            #         crowdsecLapiHost = ":4223";
-            #       };
-            #     };
-            #   };
-            # };
-          };
-        };
-      };
-    };
-  };
-}
--- a/modules/server/jellyfin/default.nix
+++ b/modules/server/jellyfin/default.nix
@@ -0,0 +1,66 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  service = "jellyfin";
+  cfg = config.server.${service};
+  srv = config.server;
+in {
+  options.server.${service} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${service}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${service}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "jellyfin.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Jellyfin";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "The Free Software Media System";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "jellyfin.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Media";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${service} = {
+      enable = true;
+      user = srv.user;
+      group = srv.group;
+    };
+    environment.systemPackages = with pkgs; [
+      jellyfin-ffmpeg
+    ];
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.jellyfin.loadBalancer.servers = [{url = "http://127.0.0.1:8096";}];
+          routers = {
+            jellyfin = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "jellyfin";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/jellyseerr/default.nix
+++ b/modules/server/jellyseerr/default.nix
@@ -0,0 +1,61 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  service = "jellyseerr";
+  srv = config.server;
+  cfg = config.server.${service};
+in {
+  options.server.${service} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${service}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${service}.${srv.domain}";
+    };
+    port = lib.mkOption {
+      type = lib.types.port;
+      default = 5055;
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Jellyseerr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Media request and discovery manager";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "jellyseerr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${service} = {
+      enable = true;
+      port = cfg.port;
+    };
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.jellyseerr.loadBalancer.servers = [{url = "http://127.0.0.1:${toString cfg.port}";}];
+          routers = {
+            jellyseerr = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "jellyseerr";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/infra/keepalived/default.nix
+++ b/modules/server/infra/keepalived/default.nix
@@ -3,24 +3,27 @@
  config,
  self,
  ...
-}: let
+}:
+let
  unit = "keepalived";
-  cfg = config.server.infra.${unit};
+  cfg = config.server.${unit};

-  hostCfg = hostname:
-    if hostname == "sobotka"
-    then {
+  hostCfg =
+    hostname:
+    if hostname == "sobotka" then
+      {
        ip = "192.168.88.14";
        priority = 20;
        state = "MASTER";
      }
-    else if hostname == "ziggy"
-    then {
+    else if hostname == "ziggy" then
+      {
        ip = "192.168.88.12";
        priority = 10;
        state = "BACKUP";
      }
-    else throw "No keepalived config defined for host ${hostname}";
+    else
+      throw "No keepalived config defined for host ${hostname}";

  _self = hostCfg config.networking.hostName;

@@ -31,8 +34,9 @@

  # Remove self from peers
  peers = builtins.filter (ip: ip != _self.ip) allPeers;
-in {
-  options.server.infra.${unit} = {
+in
+{
+  options.server.${unit} = {
    enable = lib.mkEnableOption {
      description = "Enable ${unit}";
    };
--- a/modules/server/lidarr/default.nix
+++ b/modules/server/lidarr/default.nix
@@ -0,0 +1,62 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "lidarr";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Lidarr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Music collection manager";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "lidarr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${unit} = {
+      enable = true;
+      user = srv.user;
+      group = srv.group;
+    };
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.lidarr.loadBalancer.servers = [{url = "http://127.0.0.1:8686";}];
+          routers = {
+            lidarr = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "lidarr";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/n8n/default.nix
+++ b/modules/server/n8n/default.nix
@@ -0,0 +1,64 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "n8n";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "n8n";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "A workflow automation platform";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "n8n.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Services";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services = {
+      n8n = {
+        enable = true;
+        openFirewall = true;
+      };
+
+      traefik = {
+        dynamicConfigOptions = {
+          http = {
+            services.n8n.loadBalancer.servers = [{url = "http://127.0.0.1:5678";}];
+            routers = {
+              n8n = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.url}`)";
+                service = "n8n";
+                tls.certResolver = "letsencrypt";
+                # middlewares = ["authentik"];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/services/nextcloud/default.nix
+++ b/modules/server/services/nextcloud/default.nix
@@ -6,30 +6,64 @@
  ...
 }: let
  unit = "nextcloud";
-  cfg = config.server.services.${unit};
+  cfg = config.server.${unit};
  srv = config.server;
 in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    adminpassFile = lib.mkOption {
+      type = lib.types.path;
+    };
+    adminuser = lib.mkOption {
+      type = lib.types.str;
+      default = "cnst";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "cloud.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Nextcloud";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "A safe home for all your data";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "nextcloud.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Services";
+    };
+  };
  config = lib.mkIf cfg.enable {
    age.secrets = {
      nextcloudAdminPass.file = "${self}/secrets/nextcloudAdminPass.age";
      nextcloudCloudflared.file = "${self}/secrets/nextcloudCloudflared.age";
    };

-    server.infra.fail2ban.jails.nextcloud = {
-      serviceName = "${unit}";
-      _groupsre = ''(?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*)'';
-      failRegex = ''
-        ^\{%(_groupsre)s,?\s*"remoteAddr":"<HOST>"%(_groupsre)s,?\s*"message":"Login failed:
-                    ^\{%(_groupsre)s,?\s*"remoteAddr":"<HOST>"%(_groupsre)s,?\s*"message":"Two-factor challenge failed:
-                    ^\{%(_groupsre)s,?\s*"remoteAddr":"<HOST>"%(_groupsre)s,?\s*"message":"Trusted domain error.
-      '';
-      datePattern = '',?\s*"time"\s*:\s*"%%Y-%%m-%%d[T ]%%H:%%M:%%S(%%z)?"'';
+    server.fail2ban = lib.mkIf config.server.fail2ban.enable {
+      jails = {
+        nextcloud = {
+          serviceName = "phpfpm-nextcloud";
+          failRegex = "^.*Login failed:.*(Remote IP: <HOST>).*$";
+        };
+      };
    };

    services = {
      ${unit} = {
        enable = true;
-        package = pkgs.nextcloud32;
+        package = pkgs.nextcloud31;
        hostName = "nextcloud";
        configureRedis = true;
        caching = {
@@ -67,7 +101,7 @@ in {
          dbhost = "/run/postgresql";
          dbname = "nextcloud";
          adminuser = "cnst";
-          adminpassFile = config.age.secrets.nextcloudAdminPass.path;
+          adminpassFile = cfg.adminpassFile;
        };
      };

@@ -86,9 +120,21 @@ in {
          forceSSL = false;
        };
      };
+
+      traefik.dynamicConfigOptions.http = {
+        routers.nextcloud = {
+          entryPoints = ["websecure"];
+          rule = "Host(`${cfg.url}`)";
+          service = "nextcloud";
+          tls.certResolver = "letsencrypt";
+        };
+        services.nextcloud.loadBalancer.servers = [
+          {url = "http://127.0.0.1:8182";}
+        ];
+      };
    };

-    server.infra.postgresql.databases = [
+    server.postgresql.databases = [
      {
        database = "nextcloud";
      }
--- a/modules/server/options.nix
+++ b/modules/server/options.nix
@@ -1,180 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  inherit (lib) mkOption types;
-  ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
-  cfg = config.server;
-in {
-  options.server = {
-    enable = lib.mkEnableOption "The server services and configuration variables";
-    email = mkOption {
-      default = "";
-      type = types.str;
-      description = ''
-        Email name to be used to access the server services via Caddy reverse proxy
-      '';
-    };
-    domain = mkOption {
-      default = "";
-      type = types.str;
-      description = ''
-        Domain name to be used to access the server services via Caddy reverse proxy
-      '';
-    };
-    ip = lib.mkOption {
-      type = lib.types.str;
-      default = "127.0.0.1";
-      description = "The local IP of the service.";
-    };
-    user = lib.mkOption {
-      default = "share";
-      type = lib.types.str;
-      description = ''
-        User to run the server services as
-      '';
-    };
-    group = lib.mkOption {
-      default = "share";
-      type = lib.types.str;
-      description = ''
-        Group to run the server services as
-      '';
-    };
-    uid = lib.mkOption {
-      default = 1000;
-      type = lib.types.int;
-      description = ''
-        UID to run the server services as
-      '';
-    };
-    gid = lib.mkOption {
-      default = 1000;
-      type = lib.types.int;
-      description = ''
-        GID to run the server services as
-      '';
-    };
-    timeZone = lib.mkOption {
-      default = "Europe/Stockholm";
-      type = lib.types.str;
-      description = ''
-        Time zone to be used for the server services
-      '';
-    };
-    services = lib.mkOption {
-      type = lib.types.attrsOf (lib.types.submodule ({name, ...}: {
-        options = {
-          enable = lib.mkEnableOption "the service";
-          subdomain = lib.mkOption {
-            type = lib.types.str;
-            default = "";
-            description = "The subdomain for the service (e.g., 'jellyfin')";
-          };
-          exposure = lib.mkOption {
-            type = lib.types.enum ["local" "tunnel" "tailscale"];
-            default = "local";
-            description = "Controls where the service is exposed";
-          };
-          port = lib.mkOption {
-            type = lib.types.int;
-            default = 80;
-            description = "The port to host service on.";
-          };
-          configDir = lib.mkOption {
-            type = lib.types.path;
-            default = "/var/lib/${name}";
-            description = "Configuration directory for ${name}.";
-          };
-          cloudflared = lib.mkOption {
-            type = lib.types.submodule {
-              options = {
-                credentialsFile = lib.mkOption {
-                  type = lib.types.str;
-                  example = lib.literalExpression ''
-                    pkgs.writeText "cloudflare-credentials.json" '''
-                    {"AccountTag":"secret","TunnelSecret":"secret","TunnelID":"secret"}
-                    '''
-                  '';
-                };
-                tunnelId = lib.mkOption {
-                  type = lib.types.str;
-                  example = "00000000-0000-0000-0000-000000000000";
-                };
-              };
-            };
-            description = "Cloudflare tunnel configuration for this service.";
-          };
-          homepage = lib.mkOption {
-            type = lib.types.submodule {
-              options = {
-                name = lib.mkOption {
-                  type = lib.types.str;
-                  default = "";
-                  description = "Display name on the homepage.";
-                };
-                description = lib.mkOption {
-                  type = lib.types.str;
-                  default = "";
-                  description = "A short description for the homepage tile.";
-                };
-                icon = lib.mkOption {
-                  type = lib.types.str;
-                  default = "Zervices c00l stuff";
-                  description = "Icon file name for the homepage tile.";
-                };
-                category = lib.mkOption {
-                  type = lib.types.str;
-                  default = "";
-                  description = "Homepage category grouping.";
-                };
-                path = lib.mkOption {
-                  type = lib.types.str;
-                  default = "";
-                  example = "/admin";
-                  description = "Optional path suffix for homepage links (e.g. /admin).";
-                };
-              };
-            };
-            description = "Homepage metadata for this service.";
-          };
-        };
-      }));
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    users = {
-      groups.${cfg.group} = {
-        gid = cfg.gid;
-      };
-      users.${cfg.user} = {
-        uid = cfg.uid;
-        isSystemUser = true;
-        group = cfg.group;
-        extraGroups = ifTheyExist [
-          "audio"
-          "video"
-          "docker"
-          "libvirtd"
-          "qemu-libvirtd"
-          "rtkit"
-          "fail2ban"
-          "vaultwarden"
-          "qbittorrent"
-          "lidarr"
-          "prowlarr"
-          "bazarr"
-          "sonarr"
-          "radarr"
-          "media"
-          "share"
-          "render"
-          "input"
-          "authentik"
-          "traefik"
-        ];
-      };
-    };
-  };
-}
--- a/modules/server/podman/default.nix
+++ b/modules/server/podman/default.nix
@@ -0,0 +1,321 @@
+{
+  config,
+  lib,
+  pkgs,
+  self,
+  ...
+}: let
+  srv = config.server;
+  cfg = config.server.podman;
+
+  piholeUrl =
+    if config.networking.hostName == "sobotka"
+    then "pihole0"
+    else if config.networking.hostName == "ziggy"
+    then "pihole1"
+    else throw "Unknown hostname";
+
+  getPiholeSecret = hostname:
+    if hostname == "ziggy"
+    then [config.age.secrets.piholeZiggy.path]
+    else if hostname == "sobotka"
+    then [config.age.secrets.pihole.path]
+    else throw "Unknown hostname: ${hostname}";
+in {
+  options.server.podman = {
+    enable = lib.mkEnableOption "Enables Podman";
+    gluetun.enable = lib.mkEnableOption "Enables gluetun";
+
+    qbittorrent = {
+      enable = lib.mkEnableOption "Enable qBittorrent";
+      url = lib.mkOption {
+        type = lib.types.str;
+        default = "qbt.${srv.domain}";
+      };
+      port = lib.mkOption {
+        type = lib.types.int;
+        default = 8080;
+        description = "The port to host qBittorrent on.";
+      };
+      homepage.name = lib.mkOption {
+        type = lib.types.str;
+        default = "qBittorrent";
+      };
+      homepage.description = lib.mkOption {
+        type = lib.types.str;
+        default = "Torrent client";
+      };
+      homepage.icon = lib.mkOption {
+        type = lib.types.str;
+        default = "qbittorrent.svg";
+      };
+      homepage.category = lib.mkOption {
+        type = lib.types.str;
+        default = "Downloads";
+      };
+    };
+
+    slskd = {
+      enable = lib.mkEnableOption "Enable Soulseek";
+      url = lib.mkOption {
+        type = lib.types.str;
+        default = "slskd.${srv.domain}";
+      };
+      port = lib.mkOption {
+        type = lib.types.int;
+        default = 5030;
+        description = "The port to host Soulseek webui on.";
+      };
+      homepage.name = lib.mkOption {
+        type = lib.types.str;
+        default = "slskd";
+      };
+      homepage.description = lib.mkOption {
+        type = lib.types.str;
+        default = "Web-based Soulseek client";
+      };
+      homepage.icon = lib.mkOption {
+        type = lib.types.str;
+        default = "slskd.svg";
+      };
+      homepage.category = lib.mkOption {
+        type = lib.types.str;
+        default = "Downloads";
+      };
+    };
+
+    pihole = {
+      enable = lib.mkEnableOption {
+        description = "Enable";
+      };
+      port = lib.mkOption {
+        type = lib.types.int;
+        default = 8053;
+        description = "The port to host PiHole on.";
+      };
+      url = lib.mkOption {
+        type = lib.types.str;
+        default = "${piholeUrl}.${srv.domain}";
+      };
+      homepage.name = lib.mkOption {
+        type = lib.types.str;
+        default = "PiHole";
+      };
+      homepage.description = lib.mkOption {
+        type = lib.types.str;
+        default = "Adblocking and DNS service";
+      };
+      homepage.icon = lib.mkOption {
+        type = lib.types.str;
+        default = "pi-hole.svg";
+      };
+      homepage.category = lib.mkOption {
+        type = lib.types.str;
+        default = "Services";
+      };
+      homepage.path = lib.mkOption {
+        type = lib.types.str;
+        default = "/admin";
+        description = "Optional path suffix for homepage links (e.g. /admin).";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    age.secrets = {
+      pihole.file = "${self}/secrets/${config.networking.hostName}Pihole.age";
+      slskd.file = "${self}/secrets/slskd.age";
+    };
+
+    virtualisation = {
+      containers.enable = true;
+      podman.enable = true;
+    };
+
+    networking.firewall = lib.mkIf cfg.pihole.enable {
+      allowedTCPPorts = [
+        53
+        5335
+      ];
+      allowedUDPPorts = [
+        53
+        5335
+      ];
+    };
+
+    services.traefik = lib.mkMerge [
+      (lib.mkIf cfg.pihole.enable {
+        dynamicConfigOptions = {
+          http = {
+            services = {
+              pihole.loadBalancer.servers = [{url = "http://localhost:${toString cfg.pihole.port}";}];
+            };
+            routers = {
+              pihole = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.pihole.url}`)";
+                service = "pihole";
+                tls.certResolver = "letsencrypt";
+              };
+            };
+          };
+        };
+      })
+
+      (lib.mkIf cfg.qbittorrent.enable {
+        dynamicConfigOptions = {
+          http = {
+            services = {
+              qbittorrent.loadBalancer.servers = [{url = "http://localhost:${toString cfg.qbittorrent.port}";}];
+            };
+            routers = {
+              qbittorrent = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.qbittorrent.url}`)";
+                service = "qbittorrent";
+                tls.certResolver = "letsencrypt";
+              };
+            };
+          };
+        };
+      })
+
+      (lib.mkIf cfg.slskd.enable {
+        dynamicConfigOptions = {
+          http = {
+            services = {
+              slskd.loadBalancer.servers = [{url = "http://localhost:${toString cfg.slskd.port}";}];
+            };
+            routers = {
+              slskd = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.slskd.url}`)";
+                service = "slskd";
+                tls.certResolver = "letsencrypt";
+              };
+            };
+          };
+        };
+      })
+    ];
+
+    virtualisation.oci-containers.containers = lib.mkMerge [
+      (lib.mkIf cfg.gluetun.enable {
+        gluetun = {
+          image = "qmcgaw/gluetun";
+          ports = [
+            "8388:8388"
+            "58846:58846"
+            "8080:8080"
+            "5030:5030"
+            "5031:5031"
+            "50300:50300"
+          ];
+          devices = ["/dev/net/tun:/dev/net/tun"];
+          autoStart = true;
+          extraOptions = [
+            "--cap-add=NET_ADMIN"
+          ];
+          volumes = ["/var:/gluetun"];
+          environmentFiles = [
+            config.age.secrets.gluetunEnvironment.path
+          ];
+          environment = {
+            DEV_MODE = "false";
+            VPN_SERVICE_PROVIDER = "mullvad";
+            VPN_TYPE = "wireguard";
+            SERVER_CITIES = "Stockholm";
+          };
+        };
+      })
+
+      (lib.mkIf cfg.qbittorrent.enable {
+        qbittorrent = {
+          image = "ghcr.io/hotio/qbittorrent:latest";
+          autoStart = true;
+          dependsOn = ["gluetun"];
+          ports = [
+            "8080:8080"
+            "58846:58846"
+          ];
+          extraOptions = [
+            "--network=container:gluetun"
+          ];
+          volumes = [
+            "/var/lib/qbittorrent:/config:rw"
+            "/mnt/data/media/downloads:/downloads:rw"
+          ];
+          environmentFiles = [
+            config.age.secrets.gluetunEnvironment.path
+          ];
+          environment = {
+            PUID = "994";
+            PGID = "993";
+            TZ = "Europe/Stockholm";
+            WEBUI_PORT = "${builtins.toString cfg.qbittorrent.port}";
+          };
+        };
+      })
+
+      (lib.mkIf cfg.slskd.enable {
+        slskd = {
+          image = "slskd/slskd:latest";
+          autoStart = true;
+          dependsOn = ["gluetun"];
+          ports = [
+            "5030:5030"
+            "5031:5031"
+            "50300:50300"
+          ];
+          extraOptions = [
+            "--network=container:gluetun"
+          ];
+          volumes = [
+            "/var/lib/slskd:/app:rw"
+            "/mnt/data/media/downloads:/downloads:rw"
+          ];
+          environmentFiles = [
+            config.age.secrets.gluetunEnvironment.path
+            config.age.secrets.slskd.path
+          ];
+          environment = {
+            TZ = "Europe/Stockholm";
+            PUID = "981";
+            PGID = "982";
+            SLSKD_REMOTE_CONFIGURATION = "true";
+            SLSKD_REMOTE_FILE_MANAGEMENT = "true";
+            SLSKD_DOWNLOADS_DIR = "/downloads";
+            SLSKD_UMASK = "022";
+          };
+        };
+      })
+
+      (lib.mkIf cfg.pihole.enable {
+        pihole = {
+          autoStart = true;
+          image = "pihole/pihole:latest";
+          volumes = [
+            "/var/lib/pihole:/etc/pihole/"
+            "/var/lib/dnsmasq.d:/etc/dnsmasq.d/"
+          ];
+          environment = {
+            TZ = "Europe/Stockholm";
+            CUSTOM_CACHE_SIZE = "0";
+            WEBTHEME = "default-darker";
+          };
+          environmentFiles = getPiholeSecret config.networking.hostName;
+          ports = [
+            "53:53/tcp"
+            "53:53/udp"
+            "8053:80/tcp"
+          ];
+          extraOptions = [
+            "--cap-add=NET_ADMIN"
+            "--cap-add=SYS_NICE"
+            "--cap-add=SYS_TIME"
+          ];
+        };
+      })
+    ];
+  };
+}
--- a/modules/server/infra/postgres/default.nix
+++ b/modules/server/infra/postgres/default.nix
--- a/modules/server/infra/postgres/postgres-upgrade.nix
+++ b/modules/server/infra/postgres/postgres-upgrade.nix
@@ -7,10 +7,10 @@
 }: let
  inherit (lib) types mkOption;

-  cfg = config.server.infra.postgresql;
+  cfg = config.server.postgresql;
 in {
  options = {
-    server.infra.postgresql = {
+    server.postgresql = {
      upgradeTargetPackage = mkOption {
        type = types.nullOr types.package;
        default = null;
--- a/modules/server/infra/postgres/postgres.nix
+++ b/modules/server/infra/postgres/postgres.nix
@@ -7,7 +7,7 @@
 }: let
  inherit (lib) types mkOption;

-  cfg = config.server.infra.postgresql;
+  cfg = config.server.postgresql;

  database = {name, ...}: {
    options = {
@@ -31,7 +31,7 @@
  };
 in {
  options = {
-    server.infra.postgresql = {
+    server.postgresql = {
      databases = mkOption {
        type = types.listOf (types.submodule database);
        default = [];
--- a/modules/server/prowlarr/default.nix
+++ b/modules/server/prowlarr/default.nix
@@ -0,0 +1,80 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "prowlarr";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Prowlarr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "PVR indexer";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "prowlarr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services = {
+      ${unit} = {
+        enable = true;
+      };
+      flaresolverr = {
+        enable = true;
+      };
+
+      traefik = {
+        dynamicConfigOptions = {
+          http = {
+            services = {
+              prowlarr = {
+                loadBalancer.servers = [{url = "http://127.0.0.1:9696";}];
+              };
+              flaresolverr = {
+                loadBalancer.servers = [{url = "http://127.0.0.1:8191";}];
+              };
+            };
+            routers = {
+              prowlarr = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.url}`)";
+                service = "prowlarr";
+                tls.certResolver = "letsencrypt";
+                # middlewares = ["authentik"];
+              };
+              flaresolverr = {
+                entryPoints = ["websecure"];
+                rule = "Host(`flaresolverr.${srv.domain}`)";
+                service = "flaresolverr";
+                tls.certResolver = "letsencrypt";
+                # middlewares = ["authentik"];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/radarr/default.nix
+++ b/modules/server/radarr/default.nix
@@ -0,0 +1,62 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "radarr";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Radarr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Film collection manager";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "radarr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${unit} = {
+      enable = true;
+      user = srv.user;
+      group = srv.group;
+    };
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.radarr.loadBalancer.servers = [{url = "http://127.0.0.1:7878";}];
+          routers = {
+            radarr = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "radarr";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/services/bazarr/default.nix
+++ b/modules/server/services/bazarr/default.nix
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "bazarr";
-  srv = config.server;
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      user = srv.user;
-      group = srv.group;
-    };
-  };
-}
--- a/modules/server/services/default.nix
+++ b/modules/server/services/default.nix
@@ -1,19 +0,0 @@
-{
-  imports = [
-    ./bazarr
-    ./flaresolverr
-    ./gitea
-    ./homepage-dashboard
-    ./jellyfin
-    ./jellyseerr
-    ./lidarr
-    ./n8n
-    ./nextcloud
-    ./ollama
-    ./prowlarr
-    ./radarr
-    ./sonarr
-    ./uptime-kuma
-    ./vaultwarden
-  ];
-}
--- a/modules/server/services/flaresolverr/default.nix
+++ b/modules/server/services/flaresolverr/default.nix
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "flaresolverr";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services = {
-      ${unit} = {
-        enable = true;
-      };
-    };
-  };
-}
--- a/modules/server/services/gitea/default.nix
+++ b/modules/server/services/gitea/default.nix
@@ -1,94 +0,0 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}: let
-  unit = "gitea";
-  cfg = config.server.services.${unit};
-  domain = "${cfg.subdomain}.${config.server.infra.www.url}";
-in {
-  config = lib.mkIf cfg.enable {
-    age.secrets.giteaCloudflared.file = "${self}/secrets/giteaCloudflared.age";
-
-    server.infra = {
-      fail2ban.jails.${unit} = {
-        serviceName = "${unit}";
-        failRegex = ''.*(Failed authentication attempt|invalid credentials|Attempted access of unknown user).* from <HOST>'';
-      };
-
-      postgresql.databases = [
-        {database = "gitea";}
-      ];
-    };
-
-    services = {
-      cloudflared = {
-        enable = true;
-        tunnels.${cfg.cloudflared.tunnelId} = {
-          credentialsFile = cfg.cloudflared.credentialsFile;
-          default = "http_status:404";
-          ingress."${domain}".service = "http://localhost:${toString cfg.port}";
-        };
-      };
-
-      gitea = {
-        enable = true;
-        appName = "cnix code forge";
-
-        database = {
-          type = "postgres";
-          socket = "/run/postgresql";
-          name = "gitea";
-          user = "gitea";
-          createDatabase = false;
-        };
-
-        lfs.enable = true;
-
-        settings = {
-          cors = {
-            ENABLED = true;
-            SCHEME = "https";
-            ALLOW_DOMAIN = domain;
-          };
-
-          log.MODE = "console";
-
-          mailer = {
-            ENABLED = false;
-            MAILER_TYPE = "sendmail";
-            FROM = "noreply+adam@cnst.dev";
-            SENDMAIL_PATH = "/run/wrappers/bin/sendmail";
-          };
-
-          picture.DISABLE_GRAVATAR = true;
-
-          repository = {
-            DEFAULT_BRANCH = "main";
-            DEFAULT_REPO_UNITS = "repo.code,repo.issues,repo.pulls";
-            DISABLE_DOWNLOAD_SOURCE_ARCHIVES = true;
-          };
-
-          indexer.REPO_INDEXER_ENABLED = true;
-
-          oauth2_client = {
-            ENABLE_AUTO_REGISTRATION = true;
-            ACCOUNT_LINKING = "auto";
-          };
-
-          server = {
-            DOMAIN = domain;
-            LANDING_PAGE = "explore";
-            HTTP_PORT = cfg.port;
-            ROOT_URL = "https://${domain}/";
-          };
-
-          security.DISABLE_GIT_HOOKS = false;
-          service.DISABLE_REGISTRATION = true;
-          session.COOKIE_SECURE = true;
-        };
-      };
-    };
-  };
-}
--- a/modules/server/services/homepage-dashboard/default.nix
+++ b/modules/server/services/homepage-dashboard/default.nix
@@ -1,227 +0,0 @@
-{
-  config,
-  lib,
-  self,
-  clib,
-  ...
-}: let
-  unit = "homepage-dashboard";
-  cfg = config.server.services.${unit};
-  srv = config.server;
-in {
-  config = lib.mkIf cfg.enable {
-    age.secrets = {
-      homepageEnvironment = {
-        file = "${self}/secrets/homepageEnvironment.age";
-      };
-    };
-
-    services = {
-      glances.enable = true;
-
-      ${unit} = {
-        enable = true;
-        environmentFile = config.age.secrets.homepageEnvironment.path;
-
-        settings = {
-          color = "stone";
-          theme = "dark";
-          headerStyle = "clean";
-          statusStyle = "dot";
-          hideVersion = true;
-          useEqualHeights = true;
-
-          layout = [
-            {
-              Glances = {
-                header = false;
-                style = "row";
-                columns = 4;
-              };
-            }
-            {
-              Arr = {
-                header = true;
-                style = "column";
-              };
-            }
-            {
-              Downloads = {
-                header = true;
-                style = "column";
-              };
-            }
-            {
-              Media = {
-                header = true;
-                style = "column";
-              };
-            }
-            {
-              Services = {
-                header = true;
-                style = "column";
-              };
-            }
-          ];
-        };
-
-        widgets = [
-          {
-            openmeteo = {
-              label = "Kalmar";
-              timezone = "Europe/Stockholm";
-              units = "metric";
-              cache = 5;
-              latitude = 56.707262;
-              longitude = 16.324541;
-            };
-          }
-          {
-            resources = {
-              label = "SYSTEM";
-              memory = true;
-              cpu = true;
-              uptime = false;
-            };
-          }
-        ];
-
-        services = let
-          homepageCategories = [
-            "Arr"
-            "Media"
-            "Downloads"
-            "Services"
-          ];
-          allServices = srv.services;
-
-          getDomain = s: clib.server.mkHostDomain config s;
-
-          homepageServicesFor = category:
-            lib.filterAttrs
-            (
-              name: value:
-                name
-                != unit
-                && value ? homepage
-                && value.homepage.category == category
-            )
-            allServices;
-        in
-          lib.lists.forEach homepageCategories (cat: {
-            "${cat}" =
-              lib.lists.forEach
-              (lib.attrsets.mapAttrsToList (name: _value: name) (homepageServicesFor cat))
-              (x: let
-                service = allServices.${x};
-                domain = getDomain service;
-              in {
-                "${service.homepage.name}" = {
-                  icon = service.homepage.icon;
-                  description = service.homepage.description;
-                  href = "https://${service.subdomain}.${domain}${service.homepage.path or ""}";
-                  siteMonitor = "https://${service.subdomain}.${domain}${x.homepage.path or ""}";
-                };
-              });
-          })
-          ++ [
-            {
-              Glances = let
-                glancesShared = {
-                  type = "glances";
-                  url = "http://localhost:${toString config.services.glances.port}";
-                  chart = true;
-                  version = 4;
-                };
-              in [
-                {
-                  Memory = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "memory";
-                        refreshInterval = 2000;
-                        pointsLimit = 30;
-                      };
-                  };
-                }
-                {
-                  "CPU Usage" = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "cpu";
-                        refreshInterval = 2000;
-                        pointsLimit = 30;
-                      };
-                  };
-                }
-
-                {
-                  "CPU Temp" = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "sensor:Tctl";
-                        refreshInterval = 5000;
-                        pointsLimit = 20;
-                      };
-                  };
-                }
-                {
-                  "GPU Radeon" = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "sensor:junction";
-                      };
-                  };
-                }
-                {
-                  "GPU Intel" = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "sensor:pkg";
-                      };
-                  };
-                }
-                {
-                  "ZFS Pool" = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "fs:/mnt/data";
-                        refreshInterval = 30000;
-                        pointsLimit = 20;
-                        diskUnits = "bytes";
-                      };
-                  };
-                }
-
-                {
-                  Processes = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "process";
-                      };
-                  };
-                }
-                {
-                  Network = {
-                    widget =
-                      glancesShared
-                      // {
-                        metric = "network:enp6s0";
-                      };
-                  };
-                }
-              ];
-            }
-          ];
-      };
-    };
-  };
-}
--- a/modules/server/services/jellyfin/default.nix
+++ b/modules/server/services/jellyfin/default.nix
@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  unit = "jellyfin";
-  cfg = config.server.services.${unit};
-  srv = config.server;
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      user = srv.user;
-      group = srv.group;
-    };
-    environment.systemPackages = with pkgs; [
-      jellyfin-ffmpeg
-    ];
-  };
-}
--- a/modules/server/services/jellyseerr/default.nix
+++ b/modules/server/services/jellyseerr/default.nix
@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "jellyseerr";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      port = cfg.port;
-    };
-  };
-}
--- a/modules/server/services/lidarr/default.nix
+++ b/modules/server/services/lidarr/default.nix
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "lidarr";
-  srv = config.server;
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      user = srv.user;
-      group = srv.group;
-    };
-  };
-}
--- a/modules/server/services/n8n/default.nix
+++ b/modules/server/services/n8n/default.nix
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "n8n";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services = {
-      n8n = {
-        enable = true;
-        openFirewall = true;
-      };
-    };
-  };
-}
--- a/modules/server/services/ollama/default.nix
+++ b/modules/server/services/ollama/default.nix
@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  unit = "ollama";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      ollama
-      intel-compute-runtime
-      intel-graphics-compiler
-      level-zero
-    ];
-    services.open-webui = {
-      enable = true;
-      host = "0.0.0.0";
-      port = 8001;
-      environment = {
-        ANONYMIZED_TELEMETRY = "False";
-        BYPASS_MODEL_ACCESS_CONTROL = "True";
-        OLLAMA_BASE_URL = "http://localhost:11434";
-      };
-    };
-  };
-}
--- a/modules/server/services/prowlarr/default.nix
+++ b/modules/server/services/prowlarr/default.nix
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "prowlarr";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services = {
-      ${unit} = {
-        enable = true;
-      };
-    };
-  };
-}
--- a/modules/server/services/radarr/default.nix
+++ b/modules/server/services/radarr/default.nix
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "radarr";
-  srv = config.server;
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      user = srv.user;
-      group = srv.group;
-    };
-  };
-}
--- a/modules/server/services/sonarr/default.nix
+++ b/modules/server/services/sonarr/default.nix
@@ -1,17 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "sonarr";
-  srv = config.server;
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services.${unit} = {
-      enable = true;
-      user = srv.user;
-      group = srv.group;
-    };
-  };
-}
--- a/modules/server/services/uptime-kuma/default.nix
+++ b/modules/server/services/uptime-kuma/default.nix
@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  unit = "uptime-kuma";
-  cfg = config.server.services.${unit};
-in {
-  config = lib.mkIf cfg.enable {
-    services = {
-      ${unit} = {
-        enable = true;
-      };
-    };
-  };
-}
--- a/modules/server/services/vaultwarden/default.nix
+++ b/modules/server/services/vaultwarden/default.nix
@@ -1,59 +0,0 @@
-# from @fufexan & @notthebee
-{
-  config,
-  lib,
-  self,
-  ...
-}: let
-  unit = "vaultwarden";
-  cfg = config.server.services.${unit};
-  domain = "${cfg.subdomain}.${config.server.infra.www.url}";
-in {
-  config = lib.mkIf cfg.enable {
-    age.secrets = {
-      vaultwardenCloudflared.file = "${self}/secrets/vaultwardenCloudflared.age";
-      vaultwardenEnvironment.file = "${self}/secrets/vaultwardenEnvironment.age";
-    };
-
-    server.infra.fail2ban.jails.${unit} = {
-      serviceName = "${unit}";
-      failRegex = ''^.*?Username or password is incorrect\. Try again\. IP: <ADDR>\. Username:.*$'';
-    };
-
-    services = {
-      cloudflared = {
-        enable = true;
-        tunnels.${cfg.cloudflared.tunnelId} = {
-          credentialsFile = cfg.cloudflared.credentialsFile;
-          default = "http_status:404";
-          ingress."${domain}".service = "http://localhost:${toString cfg.port}";
-        };
-      };
-
-      vaultwarden = {
-        enable = true;
-        environmentFile = config.age.secrets.vaultwardenEnvironment.path;
-
-        backupDir = "/var/backup/vaultwarden";
-
-        config = {
-          DOMAIN = "https://${domain}";
-          SIGNUPS_ALLOWED = false;
-          ROCKET_ADDRESS = "127.0.0.1";
-          ROCKET_PORT = cfg.port;
-          IP_HEADER = "CF-Connecting-IP";
-
-          logLevel = "warn";
-          extendedLogging = true;
-          useSyslog = true;
-          invitationsAllowed = true;
-          showPasswordHint = false;
-        };
-      };
-    };
-    systemd.services.backup-vaultwarden.serviceConfig = {
-      User = "root";
-      Group = "root";
-    };
-  };
-}
--- a/modules/server/sonarr/default.nix
+++ b/modules/server/sonarr/default.nix
@@ -0,0 +1,62 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "sonarr";
+  srv = config.server;
+  cfg = config.server.${unit};
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/${unit}";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "${unit}.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Sonarr";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Series collection manager";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "sonarr.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Arr";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services.${unit} = {
+      enable = true;
+      user = srv.user;
+      group = srv.group;
+    };
+    services.traefik = {
+      dynamicConfigOptions = {
+        http = {
+          services.sonarr.loadBalancer.servers = [{url = "http://127.0.0.1:8989";}];
+          routers = {
+            sonarr = {
+              entryPoints = ["websecure"];
+              rule = "Host(`${cfg.url}`)";
+              service = "sonarr";
+              tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/traefik/default.nix
+++ b/modules/server/traefik/default.nix
@@ -0,0 +1,100 @@
+{
+  lib,
+  config,
+  pkgs,
+  self,
+  ...
+}: let
+  inherit (lib) mkEnableOption mkIf types;
+
+  cfg = config.server.traefik;
+  getCloudflareCredentials = hostname:
+    if hostname == "ziggy"
+    then config.age.secrets.cloudflareDnsCredentialsZiggy.path
+    else if hostname == "sobotka"
+    then config.age.secrets.cloudflareDnsCredentials.path
+    else throw "Unknown hostname: ${hostname}";
+in {
+  options.server.traefik = {
+    enable = mkEnableOption "Enable global Traefik reverse proxy with ACME";
+  };
+
+  config = mkIf cfg.enable {
+    age.secrets.traefikEnv = {
+      file = "${self}/secrets/traefikEnv.age";
+      mode = "640";
+      owner = "root";
+      group = "traefik";
+    };
+
+    systemd.services.traefik = {
+      serviceConfig = {
+        EnvironmentFile = [config.age.secrets.traefikEnv.path];
+      };
+    };
+    networking.firewall.allowedTCPPorts = [80 443];
+
+    services = {
+      tailscale.permitCertUid = "traefik";
+      traefik = {
+        enable = true;
+
+        staticConfigOptions = {
+          log = {
+            level = "DEBUG";
+          };
+
+          tracing = {};
+          api = {
+            dashboard = true;
+          };
+          certificatesResolvers = {
+            tailscale.tailscale = {};
+            letsencrypt = {
+              acme = {
+                email = "adam@cnst.dev";
+                storage = "/var/lib/traefik/cert.json";
+                dnsChallenge = {
+                  provider = "cloudflare";
+                  resolvers = [
+                    "1.1.1.1:53"
+                    "1.0.0.1:53"
+                  ];
+                };
+              };
+            };
+          };
+
+          entryPoints = {
+            redis = {
+              address = "0.0.0.0:6381";
+            };
+            postgres = {
+              address = "0.0.0.0:5433";
+            };
+            web = {
+              address = "0.0.0.0:80";
+              http.redirections.entryPoint = {
+                to = "websecure";
+                scheme = "https";
+                permanent = true;
+              };
+            };
+            websecure = {
+              address = "0.0.0.0:443";
+              http.tls = {
+                certResolver = "letsencrypt";
+                domains = [
+                  {
+                    main = "cnix.dev";
+                    sans = ["*.cnix.dev"];
+                  }
+                ];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/infra/unbound/default.nix
+++ b/modules/server/infra/unbound/default.nix
@@ -5,20 +5,7 @@
  ...
 }: let
  unit = "unbound";
-  cfg = config.server.infra.${unit};
-  srv = config.server;
-
-  svcNames = lib.attrNames srv.services;
-
-  localARecords = builtins.concatLists (map (
-      name: let
-        s = srv.services.${name};
-      in
-        if s != null && s.enable && s.subdomain != null
-        then [''"${s.subdomain}.${srv.domain}. A ${srv.ip}"'']
-        else []
-    )
-    svcNames);
+  cfg = config.server.${unit};

  hostIp = hostname:
    if hostname == "ziggy"
@@ -27,12 +14,11 @@
    then "192.168.88.14"
    else throw "No IP defined for host ${hostname}";
 in {
-  options.server.infra.${unit} = {
+  options.server.${unit} = {
    enable = lib.mkEnableOption {
      description = "Enable ${unit}";
    };
  };
-
  config = lib.mkIf cfg.enable {
    services = {
      # resolved.enable = lib.mkForce false;
@@ -111,11 +97,6 @@ in {
              "255.255.255.255/32"
              "2001:db8::/32"
            ];
-            local-data =
-              [
-                ''"traefik.${config.settings.accounts.domains.local}. A 192.168.88.14"''
-              ]
-              ++ localARecords;
          };
        };
      };
--- a/modules/server/uptime-kuma/default.nix
+++ b/modules/server/uptime-kuma/default.nix
@@ -0,0 +1,62 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  unit = "uptime-kuma";
+  cfg = config.server.${unit};
+  srv = config.server;
+in {
+  options.server.${unit} = {
+    enable = lib.mkEnableOption {
+      description = "Enable ${unit}";
+    };
+    configDir = lib.mkOption {
+      type = lib.types.str;
+      default = "/var/lib/uptime-kuma";
+    };
+    url = lib.mkOption {
+      type = lib.types.str;
+      default = "uptime.${srv.domain}";
+    };
+    homepage.name = lib.mkOption {
+      type = lib.types.str;
+      default = "Uptime Kuma";
+    };
+    homepage.description = lib.mkOption {
+      type = lib.types.str;
+      default = "Service monitoring tool";
+    };
+    homepage.icon = lib.mkOption {
+      type = lib.types.str;
+      default = "uptime-kuma.svg";
+    };
+    homepage.category = lib.mkOption {
+      type = lib.types.str;
+      default = "Services";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    services = {
+      ${unit} = {
+        enable = true;
+      };
+      traefik = {
+        dynamicConfigOptions = {
+          http = {
+            services.uptime-kuma.loadBalancer.servers = [{url = "http://127.0.0.1:3001";}];
+            routers = {
+              uptime-kuma = {
+                entryPoints = ["websecure"];
+                rule = "Host(`${cfg.url}`)";
+                service = "uptime-kuma";
+                tls.certResolver = "letsencrypt";
+                # middlewares = ["authentik"];
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
--- a/modules/server/vaultwarden/default.nix
+++ b/modules/server/vaultwarden/default.nix
@@ -0,0 +1,89 @@
+# from @fufexan & @notthebee
+{
+  config,
+  lib,
+  self,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  vcfg = config.services.vaultwarden.config;
+  cfg = config.server.vaultwarden;
+in {
+  options = {
+    server.vaultwarden = {
+      enable = mkEnableOption "Enables vaultwarden";
+      url = lib.mkOption {
+        type = lib.types.str;
+        default = "${cfg.domain}";
+      };
+      cloudflared = {
+        credentialsFile = lib.mkOption {
+          type = lib.types.str;
+          example = lib.literalExpression ''
+            pkgs.writeText "cloudflare-credentials.json" '''
+            {"AccountTag":"secret"."TunnelSecret":"secret","TunnelID":"secret"}
+            '''
+          '';
+        };
+        tunnelId = lib.mkOption {
+          type = lib.types.str;
+          example = "00000000-0000-0000-0000-000000000000";
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    age.secrets = {
+      vaultwardenCloudflared.file = "${self}/secrets/vaultwardenCloudflared.age";
+      vaultwardenEnvironment.file = "${self}/secrets/vaultwardenEnvironment.age";
+    };
+
+    server = {
+      fail2ban = lib.mkIf config.server.fail2ban.enable {
+        jails = {
+          vaultwarden = {
+            serviceName = "vaultwarden";
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
+          };
+        };
+      };
+    };
+
+    systemd.services.backup-vaultwarden.serviceConfig = {
+      User = "root";
+      Group = "root";
+    };
+
+    services = {
+      vaultwarden = {
+        enable = true;
+        environmentFile = config.age.secrets.vaultwardenEnvironment.path;
+
+        backupDir = "/var/backup/vaultwarden";
+
+        config = {
+          DOMAIN = "https://${cfg.url}";
+          SIGNUPS_ALLOWED = false;
+          ROCKET_ADDRESS = "127.0.0.1";
+          ROCKET_PORT = 8222;
+          IP_HEADER = "CF-Connecting-IP";
+
+          logLevel = "warn";
+          extendedLogging = true;
+          useSyslog = true;
+          invitationsAllowed = false;
+          showPasswordHint = false;
+        };
+      };
+      cloudflared = {
+        enable = true;
+        tunnels.${cfg.cloudflared.tunnelId} = {
+          credentialsFile = cfg.cloudflared.credentialsFile;
+          default = "http_status:404";
+          ingress."${cfg.url}".service = "http://${vcfg.ROCKET_ADDRESS}:${toString vcfg.ROCKET_PORT}";
+        };
+      };
+    };
+  };
+}
--- a/modules/server/infra/www/default.nix
+++ b/modules/server/infra/www/default.nix
@@ -1,13 +1,15 @@
 {
  lib,
  config,
+  pkgs,
  self,
  ...
 }: let
-  inherit (lib) mkIf mkEnableOption mkOption types;
-  cfg = config.server.infra.www;
+  inherit (lib) mkOption mkEnableOption mkIf types;
+  cfg = config.server.www;
+  srv = config.server;
 in {
-  options.server.infra.www = {
+  options.server.www = {
    enable = mkEnableOption {
      description = "Enable personal website";
    };
@@ -18,12 +20,6 @@ in {
        Public domain name to be used to access the server services via Traefik reverse proxy
      '';
    };
-    port = lib.mkOption {
-      type = lib.types.int;
-      default = 8283;
-      description = "The port to host webservice on.";
-    };
-
    cloudflared = {
      credentialsFile = lib.mkOption {
        type = lib.types.str;
@@ -45,14 +41,12 @@ in {
      wwwCloudflared.file = "${self}/secrets/wwwCloudflared.age";
    };

-    server.infra = {
-      fail2ban = {
+    server = {
+      fail2ban = lib.mkIf config.server.www.enable {
        jails = {
-          nginx-404 = {
-            serviceName = "nginx";
-            failRegex = ''^.*\[error\].*directory index of.* is forbidden.*client: <HOST>.*$'';
-            ignoreRegex = '''';
-            maxRetry = 5;
+          www = {
+            serviceName = "cnst.dev";
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
          };
        };
      };
@@ -70,23 +64,14 @@ in {
        virtualHosts."webfinger" = {
          forceSSL = false;
          serverName = cfg.url;
-          root = "/var/www/webfinger";
-
+          root = "/etc/webfinger";
          locations."= /.well-known/webfinger" = {
-            root = "/var/www/webfinger";
+            root = "/etc/webfinger";
            extraConfig = ''
              default_type application/jrd+json;
              try_files /.well-known/webfinger =404;
            '';
          };
-
-          locations."= /robots.txt" = {
-            root = "/var/www/webfinger";
-            extraConfig = ''
-              default_type text/plain;
-              try_files /robots.txt =404;
-            '';
-          };
        };
      };

@@ -100,8 +85,7 @@ in {
      };
    };

-    environment.etc = {
-      "webfinger/.well-known/webfinger".text = ''
+    environment.etc."webfinger/.well-known/webfinger".text = ''
      {
        "subject": "acct:adam@${cfg.url}",
        "links": [
@@ -113,12 +97,6 @@ in {
      }
    '';

-      "webfinger/robots.txt".text = ''
-        User-agent: *
-        Disallow: /
-      '';
-    };
-
    services.traefik.dynamicConfigOptions.http = {
      routers.webfinger = {
        entryPoints = ["websecure"];
--- a/modules/settings/accounts/default.nix
+++ b/modules/settings/accounts/default.nix
@@ -2,7 +2,8 @@
  lib,
  config,
  ...
-}: let
+}:
+let
  inherit (lib) mkOption types;

  sshKeys = {
@@ -15,14 +16,14 @@
  keyName = config.settings.accounts.sshUser or null;

  selectedKey =
-    if keyName != null
-    then
+    if keyName != null then
      lib.attrByPath [
        keyName
-      ] (builtins.abort "No SSH key defined for hostname/key '${toString keyName}'")
-      sshKeys
-    else builtins.abort "No accounts.sshUser provided, cannot select SSH key.";
-in {
+      ] (builtins.abort "No SSH key defined for hostname/key '${toString keyName}'") sshKeys
+    else
+      builtins.abort "No accounts.sshUser provided, cannot select SSH key.";
+in
+{
  options.settings.accounts = {
    username = mkOption {
      type = types.str;
@@ -45,21 +46,5 @@ in {
      default = null;
      description = "Optional override for selecting an SSH key by name";
    };
-    domains = lib.mkOption {
-      type = lib.types.submodule {
-        options = {
-          local = lib.mkOption {
-            type = lib.types.str;
-            default = "127.0.0.1";
-            description = "The local domain of the host";
-          };
-          public = lib.mkOption {
-            type = lib.types.str;
-            default = "example.com";
-            description = "The public domain of the host";
-          };
-        };
-      };
-    };
  };
 }
--- a/modules/settings/monitors/default.nix
+++ b/modules/settings/monitors/default.nix
@@ -21,8 +21,8 @@ in
            example = 1080;
          };
          refreshRate = mkOption {
-            type = types.str;
-            default = "60";
+            type = types.int;
+            default = 60;
          };
          transform = mkOption {
            type = types.int;
--- a/nix/nixpkgs/default.nix
+++ b/nix/nixpkgs/default.nix
@@ -4,8 +4,5 @@
      allowUnfree = true;
      input-fonts.acceptLicense = true;
    };
-
-    overlays = [
-    ];
  };
 }
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -5,7 +5,9 @@
    "aarch64-linux"
  ];

-  perSystem = {pkgs, ...}: {
+  perSystem =
+    { pkgs, ... }:
+    {
      packages = {
        # instant repl with automatic flake loading
        repl = pkgs.callPackage ./repl { };
--- a/secrets/crowdsecApi.age
+++ b/secrets/crowdsecApi.age
@@ -1,11 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 t9iOEg lf7aPbZX2v3WGzE/KI/069DBObphqrDtjq7rhNriGl8
-Vv+Pqk6DbcE5R1A9135gVKroCex1xKsCLPETZdT3yTg
-> ssh-ed25519 KUYMFA XxtBSmCwrQCZ9G3VcCrbzTdMshTK1pjlHPYj7fke818
-9tO2EcnHPD6v3TNeuZdL+zP39SM5R5q7om5sCFDB8lg
-> ssh-ed25519 76RhUQ I6O/fYFRqYxExC9uLijZr6/kFze7uze0cIudCsl2jTo
-WAwb822vVj5UtUAdE1oVJ0/q6nQbWqdx0OHuGEogO7M
-> ssh-ed25519 Jf8sqw gWBoe4HhXNw7Ih58lQ/L2vBoQfbU1ht8+ZSLUx/4TWk
-xor0ieJ2UI5bK4rSlCM0dX61PVbxYE37FNry0YSmHG4
--- Cp8b3eTb3NfjPFvBE12a2c+Yni2jW6DZUK10IaXmmvo
-w<EFBFBD>xq<EFBFBD><EFBFBD>z:<3A>.{<7B>?<3F><><EFBFBD>f<EFBFBD><66><1D><><16><>A<EFBFBD>jT<6A><54>{<7B>J <20><>
--- a/secrets/giteaCloudflared.age
+++ b/secrets/giteaCloudflared.age
@@ -1,12 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 t9iOEg RnlIwFO8LSwzj94G0Uru9qibXqOOpCU2kWWdNa2tRFU
-lIC3K/jjBMKRfLfepoNYIkBe5rhHuR0l3Uf1Xuk8uZg
-> ssh-ed25519 KUYMFA k16GBRcaaSwJm/8+Vm2QBOu05u6eEro/7YYj7kbuNSU
-VCpt918MBBFfFZKKypV9pSwz/Zhsxr+Ob6YjFuJ/oL0
-> ssh-ed25519 76RhUQ FIKn3nuOT1ywu6pmYBbpC54HhpJGeMFejp5c0XibfAY
-WDsh/5G4wXYt21yIDxmI6u1l/xPOdZRxgTazf6QLXP8
-> ssh-ed25519 Jf8sqw 2EvD96Ec8h97ACoOBYzn1Ugx4ZyYSHIRnsmtB5lb/XQ
-mFY8O8qwWWihsLe5ayB5iGm1JUY2B/9el/XSf5sPe7M
--- uuwibRk7LS4/lUx9gwL+x5NMrxLjGM1Yf55bzjxQTKM
-<EFBFBD>H<>Ԅ6K<36>A<01>~<7E><>)!B<08><>^S!Wd<><64>$.:S'c<>d<EFBFBD><64><EFBFBD>_WW<57>Bj<42>,<2C><>l<EFBFBD><6C><EFBFBD><EFBFBD><EFBFBD>V<>S<EFBFBD><53>h<EFBFBD>
-h<EFBFBD><EFBFBD><12><>k
--- a/secrets/homepageEnvironment.age
+++ b/secrets/homepageEnvironment.age
--- a/secrets/mikrotikSecret.age
+++ b/secrets/mikrotikSecret.age
@@ -1,11 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 t9iOEg MLi7IOM8QlpvlCMSmo4SwZbTwZ9pyysSbiMMuWD/dyU
-cotV5TJf7oyyXIaAmu8n9Ie1rl27i8w7hsduwtQFnis
-> ssh-ed25519 KUYMFA BhFQ/RXOH8L7gl/FSabAUv28fbaod+muvTGSV3rYQSs
-fWqwAkhSAmg6YB+yEtj0e83Q4XO/r+TBnMTN7vXBNqU
-> ssh-ed25519 76RhUQ b1fDfGPNdJ9c3wtr8ww0mW5K4fKJxpxxTZy/ZCECWzs
-qhbvucUrv7dzOPKUmUaRs/AtXtwQfy/qp5HnaYzZ5eQ
-> ssh-ed25519 Jf8sqw 19D2ztjyxJfGQAiUOTdgWyC0ZFso/wrC9VPEkmI34U8
-PavT5O8M6Zc2Num9Hb2sY+F3UmMPqRgjUZxuvP6AhyM
--- uYOcbsL7JWoDF2mRUDLhXrbp6ssLFbQ9+a6RhAXNNPA
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>	X<><58>PC<50><43>h<EFBFBD>;
--- a/secrets/nginxEnv.age
+++ b/secrets/nginxEnv.age
@@ -0,0 +1,11 @@
+age-encryption.org/v1
+-> ssh-ed25519 t9iOEg pfPhWigjvnJ5tfVv8qPpk3VYvLH9I01HVVbpu+r2NjY
+Kaj8aZv+9pSYjwoE7EHWGHfsZIPFZOgUVaKf8VxWKcQ
+-> ssh-ed25519 KUYMFA 9Xy82Cl3HUQcFDcJMxxnnIfLOngW8xLfVE0S1wRliGg
+mOOcyJp5+ZqFwdkZkHC63+cMA0ToGcuI6kqMjAJ9jJk
+-> ssh-ed25519 76RhUQ +OvUSQwpy6+xxlom8bJFn8CBdSKECa9YY0U+YYNYdGM
+MWfmfGzd6/lOPvggUG8uJgBAp1CTqSdk+NDkk7vSQEQ
+-> ssh-ed25519 Jf8sqw jQR/wT/+f63cJdFzR/Ogw6pdiYXoyVNu1+UCni2BYSM
+Iicwg/XJJskvWFmAbxFDh3gSJyjid5fw9JXmDJPhzkU
+--- xK8vBWioTgSDPHkKh7SJxstCzYtUSmTz6QuN/+niFME
+<08><>f<<3C>`VR<56><52>p<><70>)>|<7C>+aئI<D8A6>g<08><0B><><EFBFBD><EFBFBD><EFBFBD><19><>x<EFBFBD><78>HH+<2B>緭<EFBFBD><E7B7AD>o>$4H<><48><EFBFBD>缂<EFBFBD>B?<3F>l6TSqμ<71>Ǿ<EFBFBD><C7BE>Kj-l
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -48,7 +48,6 @@ in {
  "homepageEnvironment.age".publicKeys = kima ++ sobotka;
  "cloudflareFirewallApiKey.age".publicKeys = kima ++ sobotka;
  "vaultwardenCloudflared.age".publicKeys = kima ++ sobotka;
-  "giteaCloudflared.age".publicKeys = kima ++ sobotka;
  "nextcloudCloudflared.age".publicKeys = kima ++ sobotka;
  "nextcloudAdminPass.age".publicKeys = kima ++ sobotka;
  "cloudflareDnsApiToken.age".publicKeys = kima ++ sobotka;
@@ -62,9 +61,6 @@ in {
  "traefikEnv.age".publicKeys = kima ++ sobotka;
  "wwwCloudflared.age".publicKeys = kima ++ sobotka;
  "authentikCloudflared.age".publicKeys = kima ++ sobotka;
-  "sobotkaTsAuth.age".publicKeys = kima ++ sobotka;
-  "mikrotikSecret.age".publicKeys = kima ++ sobotka;
-  "crowdsecApi.age".publicKeys = kima ++ sobotka;

  # Ziggy-specific
  "cloudflareDnsCredentialsZiggy.age".publicKeys = kima ++ ziggy;
--- a/secrets/sobotkaTsAuth.age
+++ b/secrets/sobotkaTsAuth.age
@@ -1,11 +0,0 @@
-age-encryption.org/v1
-> ssh-ed25519 t9iOEg fftdt8orBZoM0sDRAXf0TScDLosNWWWIg7JmmuunuWM
-2IfpTH6ptSyLnBtBStkk7SINct6LtBHrL6h22BVNb+k
-> ssh-ed25519 KUYMFA HI04mnVOGPRsRhnqCkbO4My/sBq5v/3UYxDVcfIe4RM
-fcSApUYCnJlpzVW5e77CFoSHamEmP+6ztMmzp2WlJvY
-> ssh-ed25519 76RhUQ c2FbmTXGl/F+1acZFEJUoenkxiIGdoXkT67VgxvoFHg
-eWExqblEp5VIeXuPEuvj4QAIWtFX5KLfMyh6/fZ9bnA
-> ssh-ed25519 Jf8sqw IAcUf70EufTyjsva8XIlXOfPxwXvtr9AFl0LwrdAMgc
-bY098fejLaFbUMX0iF89gz8kiOGZHI8JIg4NzX4ItFw
--- WNqpLyRM2EqISbZky++NbKLw4GCEgwbz2O5+VO7aKzE
-<EFBFBD><EFBFBD><1A><>(5<0F>q	<09><>m<EFBFBD>C<EFBFBD><43>G<EFBFBD>r<><72><16><><EFBFBD><EFBFBD>ޒ3<DE92><33><17><1F>7<><37><EFBFBD>rG<72>i<EFBFBD>c7<63>i<EFBFBD>P<EFBFBD><50>l<EFBFBD><19>7<EFBFBD><<3C>r?cGo<47>^ǚ<>W<0E>V<EFBFBD><56>f,2<>Qg!<21>t_<74>
--- a/secrets/traefikEnv.age
+++ b/secrets/traefikEnv.age
--- a/users/cnst/modules/kimamod.nix
+++ b/users/cnst/modules/kimamod.nix
@@ -39,7 +39,7 @@
        enable = true;
      };
      ghostty = {
-        enable = false;
+        enable = true;
      };
      helix = {
        enable = true;
@@ -57,7 +57,7 @@
        enable = false;
      };
      nvf = {
-        enable = false;
+        enable = true;
      };
      nwg-bar = {
        enable = true;
Author	SHA1	Message	Date
cnst	3d1e0991ae	big revert	2025-10-04 20:49:00 +02:00
cnst	99b18de995	flake lock	2025-10-04 20:42:31 +02:00