diff --git a/flake.lock b/flake.lock
index 6e678aef991d061c1d3b3eb29fd5974064ef97a5..a01b3232d62f3f397e60a0ea6d228606d4576867 100644
--- a/flake.lock
+++ b/flake.lock
@@ -310,13 +310,14 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717050755,
+        "lastModified": 1694616124,
-        "lastModified": 1719973663,
+  "nodes": {
       "locked": {
+      "inputs": {
         "owner": "tweag",
         "repo": "gomod2nix",
-        "narHash": "sha256-SybjMpCVUWG998EkvcwjHH3fTbG05FUSbB/Gqjz63tE=",
   "nodes": {
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
         "type": "github"
       },
       "original": {
@@ -479,21 +480,6 @@         "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1721562059,
-        "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
       }
     },
     "nur": {
@@ -710,21 +696,22 @@     },
     "tclip": {
       "inputs": {
         "gomod2nix": "gomod2nix",
+        "nixpkgs": [
+          "nixpkgs"
         ],
-{
         "utils": [
           "flake-utils"
         ]
       },
       "locked": {
   "nodes": {
-        "narHash": "sha256-URQMDzLPs5kckDybkMqrKZN2aqt0GvAt9V5NT4kpMW8=",
+        "owner": "hercules-ci",
   "nodes": {
-        "rev": "bd7287aa0d13d5af400f659963655c004789715f",
+        "repo": "gitignore.nix",
         "owner": "tailscale-dev",
         "repo": "tclip",
   "nodes": {
-    "blog": {
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5787a3d0ac28b2ba4900f418162542e969668417..ab4a5a72fcb4904d576edd7382dd5594705fa70a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,7 +96,7 @@     };
     tclip = {
       url = "github:tailscale-dev/tclip";
       inputs = {
-        #nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs";
         utils.follows = "flake-utils";
       };
     };
@@ -149,6 +149,7 @@           bennet = inputs.bennet.packages.${prev.system}.default;
         };
         tclip = inputs.tclip.packages.${prev.system}.tclip;
         templ = inputs.templ.packages.${prev.system}.templ;
+        dagger = inputs.dagger.packages.${prev.system}.dagger;
       })
       inputs.golink.overlay
     ];
@@ -235,7 +236,7 @@           inherit overlays system;
         };
       };
 {
-    templ = {
+        nur = import inputs.nur {
         imports = [
           inputs.agenix.nixosModules.default
           inputs.golink.nixosModules.default
@@ -244,11 +245,8 @@           inputs.git-pr.nixosModules.default
           inputs.actual.nixosModules.default
           inputs.tsnet-serve.nixosModules.default
         home-manager.follows = "";
-
-        home-manager.follows = "";
   inputs = {
         ];
-        services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
       };
     };
     nixConfig = {
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index b0f13919164ed17a3a21234dbd8c82253827ebef..91429c7501bb73afee40d7e07baf8406e3e76810 100644
--- a/machines/dragonwell/default.nix
+++ b/machines/dragonwell/default.nix
@@ -2,7 +2,7 @@ let
   username = "jolheiser";
   key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
 in {
-  imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./tclip.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
+  imports = [./actual.nix ./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./soju.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
diff --git a/machines/dragonwell/tclip.nix b/machines/dragonwell/tclip.nix
deleted file mode 100644
index db4dcd802fb6603260966715df18c83518968242..0000000000000000000000000000000000000000
--- a/machines/dragonwell/tclip.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  services.tclip = {
-    enable = true;
-    hostname = "paste";
-    useFunnel = true;
-    hideFunnelUsers = true;
-    authKey = "tskey-auth-k1VerP4gam11CNTRL-89rpeDcfTdJqkF9AECWmdJLVgo1jQcSAB"; # One-time key
-  };
-}
diff --git a/modules/tclip/default.nix b/modules/tclip/default.nix
deleted file mode 100644
index 69b5a35bc3fd9409c979ca7d099aa69be97e2f48..0000000000000000000000000000000000000000
--- a/modules/tclip/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: let
-  cfg = config.services.tclip;
-in {
-  options.services.tclip = {
-    enable = lib.mkEnableOption "tclip service";
-
-    hostname = lib.mkOption {
-      type = lib.types.str;
-      default = "paste";
-      description = "The hostname to use on your tailnet";
-    };
-
-    dataLocation = lib.mkOption {
-      type = lib.types.str;
-      default = "/var/lib/tclip";
-      description = "Where program data is stored";
-    };
-
-    tsnetVerbose = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Log verbosely to stderr";
-    };
-
-    useFunnel = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Expose pastes with tailscale funnel";
-    };
-
-    hideFunnelUsers = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Hide usernamd/image on funnel";
-    };
-
-    httpPort = lib.mkOption {
-      type = lib.types.nullOr lib.types.port;
-      default = null;
-      description = "Expose pastes on an HTTP server at the given port";
-    };
-
-    controlURL = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-      description = "Custom control server (e.g. headscale)";
-    };
-
-    disableHTTPS = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = "Disable serving on HTTPS";
-    };
-
-    package = lib.mkOption {
-      type = lib.types.package;
-      description = "The tclip package to use";
-    };
-
-    authKey = lib.mkOption {
-      type = lib.types.nullOr lib.types.str;
-      default = null;
-      description = "Tailscale auth key";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    systemd.services.tclip = {
-      description = "tclip Service";
-      after = ["network.target"];
-      wantedBy = ["multi-user.target"];
-
-      serviceConfig = {
-        ExecStart = let
-          args =
-            lib.optionals (cfg.httpPort != null) [
-              "--http-port=${cfg.httpPort}"
-            ]
-            ++ lib.optionals (cfg.controlURL != null) [
-              "--control-url=${cfg.controlURL}"
-            ]
-            ++ [
-              (lib.optionalString cfg.disableHTTPS "--disable-https")
-              "--hostname=${cfg.hostname}"
-              "--data-location=${cfg.dataLocation}"
-              (lib.optionalString cfg.tsnetVerbose "--tsnet-verbose")
-              (lib.optionalString cfg.useFunnel "--use-funnel")
-              (lib.optionalString cfg.hideFunnelUsers "--hide-funnel-users")
-            ];
-        in "${cfg.package}/bin/tclipd ${lib.concatStringsSep " " args}";
-        Restart = "always";
-        User = "tclip";
-        Group = "tclip";
-        Environment = ["TS_AUTHKEY=${cfg.authKey}"];
-      };
-    };
-
-    # Create user and group
-    users.users.tclip = {
-      isSystemUser = true;
-      group = "tclip";
-      home = cfg.dataLocation;
-      createHome = true;
-    };
-
-    users.groups.tclip = {};
-  };
-}