ugit

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


diff --git a/dragonwell/beszel.nix b/dragonwell/beszel.nix
new file mode 100644
index 0000000000000000000000000000000000000000..f63f49bcfda70d3f91dadb765983abc774d5de29
--- /dev/null
+++ b/dragonwell/beszel.nix
@@ -0,0 +1,9 @@
+{ config, ... }:
+{
+  age.secrets.beszel-dragonwell.file = ../secrets/beszel-dragonwell.age;
+  services.beszel.agent = {
+    enable = true;
+    environment.LOG_LEVEL = "info";
+    environmentFile = config.age.secrets.beszel-dragonwell.path;
+  };
+}

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


diff --git a/dragonwell/default.nix b/dragonwell/default.nix
index d2ce5cdd8083b4028064ad97ba291e4cfb335c1d..090548bbae0299c464f27a16a06c9bffed0f5a34 100644
--- a/dragonwell/default.nix
+++ b/dragonwell/default.nix
@@ -4,6 +4,7 @@   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+uhnfFLhlyfGGsksSxh5IIY6gnIMryeQ2EiM979kZa";
 in
 {
   imports = [
+    ./beszel.nix
     ./caddy.nix
     ./dex.nix
     ./forge-lines.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
37
38
39
40
41
42
43


diff --git a/flake.nix b/flake.nix
index f627d6db890c98e4322f52fb24d816c7e7f09efd..b3dc1cbd66ba4ef57d02e1e921bf9894f95be3f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,12 +56,13 @@         inputs.golink.overlay
       ];
       system = "x86_64-linux";
       pkgs = import inputs.nixpkgs { inherit system; };
+      beszelHub = "${beszel}/nixos/modules/services/monitoring/beszel-hub.nix";
+      beszelAgent = "${beszel}/nixos/modules/services/monitoring/beszel-agent.nix";
     in
     {
       colmena = {
         meta = {
           nixpkgs = import nixpkgs { inherit overlays system; };
-          nodeNixpkgs.shincha = import beszel { inherit overlays system; };
           specialArgs = {
             inherit inputs;
           };
@@ -75,8 +76,13 @@           inputs.foundry.nixosModules.foundryvtt
           inputs.forge-lines.nixosModules.default
           ./modules/miniserve
           ./dragonwell
+          beszelAgent
         ];
-        jasmine.imports = [ ./jasmine ];
+        jasmine.imports = [
+          inputs.agenix.nixosModules.default
+          ./jasmine
+          beszelAgent
+        ];
         gunpowder.imports = [ ./gunpowder ];
         shincha =
           { pkgs, ... }:
@@ -89,6 +95,8 @@               inputs.mazanoke.nixosModules.default
               inputs.tailproxy.nixosModules.default
               ./modules/tclip
               ./shincha
+              beszelHub
+              beszelAgent
             ];
             services.tclip.package = inputs.tclip.packages.${pkgs.system}.tclipd;
           };

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


diff --git a/jasmine/beszel.nix b/jasmine/beszel.nix
new file mode 100644
index 0000000000000000000000000000000000000000..eb7e365c97c24da7d856564f87b6673160addfa8
--- /dev/null
+++ b/jasmine/beszel.nix
@@ -0,0 +1,9 @@
+{ config, ... }:
+{
+  age.secrets.beszel-jasmine.file = ../secrets/beszel-jasmine.age;
+  services.beszel.agent = {
+    enable = true;
+    environment.LOG_LEVEL = "info";
+    environmentFile = config.age.secrets.beszel-jasmine.path;
+  };
+}

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


diff --git a/jasmine/default.nix b/jasmine/default.nix
index c4a0c619db0aeea6771c13e796405d5d3ff1640f..19f1db904da764c8200ca3898988b114dcf0b049 100644
--- a/jasmine/default.nix
+++ b/jasmine/default.nix
@@ -4,8 +4,9 @@   key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM7cgpIUaEY3q12xBct9a0gIl7rdckBBPsWQea7Wtj7P";
 in
 {
   imports = [
+    ./beszel.nix
+    ./homeassistant.nix
     ./hardware.nix
-    ./homeassistant.nix
   ];
 
   boot.loader.grub = {

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


diff --git a/secrets/beszel-dragonwell.age b/secrets/beszel-dragonwell.age
new file mode 100644
index 0000000000000000000000000000000000000000..7706f094e23afe53b7a12d828443cfb91d32cc57
--- /dev/null
+++ b/secrets/beszel-dragonwell.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 E8j6/g FULGDIRTOpsdr5BQRHJBtbarmLmG7u1pyVKuPugvShE
+XaNCPPCHxPtCiquUdlAZczFlJoYvJVEbAOmsifPKg40
+-> ssh-ed25519 f31uNA 9UeFA3rkqduVCRekz9v1uSpx3Q1RmQKm/BbHxIlhumk
+Pp7x9xqH9xCqvaIwjhZkXzt/qlvnunwOeTDwJogkGHs
+--- yQpM58nlvx1oEhG4bHfIMMBBD86qWNOIEVTeGQbs/oc
+�j��?��-�j=�kI\.��e�3���%�u2aBRՑ���U��P�����ΐ�����]�� �'��L!�^�S�j���D���b�wː��q"V~���=�v���ڹ�[�!
\ No newline at end of file

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


diff --git a/secrets/beszel-jasmine.age b/secrets/beszel-jasmine.age
new file mode 100644
index 0000000000000000000000000000000000000000..1b3058823d78136e8eef9cf44f6d76fa08c1008b
--- /dev/null
+++ b/secrets/beszel-jasmine.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 E8j6/g J9D9FM4HXPYZ0RVs4hW8ytuhHGb02nMRJQi6jBRsQnA
+X5wgEJSBvcCHNu/GhPoHl8R+4Jgcfn4Q4jeqAVt03WQ
+-> ssh-ed25519 orwHCg /sOGaTBrn1di6i4G/AUZFQxHMRJ0zTcnv2Y9BrBu2U4
+PoxSDSZh0bA4DLll7uWNpq78tUxSx8UbasjvSbSLfkU
+--- /xIsG75GOF0uoq8rmg/p7TXRC5EtUm8hpJHPYuy8Pcc
+3&���2���;�g��b�4�
7H0<g2���$@U�ң�2F֎��Mr(KJ�I���[��P����x�Xy����)�p�)����pM����zHN5uv��1��m"
\ No newline at end of file

 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/secrets/beszel-shincha.age b/secrets/beszel-shincha.age
index a9fd3650e937a3de4f84b5c16a39d2cb687574d0..59b761c44f1b98308e5bcfc45273281ae2450054 100644
--- a/secrets/beszel-shincha.age
+++ b/secrets/beszel-shincha.age
@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g mL6nO3HCC14lfK/HIdQpkXTfy95roDZLHFLqHnFFISI
-k4DbNNm/D8GUvI92YfpSqBpDob8XGJPHPQOmNuU+xpQ
--> ssh-ed25519 Wq7dJg 3GOsr8uVvvuB/ZiZJfDzWCmW7d6fE6Fb7dLYmWcpYhU
-clehXep3nsywAh6su4zcZXlyd2XLpQsJKWg4JWPwN/Q
---- TGGz5Hqn2KlGPTDSmleteF/D+Mbg22WgxYZoYcnUYDY
-
�o�O�g8�M���|�-NO�VQޓsr\�H����"��2��!n�ݺ������)|�o�hcƈ�����
��m�#��鷣7���E�X��Jy������������6CK�
-M�s
\ No newline at end of file
+-> ssh-ed25519 E8j6/g ELjIQSmsbz0PK7s9RcL4vTaOBbUrpH9EGAXN998n9RY
+JegzXcs//6TJ9tKXDKiP/blc+J0EhWJlXKju/p3bKcU
+-> ssh-ed25519 Wq7dJg aBTNYwpqMV3tf9adr//rnwY0ehXhNd7PICsR6uOagzk
+wwvEAHmBzKL3iqeBJuMDf60vaKvuSdt1cLvTVlG0OMI
+--- haqhC+ktwsqN/M9FvI16J+V5a7aczQVPuQ0Z0ROXJl0
++���㤽���z�X�نC��������K�����z��j�|+�t��$g~���+�[�bݸ�"��+��63�1_D�����2�Zv�����%vޢ�mKw��W�n��y�
\ No newline at end of file

1
2
3


diff --git a/secrets/dex-tailscale.age b/secrets/dex-tailscale.age
index 49110af5e0e9879e20049f5184106f19f1a1b2e9..fd08a0a9c6041197813d276ef962757ba859a45c 100644
Binary files a/secrets/dex-tailscale.age and b/secrets/dex-tailscale.age differ

1
2
3


diff --git a/secrets/dex-tandoor.age b/secrets/dex-tandoor.age
index 5c6d1abf31d0a3b25e3c50be24c31c4631191ada..a225884f01176c109450fa3a327fbef77997c546 100644
Binary files a/secrets/dex-tandoor.age and b/secrets/dex-tandoor.age differ

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


diff --git a/secrets/dex.age b/secrets/dex.age
index f3c6c0d3938a9bec41cbfd0f123baeec312697cd..8fd1fb58fe9223a1f19a8207aa0766ac0395e8ec 100644
--- a/secrets/dex.age
+++ b/secrets/dex.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g 5ad0uNPinL7QAROdRvj0ISYh1L2VpUu0qq5ukXYvLQk
-WPGVSdXlAgKvitdpdxwfGDccMZZBhW3mKRASCDz6Tnw
--> ssh-ed25519 f31uNA HatP45NLfh3G5CP3cz04J+8JfiqPS6AMxJCHKVBhRAA
-XLFEIkjdQoezUnAAtDqK+s412Mc3iSRUeo+9iduK650
---- 6F/LUb4MrV+NBOeTgN8fP4Wvf8lmuIq1FmMd1mwA1YY
-�ub�Y�i�ς-ձ���y"���uD3{G������П��ԭ2S�ٰ��^~��In����|��w��(�rv�Tl��$K�L���_�$J~�i�R��Tv$Tۋ��G3�
���n�hI��Ro٬W ��ܼԕ�Z-��-�nN�����wj|�v$q��v%����O%�ib�Wbǽ�!��4��"�=���]X��-
\ No newline at end of file
+-> ssh-ed25519 E8j6/g FlKwxt0jQldPaUYvtVjgVxMDNdb36kclogKonEwBVww
+Qn9GzexKqtlmfrhvyfvE3uPJyjn2WtM7bMsC2iUpJb0
+-> ssh-ed25519 f31uNA b+0yX8OagjPVGVi8Y85mCu/Qj7kvUqYWfA3nSImuMmQ
+KXnubgxUpL6h25UjzAixmfm59CMvx+vMM3bNMkLxQp8
+--- NQxJ6mSxKAH+ks3btpbDBVmcdT3GuKrCrd6Gi9y8ePw
+t��b�e~4�2-������T��1�������(M��!�o��'`ك�4�v�)�{����pJ��~��>\������s@�O�SY���8�j��o�w�_����ے{����*�9��*�Tf䃽t���l��w�[��@1s}���lq�t���9�d��b�M.����n�_9�i��@��!Z�]�9�SU��)�
\ No newline at end of file

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


diff --git a/secrets/forge-lines.age b/secrets/forge-lines.age
index d5603a1fb681f92564ab513bbc813c5afe56ea8a..8730fca21b7a4978c1f49fd034f15b99f5b8a172 100644
--- a/secrets/forge-lines.age
+++ b/secrets/forge-lines.age
@@ -1,8 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g yJyH71dW64CXsryp8805sFGNK1dTPpENHwIefqJhsCk
-2nwO/+vY46A3PiqSvSlx44TfSLoeoUZEQLEP+q4jnSw
--> ssh-ed25519 f31uNA alNSzssbbr0prlXybNB0+VWHylN8kilnk2HN4z4H8FE
-/92WNBM6LgPiDx5IQePjYX7+nX5yChr0OLhRbNl1LH0
---- 4ZQvj6BHOH1Vc9Cp6a+XV68KrTxTc0YXxvzs9RYHQFE
-ܞ�Ha��9��|�lHlˏ
-U[]���-k��@I>g,&)���/�:j��!�d����6D+d[r�1Ai���]H����M�l9�O��Tx�r� D$��(E
\ No newline at end of file
+-> ssh-ed25519 E8j6/g MOue2FWi5KIuH/YezYHaC2BhTLJyAm++9wcBfiOD21w
+wzLYn3if+zWfDLmtC5x7rc8y0wTHs/ndXA+nIiDPNe0
+-> ssh-ed25519 f31uNA pUzaDSPDHD+G1hxXcEEFdWEr8pL8TnaSSxJWJaTLWiI
+nQhS0G4ZpBPzbFDsNm/73UEyTWtjd+ovhHtM8T9qxXs
+--- HiupunEhBca/FwNXRI3dXpNoSr/UtsIkCiHYvUi0Z5o
+�I������"��5�R`q��4��c5�/���'$�_�z�?y���3�����NĬĐ���wO��<�?
+�5~P�Jaѓv�w����$��Z.(�������r�
\ No newline at end of file

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


diff --git a/secrets/pocket-id.age b/secrets/pocket-id.age
index f32f177edc12bbff91da1c7d9964f5c67f21bdfd..5dfffbb6bef72851892640e8884a312cc344f828 100644
--- a/secrets/pocket-id.age
+++ b/secrets/pocket-id.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g 4hVdi54c1QFl1Qb7MVV68Xx8+EOuYmt9jCTelQOnt0o
-yy7mmmZn0qVEIDkvPbFvndZXgdPqtzSMakziq82VBT4
--> ssh-ed25519 f31uNA WIzUjqVsgu5NImCBumryJdaq+cTDEmFQaI68TDhZ6XM
-D6OmWBg/GZPQNYu6jXo8w9nmNGs5V05bcROkN4wArx8
---- 51EV6tl8R8DTaOlLVRzHutB3IjVhpaXit+QMtZLRzds
-��arB����HKĠe�����L�n�'��7y�׮J�@�Q8|�6P2M�ȕ���g~�����pw^��U���9'��LD�D˫������8�
\ No newline at end of file
+-> ssh-ed25519 E8j6/g W8IBejPJVKQE0AwIZR0rviKrJGsslFuGRgyRcfbKtys
+tFh0jbbUgNB7bBbV9bzhg9eJdmgzXOZSrcjEdXGAXjI
+-> ssh-ed25519 f31uNA fX6qgzOgUFO7P+TLKrYwoOsOIgN+JhrMufbSfAhYwTY
+MbDLpgFF2kHPLZOCcB6byU6hw2dv9A60DlY1naTr3Pw
+--- ru0OmVSJEgh4FK3zkDmmAvxeWx7CIQ7iu1ym4zCe85E
+wZzu��Su�Xd/���Ȼ4��6-zU>1&��� h:4d��rn|TO �H�0�T\�֞��A�����u�E'k��Hsg�oL��@v/�t&s|�
\ No newline at end of file

1
2
3


diff --git a/secrets/restic-env.age b/secrets/restic-env.age
index 85478399521b8cedc716f7ca1be4ee07d5c1ea08..87a10f7fd00877ecccd4adb80158ee8c942c00ab 100644
Binary files a/secrets/restic-env.age and b/secrets/restic-env.age differ

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


diff --git a/secrets/restic-pass.age b/secrets/restic-pass.age
index 9ebb93a62c6503f821b5e72e1b2f765016321b6b..21a8378a9894e93d41126d610c00a03ccddb5a1f 100644
--- a/secrets/restic-pass.age
+++ b/secrets/restic-pass.age
@@ -1,7 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 E8j6/g Xme/jcIO50c315grJlMhHAn10vqtLDtKBuF4GIvJGhg
-AJwz1H+bLKtjZcEfWkwwnUx+iIQdR6ssXQkFNSvV1lg
--> ssh-ed25519 f31uNA zyeVLuWDAMrcDDWAu6eIeNY0IjL8MWmlQrKQG3+nkGU
-ZiQM/n1uN6QlJl5R+aNiwYfeHcztCjtxkun+HIDS38Y
---- Hn5sQs1h7zrYGV8XbHDxYU072n9HVKSdeZob6hR4E5M
-���B¾Н��@�U�Q�V�&�*ؓg��M�/��5�p��	_Bt��|
\ No newline at end of file
+-> ssh-ed25519 E8j6/g 21X4ZbbN1FeIU7uP+kPeZ4X60S88wbIWjJ14TUAk83s
+nrbTqIKD/7O2nomfAk3CpyWbuq3/E9XGkUIIVlnDVMI
+-> ssh-ed25519 f31uNA XVLq4GIYQkaIJvnq2df+UFvZbD11liqEEGozgOaaNAo
+FTZo7x0m0XfqFQXKWTc4MYnjEYkRTKNkMi8212yAqvk
+--- ocF8qKvsF8zoXQWUNhE3UXu8lMGZcgbLyEchdXRQUUw
+�/����1iq?^�s��uV�M7_��6x`�=��lA�>����(�0�
\ No newline at end of file

1
2
3


diff --git a/secrets/restic-repo.age b/secrets/restic-repo.age
index c60546327ce56056628c75716f36e3b77177a872..756ef95a5d2944e4f3c2314b7f32e5af3198f61e 100644
Binary files a/secrets/restic-repo.age and b/secrets/restic-repo.age differ

 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


diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 96a650479fbb6cd01b13d6bf478ead783d98a0db..b3e6d818bd78c001e8142d9891f3bddf229627ba 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -2,6 +2,7 @@ let
   jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS";
   dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53";
   shincha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBikiSP5UIoHgjZejxSt/ce2FxnYk9VGDW+h12QvefJ3";
+  jasmine = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE4koC93ixwkFzMK+kYLk2A6+xn6xprzkk49k+avRZkn";
 
   dragonwellKeys = [
     jolheiser
@@ -11,6 +12,11 @@   shinchaKeys = [
     jolheiser
     shincha
   ];
+  jasmineKeys = [
+    jolheiser
+    jasmine
+  ];
+
 in
 {
   "restic-env.age".publicKeys = dragonwellKeys;
@@ -22,4 +28,6 @@   "dex-tandoor.age".publicKeys = dragonwellKeys;
   "forge-lines.age".publicKeys = dragonwellKeys;
   "pocket-id.age".publicKeys = dragonwellKeys;
   "beszel-shincha.age".publicKeys = shinchaKeys;
+  "beszel-dragonwell.age".publicKeys = dragonwellKeys;
+  "beszel-jasmine.age".publicKeys = jasmineKeys;
 }

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


diff --git a/shincha/cfg.nix b/shincha/cfg.nix
index 9e87a2de2abf80a251a0dc373da6643335dd1c26..3f2ef70e0d880571df46bcbaeb7a1ee608a936b0 100644
--- a/shincha/cfg.nix
+++ b/shincha/cfg.nix
@@ -2,6 +2,6 @@ {
   services.cfg-playground = {
     enable = true;
     verbose = true;
-    auth-key = "tskey-auth-ksTZtpeU1i11CNTRL-HmmWuAFifG3xxy8UDr1yG3UdjiYJ3mtGe"; # One-time key
+    auth-key = "tskey-auth-kvTmESR4X411CNTRL-rxnWk7pBz9b58GKBStYHAb1gFuk9r1VTA"; # One-time key
   };
 }

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


diff --git a/shincha/golink.nix b/shincha/golink.nix
index 9e65524a795e059659db3b5e229f266a533b2a86..887a64d14787a93a00bdd342e2c74355a045ae4b 100644
--- a/shincha/golink.nix
+++ b/shincha/golink.nix
@@ -2,6 +2,6 @@ { pkgs, ... }:
 {
   services.golink = {
     enable = true;
-    tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-kGaKxz5CNTRL-nvyRLm7J38B37QZ2gCDM8BqtwyC6zJUh7"; # One-time key
+    tailscaleAuthKeyFile = pkgs.writeText "tskey" "tskey-auth-k7Tfyvczdn11CNTRL-tE6VsLtnqEaTzfugS2XYEaEEaVQPxUsbf"; # One-time key
   };
 }

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


diff --git a/shincha/tclip.nix b/shincha/tclip.nix
index db4dcd802fb6603260966715df18c83518968242..3c202edf97dceba83f4e0085bc3ac8dadeb65ece 100644
--- a/shincha/tclip.nix
+++ b/shincha/tclip.nix
@@ -4,6 +4,6 @@     enable = true;
     hostname = "paste";
     useFunnel = true;
     hideFunnelUsers = true;
-    authKey = "tskey-auth-k1VerP4gam11CNTRL-89rpeDcfTdJqkF9AECWmdJLVgo1jQcSAB"; # One-time key
+    authKey = "tskey-auth-kK1ktiQ5K921CNTRL-8pC8dxF15xMdZPtidGCmwMXQui6dosp1"; # One-time key
   };
 }

Home