big revert

flake.lock

@@ -29,11 +29,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760083914,
+        "lastModified": 1758874004,
-        "narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=",
+        "narHash": "sha256-+RUCBtT01Z595NpGc6Tvms+dJ/C/cn1zdjT9+gE6dbU=",
         "owner": "anyrun-org",
         "repo": "anyrun",
-        "rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59",
+        "rev": "3c571bc1514c4211d1d6c011a1d482f97efd9c5f",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1760148209,
+        "lastModified": 1759532138,
-        "narHash": "sha256-ssMUeLk1cmLqzNMW6l9dgGoLtOY9F9dEGplJlWJmNis=",
+        "narHash": "sha256-sLQIlgDwMP3mEY2PwjGW+cL56QQ2n2WXoZ3GpG5QWOY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "b51bb724939dbfa264f08522efffce2bb47b6135",
+        "rev": "bad02bbca5b5c6d45539a0d740ad0e21b1ba9afc",
         "type": "github"
       },
       "original": {
@@ -212,11 +212,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1760164678,
+        "lastModified": 1759560021,
-        "narHash": "sha256-yxcfwZCysR6zPaFv7is3/FWd1h0h6kXME0vueSwTBhU=",
+        "narHash": "sha256-J/rtMKVUAEqOFj0ogvcHKK8HbaKhw+tiNrDOpEM+ZDY=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "2579f163559b902959cc420a6d3bfbd98c46a323",
+        "rev": "6ffcbf59c119b0c6384c7d98f18cea06a9af7e9c",
         "type": "github"
       },
       "original": {
@@ -571,11 +571,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1760106635,
+        "lastModified": 1759582739,
-        "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
+        "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
+        "rev": "3441b5242af7577230a78ffb03542add264179ab",
         "type": "github"
       },
       "original": {
@@ -590,11 +590,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1759850138,
+        "lastModified": 1759201995,
-        "narHash": "sha256-fYHIxjTvVIAEDWzenUROuzDPxy1rBCXZNPgh4b1dfgo=",
+        "narHash": "sha256-3STv6fITv8Ar/kl0H7vIA7VV0d2gyLh8UL0BOiVacXg=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "5b0563419eeeaf0595c848865c46be4abad246a7",
+        "rev": "bfcbef10c513108c7b43317569416c2eefc4ed44",
         "type": "github"
       },
       "original": {
@@ -610,11 +610,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760130406,
+        "lastModified": 1759573136,
-        "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=",
+        "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d305eece827a3fe317a2d70138f53feccaf890a1",
+        "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43",
         "type": "github"
       },
       "original": {
@@ -652,11 +652,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760061988,
+        "lastModified": 1759337100,
-        "narHash": "sha256-CeuMo7fjWm3XaoK+b1PGyaVIlE1GHudoxk9jrJFvfbY=",
+        "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c7f4214faca2f196c551b767c12a70bfa0614510",
+        "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
         "type": "github"
       },
       "original": {
@@ -739,11 +739,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759490292,
+        "lastModified": 1750621377,
-        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
+        "narHash": "sha256-8u6b5oAdX0rCuoR8wFenajBRmI+mzbpNig6hSCuWUzE=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
+        "rev": "b3d628d01693fb9bb0a6690cd4e7b80abda04310",
         "type": "github"
       },
       "original": {
@@ -803,11 +803,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1760143218,
+        "lastModified": 1759530922,
-        "narHash": "sha256-OhJPROcRcwBkjOKkXr/f3/7wuSjhAIqr8WfmEUF9Uuo=",
+        "narHash": "sha256-9NgZKpibALekGTPDc2O8lP8vFealQSZkXe+L+S7MMZU=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e",
+        "rev": "76d998743ac10e712238c1016db4d8e8d16f1049",
         "type": "github"
       },
       "original": {
@@ -824,11 +824,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759613406,
+        "lastModified": 1759238633,
-        "narHash": "sha256-PzgQJydp+RlKvwDi807pXPlURdIAVqLppZDga3DwPqg=",
+        "narHash": "sha256-4/AtRCQKXuU49ozZZouWuC+T7vCjQh9HAz3N8Tt5OZE=",
         "owner": "hyprwm",
         "repo": "contrib",
-        "rev": "32e1a75b65553daefb419f0906ce19e04815aa3a",
+        "rev": "513d71d3f42c05d6a38e215382c5a6ce971bd77d",
         "type": "github"
       },
       "original": {
@@ -1006,11 +1006,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760023949,
+        "lastModified": 1759572448,
-        "narHash": "sha256-fu0B4duamVdbkPio/czu1XhsPLRXUJpZLDrSk3nih4U=",
+        "narHash": "sha256-o+r44fqPQM+/hQdjFy9qV9C51Jhty6M4icFVYocyJfA=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "36ec73f166d9434a3f27c96c575198906f77644a",
+        "rev": "c8a6768dca626cf7d7cbc333095f048bc007b6d9",
         "type": "github"
       },
       "original": {
@@ -1044,11 +1044,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760120448,
+        "lastModified": 1754481642,
-        "narHash": "sha256-l/OxM4q/nLVv47OuS4bG2J7k0m+G7/3AMtvrV64XLb0=",
+        "narHash": "sha256-e1phd6KwtUsS9C2ShD+fQvfk2Dgr2JQi+rTDQUW15iE=",
         "owner": "hyprwm",
         "repo": "hyprpaper",
-        "rev": "1733e0025b194c9bc083f4cd8782c5f151858a58",
+        "rev": "bcb1ffa322369c4898347ab5a7399a3d18494c8f",
         "type": "github"
       },
       "original": {
@@ -1069,11 +1069,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759619523,
+        "lastModified": 1759490926,
-        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
+        "narHash": "sha256-7IbZGJ5qAAfZsGhBHIsP8MBsfuFYS0hsxYHVkkeDG5Q=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
+        "rev": "94cce794344538c4d865e38682684ec2bbdb2ef3",
         "type": "github"
       },
       "original": {
@@ -1144,11 +1144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755184602,
+        "lastModified": 1750371869,
-        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd",
         "type": "github"
       },
       "original": {
@@ -1191,11 +1191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759815224,
+        "lastModified": 1759387127,
-        "narHash": "sha256-HbdOyjqHm38j6o5mV24i0bn+r5ykS+VJBnWJuZ0fE+A=",
+        "narHash": "sha256-uuwJAP92SkHmnI1zo7rrK/gEuHtb97vFZcMa5w+0SZA=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "ee974f496a080c61b3164992c850f43741edcc52",
+        "rev": "0cc290e05882745060fccfe6d7d073f913e0cce7",
         "type": "github"
       },
       "original": {
@@ -1278,11 +1278,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760146997,
+        "lastModified": 1759455985,
-        "narHash": "sha256-x2sF8Q4tWz3DI166s+KFDXySrK+cN+/YEd3DfhnhBLQ=",
+        "narHash": "sha256-8qDv7NXH3fj1CDXed7c7vJLtrRKDZSo0x6TaWSfelVg=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "ad505387568d024654da88fef03d9c5319cba92f",
+        "rev": "eb5ab503cbd3cb386e8d85a55a9faed73ec7dc37",
         "type": "github"
       },
       "original": {
@@ -1363,11 +1363,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1760038930,
+        "lastModified": 1759147044,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "narHash": "sha256-3ZPFytJOcLjTChljeaGgoaNj+tOqzgEpqZAvRe3bU90=",
-        "owner": "NixOS",
+        "owner": "PedroHLC",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "18e83bbe13aa50992777832b52bd0e0d8585fb3b",
         "type": "github"
       },
       "original": {
@@ -1395,11 +1395,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1759381078,
+        "lastModified": 1740560979,
-        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
+        "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
+        "rev": "5135c59491985879812717f4c9fea69604e7f26f",
         "type": "github"
       },
       "original": {
@@ -1443,11 +1443,11 @@
     },
     "nixpkgs_8": {
       "locked": {
-        "lastModified": 1760038930,
+        "lastModified": 1759381078,
-        "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
+        "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
@@ -1482,11 +1482,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1760153667,
+        "lastModified": 1759469269,
-        "narHash": "sha256-F7KmXT/Izse6Q6CkD5GCImoGPaDJxl03Kd7eD+eY/bU=",
+        "narHash": "sha256-DP833ejGUNRRHsJOB3WRTaWWXLNucaDga2ju/fGe+sc=",
         "owner": "notashelf",
         "repo": "nvf",
-        "rev": "9df9d51fd9fc8f9a8fc377f984ea3b7ae796172d",
+        "rev": "e48638aef3a95377689de0ef940443c64f870a09",
         "type": "github"
       },
       "original": {
@@ -1626,11 +1626,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1760090851,
+        "lastModified": 1759301569,
-        "narHash": "sha256-XGkBjf4Dzg6tXd0KGgKzeW4oVX/iLzLhD3rQ1cATpqM=",
+        "narHash": "sha256-7StxDed3v2fAWLkl+Hse9FlpjT7Dk7Cn/4vxTFyEhIg=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "b93180b4f2cb3c81ac7f17f46e3dfcb30ecc7843",
+        "rev": "472037b789cf593172d6adf3b8d9f7a429f6cd9b",
         "type": "github"
       },
       "original": {
@@ -1648,11 +1648,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760063676,
+        "lastModified": 1759458749,
-        "narHash": "sha256-s5Fjh43skH2L+avOGioLmEHoYZffDbg3abV5h0gjeew=",
+        "narHash": "sha256-WKnbJnm1B2+TO2ZUudgS39EzecQeLl4/bnRtd3y46LI=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "897deed0923cc5a1d560c5176abe0d172ec9716d",
+        "rev": "bbc3a8ae797d1700e57a4f4bcc4e79af727d4138",
         "type": "github"
       },
       "original": {
@@ -1669,11 +1669,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759631821,
+        "lastModified": 1740623427,
-        "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=",
+        "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
+        "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab",
         "type": "github"
       },
       "original": {
@@ -1815,11 +1815,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1760120816,
+        "lastModified": 1758728421,
-        "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
+        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "761ae7aff00907b607125b2f57338b74177697ed",
+        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
         "type": "github"
       },
       "original": {
@@ -1923,11 +1923,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759969704,
+        "lastModified": 1759590499,
-        "narHash": "sha256-T7f/invcFIKHrBqD+FLf/C/HOGmpYfbZUzTDxFscpOA=",
+        "narHash": "sha256-EBToRzqe5WMz4DQyxOp9/CP+rWjdaZ2EUwbItfNf3VI=",
         "ref": "refs/heads/main",
-        "rev": "1173c777dc8daddcc4959260a7b00fd8abc884c5",
+        "rev": "6e606c8bfa6a88209488790388b1005bc489fa66",
-        "revCount": 137,
+        "revCount": 136,
         "type": "git",
         "url": "https://git.sr.ht/~canasta/zen-browser-flake"
       },

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;

hosts/sobotka/default.nix

@@ -68,10 +68,7 @@ in {
 
   boot = {
     supportedFilesystems = ["zfs"];
-    zfs = {
+    zfs.extraPools = ["data"];
-      package = pkgs.zfs_unstable;
-      extraPools = ["data"];
-    };
   };
 
   services.zfs = {

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;

hosts/sobotka/server.nix

@@ -11,7 +11,7 @@
     traefik = {
       enable = true;
     };
-    tailscale = {
+    gitea = {
       enable = true;
     };
     unbound = {
@@ -47,14 +47,6 @@
     uptime-kuma = {
       enable = true;
     };
-    gitea = {
-      enable = true;
-      url = "git.cnst.dev";
-      cloudflared = {
-        tunnelId = "33e2fb8e-ecef-4d42-b845-6d15e216e448";
-        credentialsFile = config.age.secrets.giteaCloudflared.path;
-      };
-    };
     vaultwarden = {
       enable = true;
       url = "vault.cnst.dev";

modules/default.nix

@@ -144,7 +144,6 @@
         ./server/traefik
         ./server/www
         ./server/authentik
-        ./server/tailscale
       ];
     };
     settings = {

modules/home/programs/pkgs/default.nix

@@ -88,7 +88,7 @@ in
           hyprpicker
           libnotify
           pamixer
-          loupe
+          oculante
           adwaita-icon-theme
           qt5.qtwayland
           qt6.qtwayland

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/apng" = "oculante.desktop";
-          "image/avif" = "feh.desktop";
+          "image/avif" = "oculante.desktop";
-          "image/bmp" = "feh.desktop";
+          "image/bmp" = "oculante.desktop";
-          "image/gif" = "feh.desktop";
+          "image/gif" = "oculante.desktop";
-          "image/jpeg" = "feh.desktop";
+          "image/jpeg" = "oculante.desktop";
-          "image/png" = "feh.desktop";
+          "image/png" = "oculante.desktop";
-          "image/svg+xml" = "feh.desktop";
+          "image/svg+xml" = "oculante.desktop";
-          "image/tiff" = "feh.desktop";
+          "image/tiff" = "oculante.desktop";
-          "image/webp" = "feh.desktop";
+          "image/webp" = "oculante.desktop";
 
           "video/H264" = [
             "mpv.desktop"

modules/nixos/hardware/network/default.nix

@@ -2,47 +2,38 @@
   config,
   lib,
   ...
-}: let
+}:
-  inherit
+let
-    (lib)
+  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 {
             options = {
               allowedTCPPorts = mkOption {
                 type = types.listOf types.int;
-                default = [];
+                default = [ ];
                 description = "List of allowed TCP ports for this interface.";
               };
               allowedUDPPorts = mkOption {
                 type = types.listOf types.int;
-                default = [];
+                default = [ ];
                 description = "List of allowed UDP ports for this interface.";
               };
             };
           }
         );
-        default = {};
+        default = { };
         description = "Network interface configurations.";
       };
       extraHosts = mkOption {
@@ -56,7 +47,7 @@ in {
   config = mkIf cfg.enable {
     assertions = [
       {
-        assertion = cfg.interfaces != {} -> config.networking.networkmanager.enable;
+        assertion = cfg.interfaces != { } -> config.networking.networkmanager.enable;
         message = "Network interfaces configured but NetworkManager is not enabled";
       }
     ];
@@ -64,8 +55,6 @@ in {
     networking = {
       networkmanager.enable = true;
       nftables.enable = true;
-      nameservers = cfg.nameservers;
-      search = cfg.search;
       firewall = {
         enable = true;
         inherit (cfg) interfaces;
@@ -74,8 +63,8 @@ in {
     };
 
     systemd.services.NetworkManager = {
-      wants = ["nftables.service"];
+      wants = [ "nftables.service" ];
-      after = ["nftables.service"];
+      after = [ "nftables.service" ];
     };
   };
 }

modules/nixos/programs/pkgs/default.nix

@@ -78,7 +78,6 @@ in
           openssl
           xmrig
           ocl-icd
-          dig
         ]
 
         (mkIf cfg.common.enable [
@@ -97,6 +96,9 @@ in
         ])
 
         (mkIf cfg.desktop.enable [
+          protonup
+          winetricks
+          wine
           geekbench
           unigine-heaven
         ])
@@ -107,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
@@ -140,6 +144,7 @@ in
           prettierd
           # php84Packages.php-cs-fixer
           shfmt
+          luaformatter
           black
         ])
       ];

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
-      wine
-      winetricks
-      wine-wayland
-    ];
   };
 }

modules/nixos/system/devpkgs/default.nix

@@ -45,6 +45,7 @@ in
       # nodePackages_latest.sql-formatter
       prettierd
       shfmt
+      luaformatter
       black
     ];
   };

modules/server/authentik/default.nix

@@ -53,9 +53,11 @@ in {
     age.secrets = {
       authentikEnv = {
         file = "${self}/secrets/authentikEnv.age";
+        owner = "authentik";
       };
       authentikCloudflared = {
         file = "${self}/secrets/authentikCloudflared.age";
+        owner = "authentik";
       };
     };
 
@@ -63,8 +65,8 @@ in {
       fail2ban = lib.mkIf cfg.enable {
         jails = {
           authentik = {
-            serviceName = "authentik";
+            serviceName = "${cfg.url}";
-            failRegex = ''^.*Username or password is incorrect.*IP:\s*<HOST>'';
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
           };
         };
       };
@@ -97,6 +99,7 @@ in {
             middlewares = {
               authentik = {
                 forwardAuth = {
+                  tls.insecureSkipVerify = true;
                   address = "https://localhost:9443/outpost.goauthentik.io/auth/traefik";
                   trustForwardHeader = true;
                   authResponseHeaders = [
@@ -127,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";
               };

modules/server/fail2ban/default.nix

@@ -4,9 +4,11 @@
   config,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.server.fail2ban;
-in {
+in
+{
   options.server.fail2ban = {
     enable = lib.mkEnableOption {
       description = "Enable cloudflare fail2ban";
@@ -15,7 +17,7 @@ in {
       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
+        Authorization: Bearer Qj06My1wXJEzcW46QCyjFbSMgVtwIGfX63Ki3NOj79o=
         '''
       '';
     };
@@ -30,28 +32,14 @@ in {
               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;
+              type = lib.types.str;
-              example = ''
+              example = "Login failed from IP: <HOST>";
-                ^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;
@@ -69,61 +57,54 @@ in {
         pkgs.jq
       ];
 
-      jails =
+      jails = lib.attrsets.mapAttrs (name: value: {
-        lib.attrsets.mapAttrs (name: value: {
+        settings = {
-          settings = {
+          bantime = "30d";
-            bantime = "24h";
+          findtime = "1h";
-            findtime = "10m";
+          enabled = true;
-            enabled = true;
+          backend = "systemd";
-            backend = "systemd";
+          journalmatch = "_SYSTEMD_UNIT=${value.serviceName}.service";
-            journalmatch = "_SYSTEMD_UNIT=${value.serviceName}.service";
+          port = "http,https";
-            port = "http,https";
+          filter = "${name}";
-            filter = "${name}";
+          maxretry = 3;
-            maxretry = 3;
+          action = "cloudflare-token-agenix";
-            action = "cloudflare-token-agenix";
+        };
-          };
+      }) cfg.jails;
-        })
-        cfg.jails;
     };
 
     environment.etc = lib.attrsets.mergeAttrsList [
       (lib.attrsets.mapAttrs' (
-          name: value: (lib.nameValuePair "fail2ban/filter.d/${name}.conf" {
+        name: value:
-            text =
+        (lib.nameValuePair "fail2ban/filter.d/${name}.conf" {
-              ''
+          text = ''
-                [Definition]
+            [Definition]
-                failregex = ${value.failRegex}
+            failregex = ${value.failRegex}
-                ignoreregex = ${value.ignoreRegex}
+            ignoreregex = ${value.ignoreRegex}
-              ''
+          '';
-              + lib.optionalString (value.datePattern != "") ''
+        })
-                datepattern = ${value.datePattern}
+      ) cfg.jails)
-              ''
-              + lib.optionalString (value._groupsre != "") ''
-                _groupsre = ${value._groupsre}
-              '';
-          })
-        )
-        cfg.jails)
       {
-        "fail2ban/action.d/cloudflare-token-agenix.conf".text = let
+        "fail2ban/action.d/cloudflare-token-agenix.conf".text =
-          notes = "Fail2Ban on ${config.networking.hostName}";
+          let
-          cfapi = "https://api.cloudflare.com/client/v4/zones/${cfg.zoneId}/firewall/access_rules/rules";
+            notes = "Fail2Ban on ${config.networking.hostName}";
-        in ''
+            cfapi = "https://api.cloudflare.com/client/v4/zones/${cfg.zoneId}/firewall/access_rules/rules";
-          [Definition]
+          in
-          actionstart =
+          ''
-          actionstop =
+            [Definition]
-          actioncheck =
+            actionstart =
-          actionunban = id=$(curl -s -X GET "${cfapi}" \
+            actionstop =
-              -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
+            actioncheck =
-                  | jq -r '.result[] | select(.notes == "${notes}" and .configuration.target == "ip" and .configuration.value == "<ip>") | .id')
+            actionunban = id=$(curl -s -X GET "${cfapi}" \
-              if [ -z "$id" ]; then echo "id for <ip> cannot be found"; exit 0; fi; \
+                -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
-              curl -s -X DELETE "${cfapi}/$id" \
+                    | jq -r '.result[] | select(.notes == "${notes}" and .configuration.target == "ip" and .configuration.value == "<ip>") | .id')
-                  -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
+                if [ -z "$id" ]; then echo "id for <ip> cannot be found"; exit 0; fi; \
-                  --data '{"cascade": "none"}'
+                curl -s -X DELETE "${cfapi}/$id" \
-          actionban = curl -X POST "${cfapi}" -H @${cfg.apiKeyFile} -H "Content-Type: application/json" --data '{"mode":"block","configuration":{"target":"ip","value":"<ip>"},"notes":"${notes}"}'
+                    -H @${cfg.apiKeyFile} -H "Content-Type: application/json" \
-          [Init]
+                    --data '{"cascade": "none"}'
-          name = cloudflare-token-agenix
+            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
+          '';
       }
     ];
   };

modules/server/gitea/default.nix

@@ -1,8 +1,7 @@
-# "inspired" by @jtojnar <3
+# taken from @jtojnar
 {
   config,
   lib,
-  self,
   ...
 }: let
   unit = "gitea";
@@ -22,20 +21,6 @@ in {
       default = 5003;
       description = "The port to host Gitea on.";
     };
-    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";
-      };
-    };
     homepage.name = lib.mkOption {
       type = lib.types.str;
       default = "Gitea";
@@ -54,92 +39,62 @@ in {
     };
   };
   config = lib.mkIf cfg.enable {
-    age.secrets = {
+    services.${unit} = {
-      giteaCloudflared.file = "${self}/secrets/giteaCloudflared.age";
+      enable = true;
-    };
+      appName = "cnix code forge";
 
-    server = {
+      database = {
-      fail2ban = lib.mkIf config.server.fail2ban.enable {
+        type = "postgres";
-        jails = {
+        socket = "/run/postgresql";
-          gitea = {
+        name = "gitea";
-            serviceName = "gitea";
+        user = "gitea";
-            failRegex = ''.*(Failed authentication attempt|invalid credentials|Attempted access of unknown user).* from <HOST>'';
+        createDatabase = false;
-          };
-        };
-      };
-    };
-
-    services = {
-      cloudflared = {
-        enable = true;
-        tunnels.${cfg.cloudflared.tunnelId} = {
-          credentialsFile = cfg.cloudflared.credentialsFile;
-          default = "http_status:404";
-          ingress."${cfg.url}".service = "http://localhost:${toString cfg.port}";
-        };
       };
 
-      ${unit} = {
+      lfs = {
         enable = true;
-        appName = "cnix code forge";
+      };
 
-        database = {
+      settings = {
-          type = "postgres";
+        cors = {
-          socket = "/run/postgresql";
+          ENABLED = true;
-          name = "gitea";
+          SCHEME = "https";
-          user = "gitea";
+          ALLOW_DOMAIN = cfg.url;
-          createDatabase = false;
         };
-
+        log = {
-        lfs = {
+          MODE = "console";
-          enable = true;
         };
-
+        mailer = {
-        settings = {
+          ENABLED = false;
-          cors = {
+          MAILER_TYPE = "sendmail";
-            ENABLED = true;
+          FROM = "noreply+adam@cnst.dev";
-            SCHEME = "https";
+          SENDMAIL_PATH = "/run/wrappers/bin/sendmail";
-            ALLOW_DOMAIN = cfg.url;
+        };
-          };
+        picture = {
-          log = {
+          DISABLE_GRAVATAR = true;
-            MODE = "console";
+        };
-          };
+        repository = {
-          mailer = {
+          DEFAULT_BRANCH = "main";
-            ENABLED = false;
+          DEFAULT_REPO_UNITS = "repo.code,repo.issues,repo.pulls";
-            MAILER_TYPE = "sendmail";
+          DISABLE_DOWNLOAD_SOURCE_ARCHIVES = true;
-            FROM = "noreply+adam@cnst.dev";
+        };
-            SENDMAIL_PATH = "/run/wrappers/bin/sendmail";
+        indexer = {
-          };
+          REPO_INDEXER_ENABLED = true;
-          picture = {
+        };
-            DISABLE_GRAVATAR = true;
+        server = {
-          };
+          DOMAIN = cfg.url;
-          repository = {
+          LANDING_PAGE = "explore";
-            DEFAULT_BRANCH = "main";
+          HTTP_PORT = cfg.port;
-            DEFAULT_REPO_UNITS = "repo.code,repo.issues,repo.pulls";
+          ROOT_URL = "https://${cfg.url}/";
-            DISABLE_DOWNLOAD_SOURCE_ARCHIVES = true;
+        };
-          };
+        security = {
-          indexer = {
+          DISABLE_GIT_HOOKS = false;
-            REPO_INDEXER_ENABLED = true;
+        };
-          };
+        service = {
-          oauth2_client = {
+          DISABLE_REGISTRATION = true;
-            ENABLE_AUTO_REGISTRATION = true;
+        };
-            ACCOUNT_LINKING = "auto";
+        session = {
-          };
+          COOKIE_SECURE = 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;
-          };
         };
       };
     };

modules/server/homepage-dashboard/default.nix

@@ -101,7 +101,7 @@ in {
               label = "SYSTEM";
               memory = true;
               cpu = true;
-              uptime = false;
+              uptime = true;
             };
           }
         ];

modules/server/jellyfin/default.nix

@@ -4,21 +4,21 @@
   pkgs,
   ...
 }: let
-  unit = "jellyfin";
+  service = "jellyfin";
-  cfg = config.server.${unit};
+  cfg = config.server.${service};
   srv = config.server;
 in {
-  options.server.${unit} = {
+  options.server.${service} = {
     enable = lib.mkEnableOption {
-      description = "Enable ${unit}";
+      description = "Enable ${service}";
     };
     configDir = lib.mkOption {
       type = lib.types.str;
-      default = "/var/lib/${unit}";
+      default = "/var/lib/${service}";
     };
     url = lib.mkOption {
       type = lib.types.str;
-      default = "fin.${srv.tailscale.url}";
+      default = "jellyfin.${srv.domain}";
     };
     homepage.name = lib.mkOption {
       type = lib.types.str;
@@ -38,7 +38,7 @@ in {
     };
   };
   config = lib.mkIf cfg.enable {
-    services.${unit} = {
+    services.${service} = {
       enable = true;
       user = srv.user;
       group = srv.group;
@@ -49,13 +49,14 @@ in {
     services.traefik = {
       dynamicConfigOptions = {
         http = {
-          services.${unit}.loadBalancer.servers = [{url = "http://localhost:8096";}];
+          services.jellyfin.loadBalancer.servers = [{url = "http://127.0.0.1:8096";}];
           routers = {
-            jellyfinRouter = {
+            jellyfin = {
               entryPoints = ["websecure"];
               rule = "Host(`${cfg.url}`)";
-              service = "${unit}";
+              service = "jellyfin";
               tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
             };
           };
         };

modules/server/jellyseerr/default.nix

@@ -3,18 +3,17 @@
   lib,
   ...
 }: let
-  unit = "jellyseerr";
+  service = "jellyseerr";
   srv = config.server;
-  cfg = config.server.${unit};
+  cfg = config.server.${service};
 in {
-  options.server.${unit} = {
+  options.server.${service} = {
     enable = lib.mkEnableOption {
-      description = "Enable ${unit}";
+      description = "Enable ${service}";
     };
     url = lib.mkOption {
       type = lib.types.str;
-      # default = "seer.${srv.tailscale.url}";
+      default = "${service}.${srv.domain}";
-      default = "jellyseerr.${srv.domain}";
     };
     port = lib.mkOption {
       type = lib.types.port;
@@ -38,20 +37,21 @@ in {
     };
   };
   config = lib.mkIf cfg.enable {
-    services.${unit} = {
+    services.${service} = {
       enable = true;
       port = cfg.port;
     };
     services.traefik = {
       dynamicConfigOptions = {
         http = {
-          services.jellyseerr.loadBalancer.servers = [{url = "http://localhost:${toString cfg.port}";}];
+          services.jellyseerr.loadBalancer.servers = [{url = "http://127.0.0.1:${toString cfg.port}";}];
           routers = {
             jellyseerr = {
               entryPoints = ["websecure"];
               rule = "Host(`${cfg.url}`)";
-              service = "${unit}";
+              service = "jellyseerr";
               tls.certResolver = "letsencrypt";
+              # middlewares = ["authentik"];
             };
           };
         };

modules/server/nextcloud/default.nix

@@ -54,14 +54,8 @@ in {
     server.fail2ban = lib.mkIf config.server.fail2ban.enable {
       jails = {
         nextcloud = {
-          serviceName = "${unit}";
+          serviceName = "phpfpm-nextcloud";
-          _groupsre = ''(?:(?:,?\s*"\w+":(?:"[^"]+"|\w+))*)'';
+          failRegex = "^.*Login failed:.*(Remote IP: <HOST>).*$";
-          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)?"'';
         };
       };
     };
@@ -69,7 +63,7 @@ in {
     services = {
       ${unit} = {
         enable = true;
-        package = pkgs.nextcloud32;
+        package = pkgs.nextcloud31;
         hostName = "nextcloud";
         configureRedis = true;
         caching = {

modules/server/podman/default.nix

@@ -143,63 +143,61 @@ in {
       ];
     };
 
-    services = {
+    services.traefik = lib.mkMerge [
-      traefik = lib.mkMerge [
+      (lib.mkIf cfg.pihole.enable {
-        (lib.mkIf cfg.pihole.enable {
+        dynamicConfigOptions = {
-          dynamicConfigOptions = {
+          http = {
-            http = {
+            services = {
-              services = {
+              pihole.loadBalancer.servers = [{url = "http://localhost:${toString cfg.pihole.port}";}];
-                pihole.loadBalancer.servers = [{url = "http://localhost:${toString cfg.pihole.port}";}];
+            };
-              };
+            routers = {
-              routers = {
+              pihole = {
-                pihole = {
+                entryPoints = ["websecure"];
-                  entryPoints = ["websecure"];
+                rule = "Host(`${cfg.pihole.url}`)";
-                  rule = "Host(`${cfg.pihole.url}`)";
+                service = "pihole";
-                  service = "pihole";
+                tls.certResolver = "letsencrypt";
-                  tls.certResolver = "letsencrypt";
-                };
               };
             };
           };
-        })
+        };
+      })
 
-        (lib.mkIf cfg.qbittorrent.enable {
+      (lib.mkIf cfg.qbittorrent.enable {
-          dynamicConfigOptions = {
+        dynamicConfigOptions = {
-            http = {
+          http = {
-              services = {
+            services = {
-                qbittorrent.loadBalancer.servers = [{url = "http://localhost:${toString cfg.qbittorrent.port}";}];
+              qbittorrent.loadBalancer.servers = [{url = "http://localhost:${toString cfg.qbittorrent.port}";}];
-              };
+            };
-              routers = {
+            routers = {
-                qbittorrent = {
+              qbittorrent = {
-                  entryPoints = ["websecure"];
+                entryPoints = ["websecure"];
-                  rule = "Host(`${cfg.qbittorrent.url}`)";
+                rule = "Host(`${cfg.qbittorrent.url}`)";
-                  service = "qbittorrent";
+                service = "qbittorrent";
-                  tls.certResolver = "letsencrypt";
+                tls.certResolver = "letsencrypt";
-                };
               };
             };
           };
-        })
+        };
+      })
 
-        (lib.mkIf cfg.slskd.enable {
+      (lib.mkIf cfg.slskd.enable {
-          dynamicConfigOptions = {
+        dynamicConfigOptions = {
-            http = {
+          http = {
-              services = {
+            services = {
-                slskd.loadBalancer.servers = [{url = "http://localhost:${toString cfg.slskd.port}";}];
+              slskd.loadBalancer.servers = [{url = "http://localhost:${toString cfg.slskd.port}";}];
-              };
+            };
-              routers = {
+            routers = {
-                slskd = {
+              slskd = {
-                  entryPoints = ["websecure"];
+                entryPoints = ["websecure"];
-                  rule = "Host(`${cfg.slskd.url}`)";
+                rule = "Host(`${cfg.slskd.url}`)";
-                  service = "slskd";
+                service = "slskd";
-                  tls.certResolver = "letsencrypt";
+                tls.certResolver = "letsencrypt";
-                };
               };
             };
           };
-        })
+        };
-      ];
+      })
-    };
+    ];
 
     virtualisation.oci-containers.containers = lib.mkMerge [
       (lib.mkIf cfg.gluetun.enable {
@@ -295,7 +293,7 @@ in {
       (lib.mkIf cfg.pihole.enable {
         pihole = {
           autoStart = true;
-          image = "pihole/pihole:2025.08.0";
+          image = "pihole/pihole:latest";
           volumes = [
             "/var/lib/pihole:/etc/pihole/"
             "/var/lib/dnsmasq.d:/etc/dnsmasq.d/"

modules/server/tailscale/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  lib,
-  self,
-  ...
-}:
-with lib; let
-  cfg = config.server.tailscale;
-in {
-  options.server.tailscale = {
-    enable = mkEnableOption "Enable tailscale server configuration";
-    url = lib.mkOption {
-      type = lib.types.str;
-      default = "ts.cnst.dev";
-    };
-  };
-
-  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"
-      ];
-    };
-  };
-}

modules/server/traefik/default.nix

@@ -23,7 +23,7 @@ in {
     age.secrets.traefikEnv = {
       file = "${self}/secrets/traefikEnv.age";
       mode = "640";
-      owner = "traefik";
+      owner = "root";
       group = "traefik";
     };
 
@@ -49,7 +49,7 @@ in {
             dashboard = true;
           };
           certificatesResolvers = {
-            vpn.tailscale = {};
+            tailscale.tailscale = {};
             letsencrypt = {
               acme = {
                 email = "adam@cnst.dev";
@@ -89,10 +89,6 @@ in {
                     main = "cnix.dev";
                     sans = ["*.cnix.dev"];
                   }
-                  {
-                    main = "ts.cnst.dev";
-                    sans = ["*ts.cnst.dev"];
-                  }
                 ];
               };
             };

modules/server/vaultwarden/default.nix

@@ -44,7 +44,7 @@ in {
         jails = {
           vaultwarden = {
             serviceName = "vaultwarden";
-            failRegex = ''^.*?Username or password is incorrect\. Try again\. IP: <ADDR>\. Username:.*$'';
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
           };
         };
       };
@@ -72,7 +72,7 @@ in {
           logLevel = "warn";
           extendedLogging = true;
           useSyslog = true;
-          invitationsAllowed = true;
+          invitationsAllowed = false;
           showPasswordHint = false;
         };
       };

modules/server/www/default.nix

@@ -44,11 +44,9 @@ in {
     server = {
       fail2ban = lib.mkIf config.server.www.enable {
         jails = {
-          nginx-404 = {
+          www = {
-            serviceName = "nginx";
+            serviceName = "cnst.dev";
-            failRegex = ''^.*\[error\].*directory index of.* is forbidden.*client: <HOST>.*$'';
+            failRegex = "^.*Username or password is incorrect. Try again. IP: <HOST>. Username: <F-USER>.*</F-USER>.$";
-            ignoreRegex = '''';
-            maxRetry = 5;
           };
         };
       };
@@ -66,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;
-            '';
-          };
         };
       };
 
@@ -96,24 +85,17 @@ in {
       };
     };
 
-    environment.etc = {
+    environment.etc."webfinger/.well-known/webfinger".text = ''
-      "webfinger/.well-known/webfinger".text = ''
+      {
-        {
+        "subject": "acct:adam@${cfg.url}",
-          "subject": "acct:adam@${cfg.url}",
+        "links": [
-          "links": [
+          {
-            {
+            "rel": "http://openid.net/specs/connect/1.0/issuer",
-              "rel": "http://openid.net/specs/connect/1.0/issuer",
+            "href": "https://auth.${cfg.url}/application/o/tailscale/"
-              "href": "https://auth.${cfg.url}/application/o/tailscale/"
+          }
-            }
+        ]
-          ]
+      }
-        }
+    '';
-      '';
-
-      "webfinger/robots.txt".text = ''
-        User-agent: *
-        Disallow: /
-      '';
-    };
 
     services.traefik.dynamicConfigOptions.http = {
       routers.webfinger = {

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

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

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,7 +61,6 @@ in {
   "traefikEnv.age".publicKeys = kima ++ sobotka;
   "wwwCloudflared.age".publicKeys = kima ++ sobotka;
   "authentikCloudflared.age".publicKeys = kima ++ sobotka;
-  "sobotkaTsAuth.age".publicKeys = kima ++ sobotka;
 
   # Ziggy-specific
   "cloudflareDnsCredentialsZiggy.age".publicKeys = kima ++ ziggy;

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>