From 0337509664c97e88a943d78689ffe964c9b92ef7 Mon Sep 17 00:00:00 2001
From: cy <hi@cything.io>
Date: Sun, 15 Dec 2024 02:56:30 -0500
Subject: [PATCH] we can use unstable caddy now

---
 flake.lock              | 19 +------------------
 flake.nix               |  2 --
 hosts/chunk/default.nix |  2 --
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 27fa926..fc197f5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,8 +57,7 @@
         "chromium": "chromium",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "sops-nix": "sops-nix",
-        "testpkgs": "testpkgs"
+        "sops-nix": "sops-nix"
       }
     },
     "sops-nix": {
@@ -80,22 +79,6 @@
         "repo": "sops-nix",
         "type": "github"
       }
-    },
-    "testpkgs": {
-      "locked": {
-        "lastModified": 1733788258,
-        "narHash": "sha256-1vwUQvcs/pzRIg7Mo+QcE6ZavQWyjJP502n43b4VsGQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "248081c4729259c3add830d502779c5d04cbe074",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "248081c4729259c3add830d502779c5d04cbe074",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 08f38f0..a54c872 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,8 +12,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     chromium.url = "github:NixOS/nixpkgs/314e12ba369ccdb9b352a4db26ff419f7c49fa84";
-    # this has the caddy module with environmentFile option
-    testpkgs.url = "github:NixOS/nixpkgs/248081c4729259c3add830d502779c5d04cbe074";
   };
 
   outputs = {
diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix
index 60ad714..93c17bd 100644
--- a/hosts/chunk/default.nix
+++ b/hosts/chunk/default.nix
@@ -5,10 +5,8 @@
   inputs,
   ...
 }: {
-  disabledModules = ["services/web-servers/caddy/default.nix"];
   imports = [
     ./hardware-configuration.nix
-    "${inputs.testpkgs}/nixos/modules/services/web-servers/caddy"
     ../common.nix
     ./gitlab.nix
     ./borg.nix