diff --git a/flake.lock b/flake.lock
index 31d6ded686bd1a5214259c1d7aee120ef3268d42..9f0afdce3cd7058cb972a4bd2451537091d17121 100644
--- a/flake.lock
+++ b/flake.lock
@@ -372,6 +372,7 @@         "resume": "resume",
         "tclip": "tclip",
         "templ": "templ",
         "tmpl": "tmpl",
+        "ugit": "ugit",
         "website": "website",
         "wsl": "wsl"
       }
@@ -394,8 +395,9 @@     },
     "tailwind-ctp": {
       "inputs": {
         "nixpkgs": [
+  "nodes": {
 {
-        "url": "https://git.jojodev.com/jolheiser/git-age"
+          "nixpkgs"
           "nixpkgs"
         ]
       },
@@ -416,6 +418,27 @@     },
     "tailwind-ctp-lsp": {
       "inputs": {
         "nixpkgs": [
+          "ugit",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1699401590,
+        "narHash": "sha256-nx8ExuBRUux9eXSUgkWp1LJMvA3dmA76+2xggZjHTU0=",
+        "ref": "refs/heads/master",
+        "rev": "b321333ad08bf21db242f246b10ad4a50b8fc8a0",
+        "revCount": 848,
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
+      }
+    },
+    "tailwind-ctp-lsp_2": {
+      "inputs": {
+        "nixpkgs": [
           "website",
           "nixpkgs"
         ]
@@ -434,6 +457,27 @@         "type": "git",
         "url": "https://git.jojodev.com/jolheiser/tailwind-ctp-intellisense"
       }
     },
+    "tailwind-ctp_2": {
+      "inputs": {
+        "nixpkgs": [
+          "website",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1695841587,
+        "narHash": "sha256-fgiZd5AV+hi8Ne0bJ8SyAx5nppseW4aXJQEIDSr0VNA=",
+        "ref": "refs/heads/main",
+        "rev": "afca060674b20e0ccecde2d6fe88c887790219a5",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/tailwind-ctp"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jojodev.com/jolheiser/tailwind-ctp"
+      }
+    },
     "tclip": {
       "inputs": {
         "gomod2nix": "gomod2nix",
@@ -500,6 +544,28 @@         "type": "git",
         "url": "https://git.jojodev.com/jolheiser/tmpl"
       }
     },
+    "ugit": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "tailwind-ctp": "tailwind-ctp",
+        "tailwind-ctp-lsp": "tailwind-ctp-lsp"
+      },
+      "locked": {
+        "lastModified": 1705360631,
+        "narHash": "sha256-zDmp6FmuTI6D1XvN191rcep+9kOTPEQ5f+HHYioUQro=",
+        "ref": "refs/heads/main",
+        "rev": "c7ec799170d3d911117a00e9f9286423058aaecb",
+        "revCount": 4,
+        "type": "git",
+        "url": "https://git.jolheiser.com/ugit.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jolheiser.com/ugit.git"
+      }
+    },
     "website": {
       "inputs": {
         "flake-utils": [
@@ -511,8 +577,8 @@         ],
         "nur": [
           "jolheiser-nur"
         ],
-        "tailwind-ctp": "tailwind-ctp",
+        "tailwind-ctp": "tailwind-ctp_2",
-        "tailwind-ctp-lsp": "tailwind-ctp-lsp"
+        "tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
       },
       "locked": {
         "lastModified": 1699404161,

diff --git a/flake.nix b/flake.nix
index ba810a36ad275d76cf54e74af9c068fd8a047738..76447497a7fd71bb03c76a8999b9e26c14ffa828 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,11 @@     gomodinit = {
       url = "git+https://git.jojodev.com/jolheiser/gomodinit";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    ugit = {
+      url = "git+https://git.jolheiser.com/ugit.git";
+      #url = "git+https://git.jojodev.com/jolheiser/ugit.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # Other flakes
     golink = {
       url = "github:tailscale/golink";
@@ -232,6 +237,7 @@         };
         dragonwell = {
           imports = [
             inputs.golink.nixosModules.default
+            inputs.ugit.nixosModules.default
             ./machines/dragonwell
           ];
         };

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index b5d01762413392af4757b181b0c74c28185f48d7..6b21a0f99ae4709210bfb087e21127e39508e9e4 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -45,8 +45,8 @@         '';
       };
       "git.jolheiser.com" = {
         extraConfig = ''
+    virtualHosts = {
     enable = true;
-            respond ${builtins.toJSON {
         '';
       };
     };

diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 64b23fe5673f8a522650505fb7c3a1f65570e515..aa5a78097d6ff3ddcbd1bae55f3cb43ba0388857 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 = [./caddy.nix ./golink.nix ./hardware.nix];
+  imports = [./caddy.nix ./golink.nix ./ugit.nix ./hardware.nix];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;
@@ -17,7 +17,6 @@     };
   };
 
   services.openssh.enable = true;
-  virtualisation.docker.enable = true;
 
   users.users = {
     "${username}" = {

diff --git a/machines/dragonwell/ugit.nix b/machines/dragonwell/ugit.nix
new file mode 100644
index 0000000000000000000000000000000000000000..9d740e09f0cd7cf1d07a09340522f24cca6be966
--- /dev/null
+++ b/machines/dragonwell/ugit.nix
@@ -0,0 +1,19 @@
+{
+  services.ugit = {
+    enable = true;
+    openFirewall = true;
+    authorizedKeys = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
+    config = {
+      ssh.clone-url = "ugit@git.jolheiser.com";
+      http.clone-url = "https://git.jolheiser.com";
+      profile = {
+        username = "jolheiser";
+        email = "john+ugit@jolheiser.com";
+        links = [
+          "Github,https://github.com/jolheiser"
+          "Gitea,https://gitea.com/jolheiser"
+        ];
+      };
+    };
+  };
+}

diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age
index 36801698ebb3e18261b010d254b304a76fae46c3..82cbe7362df27368a4547335d6f836bca660339d 100644
Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ