ctucx.git: nixfiles

secrets: fix syncthing keys on blechkasten

diff --git a/configurations/darwin/syncthing.nix b/configurations/darwin/syncthing.nix
@@ -4,7 +4,7 @@ let
   syncthingConfig = import ../common/syncthing-config.nix { inherit inputs pkgs config lib; };
 
 in {
-
+  age.identityPaths = [ "/Users/leah/.ssh/id_ed25519" ];
   age.secrets = {
     syncthing-key = {
       file  = ../../secrets + "/${config.networking.hostName}/syncthing/key.age";

@@ -23,8 +23,8 @@ in {
       user    = "leah";
       group   = "staff";
 
-      key     = lib.mkDefault config.age.secrets.syncthing-key.path;
-      cert    = lib.mkDefault config.age.secrets.syncthing-cert.path;
+      key     = config.age.secrets.syncthing-key.path;
+      cert    = config.age.secrets.syncthing-cert.path;
 
       dataDir = "/Users/leah";
       devices = syncthingConfig.devices;

diff --git a/secrets/blechkasten/syncthing/cert.age b/secrets/blechkasten/syncthing/cert.age
@@ -1,27 +1,29 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6MHVUN1NJM2hXSGxJNkNG
-d2RPOStZRG9qZVJndWdNVlAvcExaKzAyT2g4CmgwNDlpcnlBNVlpWmFkNVVCd0JD
-UDhHSlYxd0tzcERiWGR2c3I1eUN2a1UKLT4gc3NoLWVkMjU1MTkgOUllMkZBIEpC
-ZURLcGd1RGw2MCtuakQ0MUhVVldqem5IeTdydVBxSVF6OXc2VjQ5MkkKcHpnbitx
-emJVUGtpL09tN0NQcjFKUVhDQU5Qbi8vb2FWQXNmYjRtMVhrbwotPiA+OVtgQC1n
-cmVhc2UgVEYmaCpGPmUgc20gU1Z7MHUKYXlGQWYwV0lvMkY2U2tQa21tb3FaMWEx
-Z1gxMnBqNERXQXN1c0g0emJKc2NWZjhYdGcKLS0tIEFTNmVYcjM4aHk0VE9QMzM4
-cys3NTFnd1ZHa3k0bmJ0RGFYdGRJM1hSeVUK3epwnlbj1cksQ9MygxRdclYhygO2
-Z+GBZgcJt9tH2vZ1PS+eL6SyyY2fTg9KGBxbx5NhOSWF4YckuH/EYWLXDq2TsN/F
-Bp3NKOZTgegY14DdpfSrhcH5zw5QH4DcUSL/CO3TUumzwDqHty92lvh16oR+Iv0K
-XTR515daZ8GTwclPHjmZwmNM/bkOXqnU3ye2TNnUSTFkDNyTauxcoqvMH4hmRtnD
-svjn5B9dR3ya3AbiVblo8rkOOYzudHFS1zUZLrJhnEzmMICGjAWoJbKWEidqmMlW
-fTnoxF+pX2ERcQVsSw5jGcxN3n8SxAu2fKsPwJsHT4LnRngMJdiDL125D8/VhVuy
-bd4Zf7XOU1Uui0a6AuWHIcZxU8haqf3/ICqJNozxNvObTOJXn0Wt6tRxRf97Za33
-itGAsMGtXwe4st+TYYMxuLxP2zrn13v3qfmu0qEg+jklNRJN8DYkHkHaQVGA5+t/
-yTtLzWnZYExtK0Osoy5k+rg6thloJj2IxInB42bW7yoogz76n95+8KpzuYfSxcAC
-Ilev06v+ANLVIAEIre9SqY8h9lM6bFZRhDO/WD5Bss1cvouh2LIHSszgcXQ9iWem
-iPlsniLYcsu8uAqZMa/tT67FD06HjB2Y2Vmqr0MfOijGg7koihLhaDlzjGOKkBNc
-NUdUc9AofLGukT4djj5IRujYDlgzaIgC55JX3wXTqlVbfUsgCTy5ntls5FgUGM0r
-1r6uLS6O1zEyaR7cGjN4Ixf6RT/Vgm/BSjljqsK+nFjvGeIiYBIsaRNJZR6YCDqr
-6p0zjKI9hXaJJmEcm8775ZcgKetGqPuNT4Py/DZZzI4+x4pTN8Kf4d5X32tGaSfG
-uZpQrN6eSNDK+WBWF5EO3UywO7h8Jaj9o5nUEw+wd9TajADWynHYi4hjdmjT0dD9
-E6fjmVVcPCK/ujiLcjw+ZsfXCRTGJ8xJ1E3acv19VuBvF3Rz2oJJxniLQrKNvl5D
-hDIxf7Ya3M8Mfkzvknm6ZxLjS5LstHNnAic+YhsrI6kIgSvFrm5jdyfxuBtLU3dN
-MUkpqLDBdKHJunx9fM3DO5qAVGg7UkBPIEzORKZuSDo=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvUzNTNGVENllsQzZML2hG
+WUlMalRZT2RiMUxTSUpWNFk2cnRHUDNPaWhZClczbmpaYzVLUlJBV1kwSEJXK0hJ
+cWttamdYOFJXVjdLZTJDaXYvREI2ZWsKLT4gc3NoLWVkMjU1MTkgYjRHbkxnIDdw
+djlPVHl5Q3kxamtqYW1aMGhRWjU5QW5iYm8vbEFydXJRcjduemxDbmMKWGtSM0Vm
+aEhkM0Z1WHB5elpSOGlyUmxHaWw1VUQ1bW5KYnE0OGRHOE53VQotPiB6dXxmci1n
+cmVhc2UgWlMmQ3QvIDZ0ND9lICsKNkgyLzBaNDVodjgxUTFqR0VNcmxscGJxeDBu
+NVNmZG1rU3hGMkNiYW9wSEQxOFY0b0ZEZHRxRXp5bkRxVDVuZApQK2pKeUZna1F3
+U2I1SkNwQWZOeC8xWlFtUkVoTHU4RmVQR0ltdlZqSXB1Ym9DRkFhZVh0a3FncQot
+LS0gaXhudy9KRjYvN0h2a0IybHEyV2tPa2JOSlR2SEtBVkFiYXZzNmpJeFVCdwrW
+GTDgZN7ck5PQ7UChJH9t/yr4Dxnl9y4RvQqlSH20BUxtYlHNReGkZf75hR7FoORX
+Y5RHsnKWh7XlDcyOnhJ1DjvEK3+c2vDP8YH2evdy6nV9sIbAEFj92+S/tOd4rByg
+LQ695KZUVfaHCzbYuoDjo6yI75Ml4Tvq9yt7670S2Fa+UH6ckNgEPr7RiLSfuCCW
+upNY+8745ojMnI9Af48tAeT+mSZPVmvcqJ5mtQ5HQuJbT0zP1V2eY6wOyZsN5WIJ
+JjiS3D9PZq6n9jeuAdju5rEZjX+eDa6LRcQ2Lep4IkfzOqMoquhutrGuMzkR7o7B
+Mw5bc8H9HW+b6pt63N0WG30e2A3GKFIzEcd+fG2x3VGsiFv7u3MjKdHKI4akQr8a
+0MmmjiPlLg0CKmCUwyj3Z2Tz0UmPBxX8vVXT1HQMTyWYTf4ory2rKOuW/LDcXzuG
+x3E3rXkF2FCQaypy8+M7jHpRYYX4/5rXHHKhu5IycYi5233lEG5cEeUltQWdSuwZ
++2frhymPwy3/rW46IkHv5Mssugx3WtdwO27cXJZdTXgUsMiZU0Jm2RjWK3r6bqqm
+Sd8LUbMQ9LNLjFCqwBCUPOVcR+vVTH30n59qmgZPESI0PRaIIKSu70igq3lXQdHF
+9e+8q1mx4CVELcKmcRiABGjGjrC3Pao4mMi7UDGCiUAk8r4cHcD6u+N6z994wr35
+I+4MVovtMs0Vr63tuXvVBhv6w+hUHYz/q8qOv7EbEnSd63Gr+AMwaB9U5rXyjUyg
+t3E7cViburwpTbgFcXvu4ilvjNLHH3uKKqmFTzBHiGlvmtMo4L6RPe6PxG+BuaLX
+8cBWsOppgee0U9ix0vsTxLSXUf+4UPA4crR0Fzp8xVeZtclPU1zXrbk+YIVxR+F0
+sFzrYBoUSU7jL3D1IhpCbbmkBY3Man8l+8azZMjBnjXyUe8EnkV+QtRXktLX2Owr
+J0zJw+ohg0HQrlPAOLoltb4m84o/a0mT8wtmndlGFISTcU+Wlk7c8hZ9MT1nfqma
+GLYyplS3GUzwG623QmoFE7ooMzcrkrNFYBsb46TAmBn65euFSeP++BPO/q6CJav6
+c3WLGQ==
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/blechkasten/syncthing/key.age b/secrets/blechkasten/syncthing/key.age
@@ -1,17 +1,17 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBYRytkTmVaY0RqNWVBMlRO
-TkVyWjRPem1Gb3JLMnVqVmp6clU5RS9uZWxrCjQ1WFQwSFdjUWhYM2VrcEVld0VD
-ZGRPV2FoMkMzc0Y5YkdWTk9lWUtuUTgKLT4gc3NoLWVkMjU1MTkgOUllMkZBIG5D
-andKTzFjVC81QllYVExJdnAxY0dJRUpCVS9ETkE5cXd0R0Y0K1B4a0UKejhQdTJN
-ZjlSMWpESzZvT01jWlNSaHZMb3c2OHVvR2V6ZEFHV3RoOUZ1UQotPiBpQTk7LWdy
-ZWFzZSBbcD4gNlA+WDhWNyB2XFtLU0EgVGRaCjhVQkJmdEFpKzNTTTZqTG5JbHd4
-ZXZzSXVZOUVHZlBMQXlrdFQ2YWUvTDZPd1hkZEtYOVA2THRBYkVrQXRPT2oKVkE2
-R0tWQldJNHI4MGcKLS0tIEQzcU1aSXhaSGQxbDFuUTd3SktsVXlXTnVjMmZJUS9B
-MDlpcVJtK21PalEKaCNRBcjobi8vBi5guFPOgw74UbM+yO8gN3OAm1uiNLutqM7P
-WSVzPMGf75g4Z6U0fx/v74k9AwAJwTdCNzSnqNGV4kndu+r//x4VAFrfs7F5KOXt
-vp4R7/Tt5vLgWg35z4G1TFK5ZwY7dQWq3hhWp/Rr8wAM/IihtgdHS+POv8qLZSsR
-AaksWnbdTX31amH/jl1QhMRo7QLZmOnZsqns/AErQa9fEVNvrRo+Rk6d5E9/jEcG
-Ny/nRdX4U/Su7wMVwBtHAmoDcpWn6fQYeZKnVODGVvfv9u6ulDlBrbcIQ2fnwpvj
-1dE8chSxr9/hwy0fgwqITCyRKW7JS8xuqYrx/3XGSI1Gmn4IAzXuvPRJVoo/GhCC
-Du98DDDnuN4dhOd5reMujZKR/xJKTafYfhXZyTuXoyS4ttr0AJcWzuGEkw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBmQm4vekEyanlKanB1Yk5k
+TE53ZVNmUzVZakVMZ2svSXVpbWdVeVlqWjA4CnFpL0VkY1VwdFhrUytzS1U1MHF4
+b0JLRFZ1UUVjTjQxMUQ3Q0FjbFVpdzQKLT4gc3NoLWVkMjU1MTkgYjRHbkxnIGkw
+eGtmWTY2emxySWRYWUgvRVJ6Wmt6NTdDNDAvai9YN1VDQTEyWXcvRTAKMnZtYjFo
+ZlJLTU9vL2twRlJCRHlhSy9EWFR3cDFCSnhJTDBkZFRXc2ZDSQotPiBfcWQ9VC1n
+cmVhc2Ugb2ZUWworalcyRUNCZWs0TXJnQTlrN21rd3NNclRoRjY2ZG03cnFFa0sv
+dDVCdHlaaUNuQ0UwZnRaTzA2aUk1a1NWeWFoCldIWWNoMjFlR1NnTwotLS0gUWhO
+RCticUtyb3oxcWM3OUYrMGJPRVhPNG9YcWpiOHgzd2JlZ1NtZGFsTQp3VXWAKhcQ
+tf9Rske4qk7cIsTv6LMJSlz7Co0/URtII+Bo4204Pbb7Q/2RIAZW5OEQwItx0ooK
+Yt4X2G4sUzxU26Bda3zmeT2Gf6RkcDaKVuH3irMUTd2U3de8eOd26Cx1UTh9yK8U
+M0fEYyHx5QBr/cPfd5OFiB+7SS5Z2PTzJuOnDaII/seb+JBtkCnlXlz8KZ/3JyOx
+Nlg0qBDRUhgoeEmZhpFA+Jh+x97dvbRP5YpManyPwAf+1y1tB7xSKnETIR+QVjfq
+GZ2b436R0aDVBqytl1kgyHc5+l8MzAQuYlRD4Y2QhytqLk/ZYRROLCIhfOMJyR/U
+REj2+AqizAPEwBvPotRsdtbsqjUfxbofT+x8iDZxOBkBWMq+WXIK1tWrp7T54uhN
+6kJY/IHqJaczX9nUz6nSkrrJ++YhLbTj
 -----END AGE ENCRYPTED FILE-----

diff --git a/secrets/secrets.nix b/secrets/secrets.nix
@@ -1,7 +1,7 @@
 let
   leah           = "age1mn57hntgx775kwcwx4jrrd7rfl7z4wl54kqtgq8w2kzg7agz7alsv5eesw";
 
-  blechkasten    = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZLQ6jDcRGjUy7eyDHF0WHDquxGb6aP93d9w8trEZZE";
+  blechkasten    = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGAzmzKJ7NTEpe6IAm1KK7vnQG4ASEHHGdEyxbYEdSDJ";
   coladose       = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP2ky7icnZOUMDtBPwVoq5icGFAzf1C5nfNhoqZEins7";
 
   #servers