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

diff --git a/dragonwell/default.nix b/dragonwell/default.nix
index 8d367f7d75e25d2544578d0ba497b48c04c7a1f2..2814451187b6a0a9527c34d4045cc9b7d2e409c0 100644
--- a/dragonwell/default.nix
+++ b/dragonwell/default.nix
@@ -11,6 +11,7 @@     ./forge-lines.nix
     ./foundry.nix
     #./git-bug.nix
     ./git-pr.nix
+    ./horcrux.nix
     ./mealie.nix
     ./miniserve.nix
     ./pocket-id.nix

 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

diff --git a/dragonwell/horcrux.nix b/dragonwell/horcrux.nix
new file mode 100644
index 0000000000000000000000000000000000000000..d4dc26c97434ae869703f6b7821f068f8c68b43a
--- /dev/null
+++ b/dragonwell/horcrux.nix
@@ -0,0 +1,30 @@
+{ config, ... }:
+{
+  age.secrets.horcrux = {
+    file = ../secrets/horcrux.age;
+    owner = "horcrux";
+  };
+  services.horcrux = {
+    enable = true;
+    config = {
+      key = config.age.secrets.horcrux.path;
+      interval = "15m";
+      repos =
+        let
+          repo = name: {
+            inherit name;
+            source = "https://git.jolheiser.com/${name}.git";
+            dest = [
+              "git@github.com:jolheiser/${name}"
+              "git@tangled.sh:jolheiser.com/${name}"
+            ];
+          };
+        in
+        [
+          (repo "horcrux")
+          (repo "ugit")
+          (repo "helix.drv")
+        ];
+    };
+  };
+}

  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
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248

diff --git a/flake.lock b/flake.lock
index 672e87f72d22aa3898e4fbeaae4f512c01fe1e05..88f8e4c109105f10a5537d08e95f0344342f3f1a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -287,9 +287,27 @@         "id": "home-manager",
         "type": "indirect"
       }
     },
-    "mazanoke": {
+    "horcrux": {
       "inputs": {
         "nixpkgs": "nixpkgs_10"
+      },
+      "locked": {
+        "lastModified": 1757095920,
+        "narHash": "sha256-L9BkBUiMM3P88ECIGwyXa9I1mgU368C+7AseKsG2axg=",
+        "ref": "refs/heads/main",
+        "rev": "8cbda0b74aa054bc4659636eb91b2d5cf831ce6d",
+        "revCount": 5,
+        "type": "git",
+        "url": "https://git.jolheiser.com/horcrux.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.jolheiser.com/horcrux.git"
+      }
+    },
+    "mazanoke": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_11"
       },
       "locked": {
         "lastModified": 1746646765,
@@ -352,6 +370,22 @@       }
     },
     "nixpkgs_10": {
       "locked": {
+        "lastModified": 1756819007,
+        "narHash": "sha256-12V64nKG/O/guxSYnr5/nq1EfqwJCdD2+cIGmhz3nrE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "aaff8c16d7fc04991cac6245bee1baa31f72b1e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
         "lastModified": 1746397377,
         "narHash": "sha256-5oLdRa3vWSRbuqPIFFmQBGGUqaYZBxX+GGtN9f/n4lU=",
         "owner": "nixos",
@@ -366,7 +400,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1756386758,
         "narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
@@ -382,7 +416,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1752012998,
         "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=",
@@ -398,7 +432,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1697383814,
         "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=",
@@ -413,7 +447,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_15": {
       "locked": {
         "lastModified": 1729665710,
         "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
@@ -429,7 +463,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_16": {
       "locked": {
         "lastModified": 1743583204,
         "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=",
@@ -444,7 +478,7 @@         "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
-    "nixpkgs_16": {
+    "nixpkgs_17": {
       "locked": {
         "lastModified": 1736241350,
         "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
@@ -460,7 +494,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_17": {
+    "nixpkgs_18": {
       "locked": {
         "lastModified": 1747060738,
         "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=",
@@ -476,7 +510,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_18": {
+    "nixpkgs_19": {
       "locked": {
         "lastModified": 1695806987,
         "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
@@ -492,13 +526,13 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_19": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1699343069,
-        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
+        "lastModified": 1741037377,
+        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
+        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
         "type": "github"
       },
       "original": {
@@ -508,13 +542,13 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
+    "nixpkgs_20": {
       "locked": {
-        "lastModified": 1741037377,
-        "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
+        "lastModified": 1699343069,
+        "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
+        "rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
         "type": "github"
       },
       "original": {
@@ -636,7 +670,7 @@       }
     },
     "oidc": {
       "inputs": {
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1752529116,
@@ -654,7 +688,7 @@       }
     },
     "resume": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_14"
       },
       "locked": {
         "lastModified": 1753062776,
@@ -683,9 +717,10 @@         "git-age": "git-age",
         "git-pr": "git-pr",
         "golink": "golink",
         "home-manager": "home-manager",
+        "horcrux": "horcrux",
         "mazanoke": "mazanoke",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_12",
         "oidc": "oidc",
         "resume": "resume",
         "tailproxy": "tailproxy",
@@ -756,7 +791,7 @@       }
     },
     "tailproxy": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14"
+        "nixpkgs": "nixpkgs_15"
       },
       "locked": {
         "lastModified": 1740421538,
@@ -816,7 +851,7 @@       }
     },
     "tailwind-ctp-lsp_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_19"
+        "nixpkgs": "nixpkgs_20"
       },
       "locked": {
         "lastModified": 1699401590,
@@ -834,7 +869,7 @@       }
     },
     "tailwind-ctp_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_18"
+        "nixpkgs": "nixpkgs_19"
       },
       "locked": {
         "lastModified": 1695841587,
@@ -852,7 +887,7 @@       }
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_16",
         "utils": "utils"
       },
       "locked": {
@@ -871,7 +906,7 @@       }
     },
     "ugit": {
       "inputs": {
-        "nixpkgs": "nixpkgs_16",
+        "nixpkgs": "nixpkgs_17",
         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
@@ -909,7 +944,7 @@       }
     },
     "website": {
       "inputs": {
-        "nixpkgs": "nixpkgs_17",
+        "nixpkgs": "nixpkgs_18",
         "tailwind-ctp": "tailwind-ctp_2",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
       },

 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

diff --git a/flake.nix b/flake.nix
index e09cd4681a5f1b52c310a129eeff810d47482536..e0b33cd6ce439c38bfa45f09eac8d59ddf7c8bd4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,6 +20,7 @@     cfg-playground.url = "git+https://git.jolheiser.com/cfg-playground.git";
     ugit.url = "git+https://git.jolheiser.com/ugit.git";
     git-pr.url = "git+https://git.jolheiser.com/git-pr-nix.git";
     oidc.url = "git+https://git.jolheiser.com/oidc.git";
+    horcrux.url = "git+https://git.jolheiser.com/horcrux.git";
     # Other flakes
     golink.url = "github:tailscale/golink";
     tclip.url = "github:tailscale-dev/tclip";
@@ -53,6 +54,7 @@           tclip = inputs.tclip.packages.${prev.system}.tclip;
           templ = inputs.templ.packages.${prev.system}.templ;
         })
         inputs.golink.overlays.default
+        # TODO remove this hack once mealie tests work again
         (_: prev: {
           mealie = prev.mealie.overrideAttrs (_: {
             doCheck = false;
@@ -78,6 +80,7 @@         dragonwell.imports = [
           inputs.agenix.nixosModules.default
           inputs.ugit.nixosModules.default
           inputs.git-pr.nixosModules.default
+          inputs.horcrux.nixosModules.default
           inputs.tailproxy.nixosModules.default
           inputs.foundry.nixosModules.foundryvtt
           inputs.forge-lines.nixosModules.default

1
2
3
4

diff --git a/secrets/horcrux.age b/secrets/horcrux.age
new file mode 100644
index 0000000000000000000000000000000000000000..f5682b987c8965ed0b1c196294a2eb51e9101330
Binary files /dev/null and b/secrets/horcrux.age differ

 1
 2
 3
 4
 5
 6
 7
 8
 9
10

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 39ac8fd5916de4e5f12527d92e878720e8f69582..eac658a54716684cfe43ee31693bd19cb8356b34 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -35,4 +35,5 @@   "beszel-jasmine.age".publicKeys = jasmineKeys;
   "beszel-gunpowder.age".publicKeys = gunpowderKeys;
   "mealie.age".publicKeys = dragonwellKeys;
   "pds.age".publicKeys = dragonwellKeys;
+  "horcrux.age".publicKeys = dragonwellKeys;
 }