1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

diff --git a/flake.lock b/flake.lock
index b8cd1829f15bcda5a447557a634d6a906d5be9ad..8c99c63d19a661ffcf7fd82c93bee097b017d5a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -234,6 +234,26 @@         "type": "git",
         "url": "https://git.jolheiser.com/git-age.git"
       }
     },
+    "git-pr": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721014718,
+        "narHash": "sha256-VwiuhbFL4GjGyDQpO7eYHAfjl+LOhGqjUAbaHOR78VM=",
+        "ref": "refs/heads/main",
+        "rev": "b8fc91752953cddb92daf9e08de0b27bd4731d3d",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://git.jolheiser.com/git-pr-nix.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jolheiser.com/git-pr-nix.git"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -507,6 +527,7 @@         "dagger": "dagger",
         "flake-utils": "flake-utils",
         "gist": "gist",
         "git-age": "git-age",
+        "git-pr": "git-pr",
         "golink": "golink",
         "gomodinit": "gomodinit",
         "helix": "helix",

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23

diff --git a/flake.nix b/flake.nix
index 1796c1c268aec6ca5d3e6849a555d05e1f8b1559..d7a74e85f1c54a449b77615817f36de794f4437a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -81,6 +81,10 @@     ugit = {
       url = "git+https://git.jolheiser.com/ugit.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    git-pr = {
+      url = "git+https://git.jolheiser.com/git-pr-nix.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     # Other flakes
     golink = {
       url = "github:tailscale/golink";
@@ -232,6 +236,7 @@         imports = [
           inputs.agenix.nixosModules.default
           inputs.golink.nixosModules.default
           inputs.ugit.nixosModules.default
+          inputs.git-pr.nixosModules.default
           ./machines/dragonwell
         ];
       };

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14

diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix
index be1a04aea54a1464adbd2871d0acf34fc27ba0d4..a5868fb6c57427b1245389a3313e5a16d43c4508 100644
--- a/machines/dragonwell/caddy.nix
+++ b/machines/dragonwell/caddy.nix
@@ -55,6 +55,9 @@       };
       "git.jolheiser.com".extraConfig = ''
         reverse_proxy localhost:8449
       '';
+      "pr.jolheiser.com".extraConfig = ''
+        reverse_proxy localhost:7449
+      '';
       "social.jolheiser.com".extraConfig = ''
         reverse_proxy localhost:4686
       '';

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13

diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix
index 9ba27149e6cae14925606122bc2e41141cc05185..f83dbeb59e019c8997a0c6e315b26a94df5b53ac 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 ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
+  imports = [./caddy.nix ./dex.nix ./git-pr.nix ./golink.nix ./gotosocial.nix ./restic.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
 
   boot.tmp.cleanOnBoot = true;
   zramSwap.enable = true;

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

diff --git a/machines/dragonwell/git-pr.nix b/machines/dragonwell/git-pr.nix
new file mode 100644
index 0000000000000000000000000000000000000000..4994ddb03bc8ad96f29af08a4772dd6138f199ee
--- /dev/null
+++ b/machines/dragonwell/git-pr.nix
@@ -0,0 +1,19 @@
+{
+  services.git-pr = {
+    enable = true;
+    openFirewall = true;
+    url = "pr.jolheiser.com";
+    admins = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDAMAN5+UcBIQ5jQgd74yabfQRCfMToFNAfmU6M5MmFSb3C1Txkdr2lPeaev5enTm70mWrFYs2FC3oA0nWHvkxoBKzYmhRiRGPJ/6VQVaZbQP1j3MFKosCIXzN0GqVb5VPz/4jjX5hW2HWtyf4XID63rHJLmD0lwJVfxsue/wftTaSqNeCZjC9jNuDB+vlJRHsvLfk1ssiQ6V2508ZgImHG/LuS/WpMsd8zvI2vqZh4nVr9Bmc8U2B5KtOOcT/HpKRBfGPRTJyQ+vgqIx96J8ah5eK19jO/nTKiqobMkIgPiXkKyZa+Z5NzMe728sL6eTfWRimbU+sVSizVtvDdkSfx"];
+    sshPort = 7448;
+    enableWeb = true;
+    webPort = 7449;
+    theme = "catppuccin-mocha";
+    repos = [
+      {
+        id = "ugit";
+        cloneAddr = "https://git.jolheiser.com/ugit.git";
+        desc = "Minimal git service";
+      }
+    ];
+  };
+}