feat: remove mymx and fix caddy update

agenix.nix

@@ -31,8 +31,4 @@ in
     server
     jet
   ];
-  "secrets/mymx-webhook.age".publicKeys = [
-    server
-    jet
-  ];
 }

configuration.nix

@@ -18,7 +18,6 @@
     ./modules/uptime-kuma.nix
     ./modules/noisebell.nix
     ./modules/noisepics.nix
-    # mymx module is imported via flake input in flake.nix
   ];
 
   # Agenix secrets
@@ -39,10 +38,6 @@
       owner = "matrix-synapse";
     };
     ntfy-admin-hash.file = ./secrets/ntfy-admin-hash.age;
-    mymx-webhook = {
-      file = ./secrets/mymx-webhook.age;
-      owner = "mymx";
-    };
   };
 
   # Bootloader
@@ -153,11 +148,6 @@
     tor.enable = true;
   };
 
-  services.mymx = {
-    enable = true;
-    webhookSecretFile = config.age.secrets.mymx-webhook.path;
-  };
-
   # Allow Tailscale traffic
   networking.firewall.trustedInterfaces = [ "tailscale0" ];
   # Required for Tailscale subnet routing and exit nodes, and often helpful for connectivity

flake.lock

@@ -288,27 +288,6 @@
         "type": "github"
       }
     },
-    "mymx": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1773112411,
-        "narHash": "sha256-7PCKEfXFgBwaqqEVWq99NiRE7iAaMSzVyrHwuclrEYo=",
-        "ref": "refs/heads/main",
-        "rev": "8368cc115eee7c696ed456eabf285a89c308df65",
-        "revCount": 4,
-        "type": "git",
-        "url": "https://git.extremist.software/jet/mymx"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.extremist.software/jet/mymx"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1774018263,
@@ -380,11 +359,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1774106199,
+        "lastModified": 1774386573,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -419,7 +398,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_2"
+        "rust-overlay": "rust-overlay"
       },
       "locked": {
         "lastModified": 1774387217,
@@ -459,7 +438,6 @@
       "inputs": {
         "agenix": "agenix",
         "disko": "disko",
-        "mymx": "mymx",
         "nixpkgs": "nixpkgs",
         "noisebell": "noisebell",
         "noisepics": "noisepics",
@@ -467,27 +445,6 @@
       }
     },
     "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "mymx",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1772593411,
-        "narHash": "sha256-47WOnCSyOL6AghZiMIJaTLWM359DHe3be9R1cNCdGUE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "a741b36b77440f5db15fcf2ab6d7d592d2f9ee8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": [
           "noisebell",
@@ -508,7 +465,7 @@
         "type": "github"
       }
     },
-    "rust-overlay_3": {
+    "rust-overlay_2": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
       },
@@ -593,7 +550,7 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_3"
+        "rust-overlay": "rust-overlay_2"
       },
       "locked": {
         "lastModified": 1774078882,

flake.nix

@@ -7,9 +7,6 @@
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
-    mymx.url = "git+https://git.extremist.software/jet/mymx";
-    mymx.inputs.nixpkgs.follows = "nixpkgs";
-
     website.url = "git+https://git.extremist.software/jet/website";
     website.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -36,7 +33,6 @@
         specialArgs = { inherit inputs; };
         modules = [
           disko.nixosModules.disko
-          inputs.mymx.nixosModules.default
           inputs.website.nixosModules.default
           inputs.agenix.nixosModules.default
           inputs.noisebell.nixosModules.default

modules/caddy.nix

@@ -1,11 +1,20 @@
 { config, pkgs, ... }:
 
+let
+  caddyPkg = pkgs.callPackage "${pkgs.path}/pkgs/by-name/ca/caddy/package.nix" {
+    buildGo125Module = pkgs.buildGo126Module;
+  };
+  caddyWithPlugins = pkgs.callPackage "${pkgs.path}/pkgs/by-name/ca/caddy/plugins.nix" {
+    caddy = caddyPkg;
+  };
+in
+
 {
   services.caddy = {
     enable = true;
-    package = pkgs.caddy.withPlugins {
+    package = caddyWithPlugins {
       plugins = [ "github.com/mholt/caddy-ratelimit@v0.1.0" ];
-      hash = "sha256-kuqkLAMxBJvjNbgVCjrJDLFKUqMPPzguFupgXBFQYCA=";
+      hash = "sha256-Ko4kJJiBUGX/2x6O+Q0f7hrf6r7YkVCQPRV04Adgedw=";
     };
     email = "postmaster@extremist.software";
     globalConfig = ''

secrets/mymx-webhook.age

@@ -1,8 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 uKftJg odmqiQoMit+Hd/clSrfuszRodIE1F8TYqkBlF53t8R8
-BDtfg89wMlSy/qggeUNmDpHgvxq9IZzZq0512OeRXVM
--> ssh-ed25519 Ziw7aw sf0Bg7dYa9/juDnRN7J98Kr1dYr9LCldjf5mWxH36jE
-no2kHSXfVPiC3t0Lyz+enlAkVco/6fiNTO2luNhwH+U
---- qOuHzmSrOs3h1txQm/Xug7qmCo21EE1QwJudeCfr7yA
-^ˆµ.㔦Q
-ã‹kâá5¿}È›àíÌLòý$
ñgˆÁ¦ØlÿaoÄ>Õê2ÃùÕîNÃŒˆŸi—Bä…8c'’¸¦­ñ