diff --git a/flake.lock b/flake.lock
index 00936e1..2a47df7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,20 +1,5 @@
 {
   "nodes": {
-    "caddy-nix": {
-      "locked": {
-        "lastModified": 1735284852,
-        "narHash": "sha256-mQu3IwEO294DuB7XAXOvOLriElDgRTf6rTLoDh3tMFQ=",
-        "owner": "vincentbernat",
-        "repo": "caddy-nix",
-        "rev": "b421380ded7c000f432092df0f1a7afd9e187173",
-        "type": "github"
-      },
-      "original": {
-        "owner": "vincentbernat",
-        "repo": "caddy-nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -419,7 +404,6 @@
     },
     "root": {
       "inputs": {
-        "caddy-nix": "caddy-nix",
         "devshell": [
           "rebmit",
           "devshell"
diff --git a/flake.nix b/flake.nix
index 5e0a16c..2292c2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,6 @@
       url = "github:nix-community/nixpkgs-terraform-providers-bin";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    caddy-nix.url = "github:vincentbernat/caddy-nix";
 
     # libraries
 
diff --git a/flake/nixpkgs.nix b/flake/nixpkgs.nix
index e62dbbc..4fe856c 100644
--- a/flake/nixpkgs.nix
+++ b/flake/nixpkgs.nix
@@ -7,22 +7,13 @@ let
     inputs.rebmit.overlays.default
     inputs.nixpkgs-terraform-providers-bin.overlay
 
-    # TODO: wait for https://nixpkgs-tracker.ocfox.me/?pr=358586
-    inputs.caddy-nix.overlays.default
-
-    (final: prev: {
+    (_final: prev: {
       libadwaita = prev.libadwaita.overrideAttrs (old: {
         patches = (old.patches or [ ]) ++ [
           ../patches/libadwaita-without-adwaita-theme.patch
         ];
         doCheck = false;
       });
-      # TODO: wait for https://nixpkgs-tracker.ocfox.me/?pr=360101
-      xdg-desktop-portal-gnome = prev.xdg-desktop-portal-gnome.overrideAttrs (_old: {
-        propagatedUserEnvPkgs = [
-          final.nautilus
-        ];
-      });
     })
   ];
 in
diff --git a/home-manager/profiles/applications/desktop.nix b/home-manager/profiles/applications/desktop.nix
index 9e5451b..a430fdc 100644
--- a/home-manager/profiles/applications/desktop.nix
+++ b/home-manager/profiles/applications/desktop.nix
@@ -6,6 +6,7 @@
     foliate
     libreoffice-fresh
     loupe
+    nautilus
     nheko
     papers
     seahorse
diff --git a/nixos/profiles/services/caddy/default.nix b/nixos/profiles/services/caddy/default.nix
index 1e1910f..161848b 100644
--- a/nixos/profiles/services/caddy/default.nix
+++ b/nixos/profiles/services/caddy/default.nix
@@ -9,8 +9,8 @@
     enable = true;
     enableReload = true;
     package = pkgs.caddy.withPlugins {
-      plugins = [ "github.com/mholt/caddy-l4@3c6cc2c0ee0875899fde271fbdef95be3fef7a92" ];
-      hash = "sha256-s5LzVOAvVsZxbhdgIdpe1OBSHIAc/tCi+1pEofeQx6k=";
+      plugins = [ "github.com/mholt/caddy-l4@v0.0.0-20250102174933-6e5f5e311ead" ];
+      hash = "sha256-F7SZRTkJ2f/khJb1OCdbGNjxp95sN4Pl+Scir3PSKec=";
     };
   };