From e413d1de3fe7e2aeb58b44e7ad839e7390cad699 Mon Sep 17 00:00:00 2001
From: jolheiser <john.olheiser@gmail.com>
Date: Mon, 15 Jan 2024 17:26:44 -0600
Subject: [PATCH] feat: ugit

Signed-off-by: jolheiser <john.olheiser@gmail.com>
---
 flake.lock                      |  71 ++++++++++++++++++++++++++++++--
 flake.nix                       |   6 +++
 machines/dragonwell/caddy.nix   |   2 +-
 machines/dragonwell/default.nix |   3 +-
 machines/dragonwell/ugit.nix    |  19 +++++++++
 secrets/shared/ssh-config.age   | Bin 1636 -> 1783 bytes
 6 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 machines/dragonwell/ugit.nix

diff --git a/flake.lock b/flake.lock
index 31d6ded..9f0afdc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -372,6 +372,7 @@
         "tclip": "tclip",
         "templ": "templ",
         "tmpl": "tmpl",
+        "ugit": "ugit",
         "website": "website",
         "wsl": "wsl"
       }
@@ -394,7 +395,7 @@
     "tailwind-ctp": {
       "inputs": {
         "nixpkgs": [
-          "website",
+          "ugit",
           "nixpkgs"
         ]
       },
@@ -413,6 +414,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",
@@ -433,6 +455,27 @@
         "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",
@@ -499,6 +542,28 @@
         "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": [
@@ -510,8 +575,8 @@
         "nur": [
           "jolheiser-nur"
         ],
-        "tailwind-ctp": "tailwind-ctp",
-        "tailwind-ctp-lsp": "tailwind-ctp-lsp"
+        "tailwind-ctp": "tailwind-ctp_2",
+        "tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
       },
       "locked": {
         "lastModified": 1699404161,
diff --git a/flake.nix b/flake.nix
index ba810a3..7644749 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,11 @@
       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 b5d0176..6b21a0f 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -45,7 +45,7 @@
       };
       "git.jolheiser.com" = {
         extraConfig = ''
-          redir https://git.jojodev.com/jolheiser{uri}
+          reverse_proxy localhost:8449
         '';
       };
     };
diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 64b23fe..aa5a780 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 @@ in {
   };
 
   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 0000000..9d740e0
--- /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
GIT binary patch
delta 1702
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

delta 1554
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
Evj5AWxBvhE