Home

infra @main - refs - log -
-
https://git.jolheiser.com/infra.git
dragonwell flake
tree log patch
add forge-lines Signed-off-by: jolheiser <git@jolheiser.com>
Signature
-----BEGIN SSH SIGNATURE----- U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgBTEvCQk6VqUAdN2RuH6bj1dNkY oOpbPWj+jw4ua1B1cAAAADZ2l0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5 AAAAQDdGEox3SIvTAHS7hC08oz0CZ3nPVwNtX56H6clsqHHJ20cwU5/uJYAAge8hjmPx1u aJASEHXg+m9uv7xf6jrQ8= -----END SSH SIGNATURE-----
jolheiser <git@jolheiser.com>
2 months ago
6 changed files, 175 additions(+), 37 deletions(-)
dragonwell/default.nixdragonwell/forge-lines.nixflake.lockflake.nixsecrets/forge-lines.agesecrets/secrets.nix
M dragonwell/default.nixdragonwell/default.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
diff --git a/dragonwell/default.nix b/dragonwell/default.nix
index ad2682dc07f7e9cd32b0d2e99ab4b0012ad11bd8..96988c5e22f2b4349bdeb6531aa582727824620d 100644
--- a/dragonwell/default.nix
+++ b/dragonwell/default.nix
@@ -8,6 +8,7 @@     # ./actual.nix
     ./caddy.nix
     ./cfg.nix
     ./dex.nix
+    ./forge-lines.nix
     ./foundry.nix
     ./git-pr.nix
     ./golink.nix
I dragonwell/forge-lines.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
diff --git a/dragonwell/forge-lines.nix b/dragonwell/forge-lines.nix
new file mode 100644
index 0000000000000000000000000000000000000000..aa5ebf93e4bef7a8844645342648671b83ecc6d4
--- /dev/null
+++ b/dragonwell/forge-lines.nix
@@ -0,0 +1,10 @@
+{ config, ... }:
+{
+  age.secrets = {
+    forge-lines.file = ../secrets/forge-lines.age;
+  };
+  services.forge-lines = {
+    enable = true;
+    discordTokenFile = config.age.secrets.forge-lines.path;
+  };
+}
M flake.lockflake.lock
  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
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
diff --git a/flake.lock b/flake.lock
index 4ec396d498b4d7078673bfea8e7a580dc92515ea..8122b577f11e313f72b58ca8f3277fad353e9562 100644
--- a/flake.lock
+++ b/flake.lock
@@ -77,6 +77,24 @@         "type": "git",
         "url": "https://git.jolheiser.com/cfg-playground.git"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib"
+      },
+      "locked": {
+        "lastModified": 1741352980,
+        "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -149,11 +167,31 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "foundry": {
+    "forge-lines": {
       "inputs": {
+        "flake-parts": "flake-parts",
+        "git-hooks": "git-hooks",
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
+        "lastModified": 1744397145,
+        "narHash": "sha256-z0lNSzTSZ/4FY2hT69BiPJXrgXasQ0z7V9k33wCURUQ=",
+        "ref": "refs/heads/main",
+        "rev": "09d9ac8c345fd6b65c964c8aa1963fd9fa47f066",
+        "revCount": 12,
+        "type": "git",
+        "url": "https://code.winston.sh/winston/forge-lines.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://code.winston.sh/winston/forge-lines.git"
+      }
+    },
+    "foundry": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5"
+      },
+      "locked": {
         "lastModified": 1726638033,
         "narHash": "sha256-+hcgXKG5t/9wibv+8T9WASWItBAWb0tsmcZXH+VIYdw=",
         "owner": "reckenrode",
@@ -170,7 +208,7 @@     },
     "git-age": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1699932777,
@@ -186,9 +224,34 @@         "type": "git",
         "url": "https://git.jolheiser.com/git-age.git"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "forge-lines"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "forge-lines",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1742649964,
+        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "git-pr": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1742931784,
@@ -204,10 +267,32 @@         "type": "git",
         "url": "https://git.jolheiser.com/git-pr-nix.git"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "forge-lines",
+          "git-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "golink": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_8"
       },
       "locked": {
         "lastModified": 1733941744,
@@ -225,7 +310,7 @@       }
     },
     "home-manager": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
         "lastModified": 1734344598,
@@ -242,7 +327,7 @@       }
     },
     "jolheiser": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1730336541,
@@ -288,8 +373,39 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1740877520,
+        "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs_10": {
       "locked": {
+        "lastModified": 1729880355,
+        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
+      "locked": {
         "lastModified": 1736798957,
         "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "nixos",
@@ -304,7 +420,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_11": {
+    "nixpkgs_12": {
       "locked": {
         "lastModified": 1741481966,
         "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=",
@@ -319,7 +435,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_12": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1741379970,
         "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@@ -335,7 +451,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_13": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1728888510,
         "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
@@ -350,7 +466,7 @@         "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_15": {
       "locked": {
         "lastModified": 1736241350,
         "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
@@ -366,7 +482,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_16": {
       "locked": {
         "lastModified": 1741481966,
         "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=",
@@ -414,6 +530,22 @@       }
     },
     "nixpkgs_4": {
       "locked": {
+        "lastModified": 1743095683,
+        "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
         "lastModified": 1726447378,
         "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
         "owner": "nixos",
@@ -428,7 +560,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1741481966,
         "narHash": "sha256-MrMsXesCo5Y79F5qjlybADozu60Zk91jVBi+FnoEiJU=",
@@ -443,7 +575,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1742800061,
         "narHash": "sha256-oDJGK1UMArK52vcW9S5S2apeec4rbfNELgc50LqiPNs=",
@@ -459,7 +591,7 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1741310760,
         "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
@@ -474,7 +606,7 @@         "ref": "nixpkgs-unstable",
         "type": "indirect"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1734119587,
         "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
@@ -490,26 +622,10 @@         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "resume": {
       "inputs": {
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_11"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1697473034,
@@ -531,6 +647,7 @@         "agenix": "agenix",
         "bennet": "bennet",
         "blog": "blog",
         "cfg-playground": "cfg-playground",
+        "forge-lines": "forge-lines",
         "foundry": "foundry",
         "git-age": "git-age",
         "git-pr": "git-pr",
@@ -538,7 +655,7 @@         "golink": "golink",
         "home-manager": "home-manager",
         "jolheiser": "jolheiser",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_11",
         "resume": "resume",
         "tailproxy": "tailproxy",
         "tclip": "tclip",
@@ -638,7 +755,7 @@       }
     },
     "tailproxy": {
       "inputs": {
-        "nixpkgs": "nixpkgs_12"
+        "nixpkgs": "nixpkgs_13"
       },
       "locked": {
         "lastModified": 1729968274,
@@ -740,7 +857,7 @@       }
     },
     "tclip": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13",
+        "nixpkgs": "nixpkgs_14",
         "utils": "utils"
       },
       "locked": {
@@ -759,7 +876,7 @@       }
     },
     "ugit": {
       "inputs": {
-        "nixpkgs": "nixpkgs_14",
+        "nixpkgs": "nixpkgs_15",
         "tailwind-ctp": "tailwind-ctp",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp"
       },
@@ -798,7 +915,7 @@     },
     "website": {
       "inputs": {
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_16",
         "tailwind-ctp": "tailwind-ctp_2",
         "tailwind-ctp-lsp": "tailwind-ctp-lsp_2"
       },
M flake.nixflake.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
diff --git a/flake.nix b/flake.nix
index f358dbc8633bbc218909adf409c121e59aac616e..3f6efb44ec9e92f7d8a1c7fc6f9ab293200fa9a7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,6 +25,7 @@     golink.url = "github:tailscale/golink";
     tclip.url = "github:tailscale-dev/tclip";
     foundry.url = "github:reckenrode/nix-foundryvtt";
     tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git";
+    forge-lines.url = "git+https://code.winston.sh/winston/forge-lines.git";
   };
 
   outputs =
@@ -72,6 +73,7 @@               inputs.git-pr.nixosModules.default
               inputs.tailproxy.nixosModules.default
               inputs.foundry.nixosModules.foundryvtt
               inputs.cfg-playground.nixosModules.default
+              inputs.forge-lines.nixosModules.default
               ./modules/tclip
               ./modules/miniserve
               ./dragonwell
I secrets/forge-lines.age
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
diff --git a/secrets/forge-lines.age b/secrets/forge-lines.age
new file mode 100644
index 0000000000000000000000000000000000000000..b0e878b4302b7193a26ab71ef9cabc4b518bd266
--- /dev/null
+++ b/secrets/forge-lines.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 E8j6/g z8hVrv3gzEzMDN4oAmowfJTqrfZ8uuf2Ubvj6qPRAUc
+bCro6AhefbThDPrKqIDres2F3ZjOgjmK0pW46sNHTTA
+-> ssh-ed25519 f31uNA hKyGGOikE6vNU0fFA5W6RHTYrME4L3meXZMn4zT7KC8
+XQaAPKvpxhVjZ34B4Eoua1rSn0NR78T1wNHXDq66fiM
+--- C5jQ3eF/V8p0hXOKb0GvYkd/3caKl6nM/ezzlLiPoCY
+N9�-Op>!MC��6#gR�<~;�u6Xr(�������1��n����Й�ؙ�wJ�*ٲw�JB<�p����j�J�%{�a����i���r�w����V
\ No newline at end of file
M secrets/secrets.nixsecrets/secrets.nix
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index c73a8e6e50614096ff5e1c3325d25ddfabf9fa6b..62984963241bff3f06ee63123d0fb2e15d637954 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -15,4 +15,5 @@   "dex.age".publicKeys = keys;
   "dex-tailscale.age".publicKeys = keys;
   "dex-vikunja.age".publicKeys = keys;
   "dex-tandoor.age".publicKeys = keys;
+  "forge-lines.age".publicKeys = keys;
 }