diff --git a/common/_containers/forgejo.nix b/common/_containers/forgejo.nix
index 795c320..8ca1b3c 100644
--- a/common/_containers/forgejo.nix
+++ b/common/_containers/forgejo.nix
@@ -11,6 +11,7 @@ let
   containerAddress = "10.0.0.2";
   hostAddress6 = "fc00::1";
   containerAddress6 = "fc00::2";
+  hostBridge = "br0";
 
   binds = [
     # Postgres data, must use postgres user in container and host
@@ -150,12 +151,12 @@ in
             };
             server = {
               PROTOCOL = "http";
-              DOMAIN = "git.joshuabell.xyz";
+              # DOMAIN = "git.joshuabell.xyz";
               HTTP_ADDR = "0.0.0.0";
               HTTP_PORT = 3000;
 
               START_SSH_SERVER = true;
-              SSH_DOMAIN = "git.joshuabell.xyz";
+              # SSH_DOMAIN = "git.joshuabell.xyz";
               SSH_LISTEN_HOST = "0.0.0.0";
               SSH_LISTEN_PORT = 3032; # actual listen port
               SSH_PORT = 3032; # used in UI
diff --git a/common/_home_manager/mods/ssh.nix b/common/_home_manager/mods/ssh.nix
index 04e71eb..a434df6 100644
--- a/common/_home_manager/mods/ssh.nix
+++ b/common/_home_manager/mods/ssh.nix
@@ -18,11 +18,11 @@ in
       "bitbucket.org" = {
         identityFile = age.secrets.nix2bitbucket.path;
       };
-      # "git.joshuabell.xyz" = {
-      #   identityFile = age.secrets.nix2gitjosh.path;
-      #   user = "git";
-      # };
       "git.joshuabell.xyz" = {
+        identityFile = age.secrets.nix2gitjosh.path;
+        user = "git";
+      };
+      "[fc00::2]:3032" = {
         identityFile = age.secrets.nix2gitforgejo.path;
         user = "forgejo";
       };
diff --git a/common/general/default.nix b/common/general/default.nix
index 69bab68..3e4548a 100644
--- a/common/general/default.nix
+++ b/common/general/default.nix
@@ -131,7 +131,7 @@ in
     # nix helper
     programs.nh = {
       enable = true;
-      # clean.enable = true; # TODO revist does this solve my re-building issues?
+      clean.enable = true;
       clean.extraArgs = "--keep 10";
       # `flake` path is set in users/default.nix for the primary user if set
     };
diff --git a/common/secrets/secrets/github_read_token.age b/common/secrets/secrets/github_read_token.age
index 5f10553..16ddfed 100644
--- a/common/secrets/secrets/github_read_token.age
+++ b/common/secrets/secrets/github_read_token.age
@@ -1,38 +1,35 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBwN0dn
-RTlTdDd1ODZlcm5VUzdlTXRSdmZRdUdYM1B1b0hsUTJDUHUwZ0RFCkI3dnhINEZs
-Uko5bTB3K0h1R0FILzZWNjltbUpBL09EdFZUYXdlalB2dFkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFNGaWlyaCtLTzNTd1VnS2tjbGhiRVhDTkVaZ0dUdzBia2krbzBQ
-bjkxZ0EKbjdBY2VoY3R1dFpuU2NFVnJrNktpMUJlalZuQVRLSWE4UjVwYUhqZHB1
-UQotPiBzc2gtZWQyNTUxOSBTcENqQlEgZ1B3TWpaYnJkOWUvYS9wTTA4L2M1V0hF
-SFJDNzJqeEY3bnlTRStsWm5RMAo0bkZKVjB4QXVMTmVSZHduWHNISEVyTnVDb3BZ
-KzB4bFFxZnMxYlJhdjZrCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBueFhqOExVTTlQ
-NytTWHNrSXdyMHBHSUhTejZyQi9VRkh5ZWhJcDE2S2l3CmtHeWx4NEhCdWdRUDFQ
-Z3gydUdSTzJUVDJHUnQ0Tk8xYi9tR1p2dUhub28KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGN6Qm1QWTlXOVJ4MThhR2MwUStmM1FRRmw1M0hUN2RBcXMxSXRHSlVieFkK
-ejgzRFZtSm5ZaEZTdXhhUVN2S29Ca0pkNmMrL2RaY0R6T2kzQUFwbXlFOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgVURubGlzcndMNU55Y2lwbWYvTXpCTVVjdk9ZeE1Y
-YWt1MHlXQmtnakduUQp6NVE5UmtmcytPUzZZeUN3bnJlRjZKYVY1VWtDazRNMHVH
-WFhFK0x6T3JVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB6aHhHbGJUcmlEV2lPd2hn
-QmtIYVpScW1yWmVmb05CbzNXclludCt3c2pjCkxZRnlkdmQ4NldsclJUZWk4RGM3
-QVRQTGZ2RDlJNE9Qd3gvL2tOc3hqbkUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEEx
-R0UzdEFoYkh1aEFQUGZ3djI1WDFrRzFXRHpPcG1qeXQ5cWQxdDJ5SGMKZlVXREda
-V1EyT3VLaHFxN0hYbEZkaEgrTXVvejNZY3JpOTBkZ0tsMERqYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgT05LSVBaOCt5SVVXa1NMTTU0NWRhVjdkcWNlVXhOTEtWYkx2
-WUUzNCtWcwpWbUlpK0Z5OUQ5Sks5NUl3L2Nwd2Z3a0pYM3BpV3FYR05yTmFjckRh
-Rm9RCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA0V1Z4enc3azZ3S1Rlb01zMGJkQ3FC
-cGRPWmRocmxOUkNzZTR2WTFnb2tzCk12WHI2SXN4T1MrRDNXQmtJeW9yT0o3elJ6
-U0tNSEt0VjVPNmdrVVNhREkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE9VVXVqMkFp
-QnprZ0NWNHF2QTMzK1BKVzZGQVN5MXEyTDNWVWM1ZXJjVXMKUzdZT3NTWjNudzRI
-SWRXRW5PL2plL1N3bllnUmdicXFPTVdFaGRwQVpZTQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgdy9uMzlGMk10ZHZDYXo2ZkFqaDZYVTlNSHp4b0pweHlmUWJwamJDSU9o
-VQpsTy9GK2VJSzdMalhESVJ5YWtrV21yYWxBOTloZC9SMWpqSUNRZ28zWDNJCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBPZEJDSzJpSTd5V2JHK1VKVVFrKzZEQ0tVLzA4
-K0RlbzJXNEZvU3NxMXlnCk01VEw5c3lmUThkOVZETFRNRzFCSGlkMjBjWXR1ZUJL
-MnFjMXBNOXRNekEKLT4gVGEtZ3JlYXNlIG9XNyV2CkhvTWo1VUUxQW1rN284ZUxy
-bG9ocjNtdDkvY0JPOFhpaXZwd3Zic3Z1REg1ZmNTb2V1cUcKLS0tIHBwVDJLcGJK
-NHRFN203V0dPY09CL0MwOC9yOWN0OFB5OElVSjRyUHNlbUUK3vYYYjsO1gaI+Tjw
-2zKdP2JcYpk3YDKF1JBDhMtvPNU3Rc8vETNMmD+TkGE0hqorZGue9ah7ZK1Y5xYT
-/PF+rpKXxvYt77UG9B2F4+iQkuMkUrnbxFuY+cByfB5Qz71ixKmUt3DLLpqWA8xH
-4P5eTWGspaPb09g8+DeNAviH774GSs8EuN/nioDY7u9dp74rBIqi3k+jrJMC
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBvUXpV
+T1BVTDlKcUxjNmwzVWpPM3VtcUVrRWZJVXk3Vm81UHJMSGpMNlJ3Cld5NlV2Z25M
+cmZvZWNrRjJOU2dkVmVCRDQzMWowZnhyTHZrT1dhbDdnOU0KLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDRicG5Pa2FXVERYdGVyVTZoYkcyWkJjbGRNSHJDeUJjRjVjUlI0
+RjdOMTAKdVN4SWI0L2dibVpxVy9hOGJTSEpxcEoxbSthTEZiQjB2WDUyT2VNdGI1
+WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgdFFzK055WkFPYXIxbzZxT3YwZDdWd3hN
+eU9XRXN1L2NKL2hTL0RVbnJTWQpveUcwanNRaHU2ZTVOQzBvcHY5NXhVZEU1a0Vr
+K2hnOFU3RnJSWEZvWElnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBqb1YzcnQrQlhS
+eklJTlgrVmRuc0JCTDBZK2VKdGRUTW90djNVeCtya0FRCkc2VStHa1AxRTd0M3c2
+dHR4NXZJWXp3MVNqai96Z21pT09OT3dqZ09BSFkKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGhneFBKSlNhN1V6NFpRaDlOd2hmWnNjWUkrTDEzSVRsTkxCT1FadDdCVE0K
+dU40YlFjR0cyWjdBQXJDbGJYY0xsSmw0VGM3ZlZwVlpyT3hNeG1YL0IrcwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgQ0FkQzl5T2J0UHBFaXpuc0xuaXdndmcrNDJKNGFV
+NHFqcy9Uay9GdUNIdwp4WTBrUkN0SkFuKzZxRUt5aVJ4VTQxUmthQjFEL2NQcTVx
+STg3SkdlK0hFCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBTcjRsUi9xb3g0TjRuUEQ1
+WVVrVEZsMlRHeklKdG1wVVgvR3pwS0JwWFJNCjF3RTF0WHB2cUxJc2FvM3g2ZG1H
+Um0wRHBNaWdpaEhPZ3dIMnBsbURGd3MKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIG1a
+T0loVjRjTGF3S0NzZm5LUC9UZG9pMmhQQ2kzV2E2SFdTM2hXMUtCZzgKMCtDeUk5
+Tk1RZjhMc2dBZ0IydmZSWm5kcFFIQXAyUHI5MHFCSzZKM0RkUQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgZlAvRWJUaDRQQW44QkM0Q1BjTWNuOVJ1MEU3K1VkeDZRanB4
+RlR6Sk9nbwpkOWlPS1J4SE81M0dwS0Q5RHZ6cURSOWFBcEFUQWo5a3ZFekJZWXA2
+eDlrCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBrbGNsWWRyL2dzMzJucHJia0JzTWl4
+TkhIWjF6N2tIcit3eUpMWjMvYW00CmxZNFo4NG9Tb2dDOE1yNTFsSVd3TFlCMTB1
+bEUzOUM2M0c4VlhRbG9JRzQKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGlQUWlrbjZn
+NGF2QUsybU9WckJNZ05xTnVMZ25aM3RBYmViMW1hVE5UekUKY1Q2VGF6WUVacW4v
+SXY5NjAwaUFkLzhYSktzdmV4SHRjMGY3WVhMckthTQotPiBpQDZ7azFMKC1ncmVh
+c2UgO3sgdwphUEphdmhoTVRTSGJubjBOdmlLQ2JITUoxTTdUMlBEMVJXQTAvaGlI
+U1IvdUFsZ3hVQlZ4RTYzZGNGTE10KytwCnVybzhzeUxRVmNuQW9RCi0tLSBLU3hj
+ck90ZnVRTlViOW9MSStaOXk1S3VQblFjZTUrU1cyVnMxYjBmeDRFCsP4KaZlgIzG
+0xW6BPaEq//3Yi31/ZUZP1ebdyomMaR9SY6ejwG0xLKAGdE12M+g0+YaVJnvHr46
+R4f4rdxeexGMqs+8X2LE4jb4Z1MMKb4mRFlUWSg8g3ejFld59ZDP8MXCNf16Fvek
+Sz1fbg5fycapU5WBfpKkNq3d3j7YCWd4oSe/pgfZQZv7lBeEmyLeFmdmUZ9yLPgs
+Tw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/headscale_auth.age b/common/secrets/secrets/headscale_auth.age
index 1021d13..c111451 100644
--- a/common/secrets/secrets/headscale_auth.age
+++ b/common/secrets/secrets/headscale_auth.age
@@ -1,36 +1,34 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBCdmRB
-eUI5NzI3cjJBYUVhNURQWU9Od1RYQktjYjlYMXk5WmdNM21FcVZjCmcyU2Uwemdx
-VUZXU3JBdUlTRDhRZXRJS2pDZ0dGekwxK2hQUVIrbE9ObzAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGVMT21sWkl6S0xRQkhHcVR1M0pHRHFMTC9pb09DdytJKzBtaDQ4
-MUtMVW8KSW1lQW9oM1ZVR0tjWUdKajlib05WemtvakdwWmRzbHNlcVFNZHgydVE3
-WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgMXFLUFBIcndyZVpwcng1TlZFcDNaNEFR
-ZkNhWGYyTTdOYlBEak05aW53awpnblZOMlplaXVCdnl4Vy8vd1R3b1Nlak5CaXVU
-VllkUGdoSDR5UmNad09VCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBNVXMxWFpFaExU
-MnMwYjNTdVJ6L3N1L3VZamJ0THpXb0w5eTBsc28wdVJNCk5wY2QwN1FydGF5dktP
-WEcyWEhiN3Z2NWEwek13bEZOTEhHMGlRajYzQ3MKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIFlMbExLMU9YdGZsdnBxZG51cjlZcnZwcW9nb3hodXhPbEpSQTZDZVhzR3cK
-MUdjdWxVQVRwREtlbXlTL1hob0N3QTF5N04rNWNIWEtnKzQ3MnpScDRPcwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgR0gwM1lEQTFUZ3JJZWErbWh0TjRHdmpUVkoyTUU5
-S05zK1Y5SXpuV29nUQpWMnI2Q2t6OGdJSHIrdStMNzkyS2lpbXNDWkc3aXNYNFZ4
-QkhSQjdTR1pRCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBXUVNoSVd0a0o3dDBsYjhR
-Nkg4M01xenpJZGtrMGc2NEx5cVlpVlEwdGowClZNL21XSks2RVdNODkzeS9KZXp6
-UUVxbkViYktMZVZlanJFR1htZEhzblUKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIE5R
-TVJYS2hXd0ZhVFY2MUpwU2loeWRyallDdEJkZVVwaTBpTVl5clFBd0EKSnhXQThN
-REN4NG9HSmVzOWhwWHdic3M4MUQzWWRORUdMWFI1OTl0ZkVoSQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgVkIyZDdpREtQeE5jclU3SmJiRkpOcmVWbGZzU1VuMWRzVzhy
-WC9EU0d5QQovckk2ZUY5MEhjSjZEUWRMamo3K1J0Q0FSaDZIU3UrY1VzbWFMYjBD
-WHdVCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBLVmpza2ZNMEI2dFRaWXQxNTl1YXlp
-WkdrMnplZ3VybXp3eHExQkpJdkMwCmI1TmpraGlJSW1WdmZab3pPNGg2c3YzUW54
-NXVLYktpYkE0NlNERDBjMGsKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGhyK3BzQU9p
-aThpK3dvSVZlZnVLaG5OdmgyRy8yOC9wMm1qRy8rb3p4QTQKV1RBTHVDL2pVYVpX
-RS9NNlFKbU5KS2J6aTU4c1FlN2hockhIenVvMFhjZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgcnV3NDZaUnlvT3ZKeVM4TUNTRFFZbDZFYnpKeFVzSkxrc05kYmpNd3JR
-QQo0SmtuMmFpbnhXV3c5d1pRa3FjZ2VvbW1IT3c4MitXam5xSWhnRmFmWExrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBweXdxV0x2RDh5Q3ZHcXpSU2twYlMvdHgveWh1
-SHBNRHgxNklXOFpoekRnCmFSYStqT3JWb3M1Vm1ESEJ6cVBhaUFEd01ubWlTT0xp
-ZjR2THhCUWFvTkkKLT4gMENoPHJKLWdyZWFzZSBiCkR4YUYKLS0tIElUbWhKK1Z5
-ejJJNm9oVlBlY2ZYOWh6cTJXZjZhdjAzdEVGS3IzMFFTYVUKyW+D/FlWHdQ13wuk
-NUa8EzfdEWzxEkztB07kCp4/LCNSkqAzQpxuPKVdXnFjJPR0uQE6S6PARqHUNAub
-6hH45by9nWB//kGOCJMj7lg+tFHo
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA4bmJO
+dWh4c2xlK3NzU09YSXBkaE9YN1h6Tm4wUGJYRnV0bkJYczZCbUdnCkZVQUl0L21w
+S0F3OVE1WnFuRjRkaHNOOHFXdjZURE8xVjh6RWxmY0htNkEKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGRjRHZlUVBjbyt1OWtpUkJuZENXRzlVa1c2dTNLSktQZEFjdVFn
+UmVkREkKL2VOMk9lajBMRG1wUnNqVW5RdWw4aFpITTFwQ2dta0VYRkhpSGJYWTd5
+RQotPiBzc2gtZWQyNTUxOSBTcENqQlEgU1dTd25VYmtQWllLSmsrT2VOY3pPckcx
+VFd3ZGNnQXZqTGdDWmJFdE94cwp1YmhnVkJrY3R3ZVg1R2NleXFWVW4wY0R6NnVh
+ZnB4WE1JVUx2eFIvRCtNCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBERDhRWjNJTEV5
+QzJLYU1FajBCMkhNQTRocHQ2L3J2OGJIanhPVm5tREJFCk5YNmRtYlZBT2tYVFhQ
+enBRclNsbjFKUTZ0TTlGWU1lL3J6UllkVTVkZkEKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIEc5OGc0eGJyTkhuTlR0Tjl1b3gzak80amNSQ2daMkVyQmdtQm9BQ0QwRk0K
+dktDeDVaU1EzVWxMNjdrZFZiTWpFbTRzRHdXV3VXSUtldDRCM3hoR1llUQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgTTF6R2M0bE1jaEhsUWpCNS9hMk9iTGpvSk5Cc0N1
+RVFlSGVCbzNZOGdBdwo2TjAvblNzTFA5bXduRGF2eXJkcUlTalBqTkw5L3pmcW9v
+Rk94RkNndld3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSAybWw1YVdmdXdLaXkwd0g2
+MHNSeDZRVHNoVW5sbzZxRnVJaDgzWlBVckVrCml6TldTSTNZMGk5V1E2cyttRGo4
+WXI3RUhFc2g2enNyb0xzaEY0aHE4YVkKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEl1
+MXJoanFhZWxISzlycS9lZExpUjdJVnZKNlF0SDQ5NjBOVTJzUnhlVVkKS1Vla1U0
+MFNsSXVOSkhlTmdhdks0WW9kUkVDZ3RvbzNBNExjRmMrTVF6VQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgS3VqejY5QmczdzBWUGJ0eWVRaTZtRGZZOGJDWlhPV3NkRnlN
+MlBRK3NYQQpaZlVHTjEwM0UvM2tJRytmNldVenlmV2hsY1pvcFI1Zm84cmlkTWdU
+YzVnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA2T2pnbjl2eXhiQXdzSVVFa0dJZkMr
+T1drclJaa3MvYlJta05vTW9Jb0JNCmV5cHdCYXJxYVlNZEhiVXpxbHJMM2VyNXhr
+aDVERzJTMzMwcjdJZ0Nlc1UKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEZIbkx1WnpW
+Y0lFRHNsc05Sd0l1T1FNb1FjOTA4cHNjTVV4cjMyYUg1MXcKZXJWaEJNMzRuY3Nj
+VWZXbEZuUlVsNTU0UjdJUktFN2Y4SnZjVW9nV3RETQotPiBhWC1ncmVhc2UgVjlc
+SSAiIjVVZyBEcmhBTyA4X216CmtaUkxGRWJvSEhWUit1b2RxUHpLOENpN0RxeEVE
+NnJqeDQxeUk1enlmSEk0cjVicGZianV1dHl0T1NYWGFjUHAKaEJ5ek5DUThzQWhl
+ZjJLUUYydC9WbmNmTXZkS2V4YwotLS0gQytLV0dGMGJTVSt0dndhQnVHYXA0SnlR
+eElSOGJJZ0xJczNvczRqMGhRdwrVisqYWHfJRTEfdkpjjJxfRdEXBU9cQpCAm4vg
+Z/ys+RbW6dWBgz1PFAsf9F97z+LRBUE/A+aWViiFHXwFFV+PIRi5wtgR3xYRwjPU
++Qw11Ik=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2bitbucket.age b/common/secrets/secrets/nix2bitbucket.age
index 0162f78..5bc9b52 100644
--- a/common/secrets/secrets/nix2bitbucket.age
+++ b/common/secrets/secrets/nix2bitbucket.age
@@ -1,44 +1,41 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USAvaDU5
-QlpRVTNqVW5oa0hrdlhSdElES0VoeXduT1NNYUU2TTJEcERYYUFRCnBRVkFWbGZE
-UDVXWmJPQ3RNRHBLY2lMbWdxYzl2bVlHSUlKd3FpUzdhTlEKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIEV4MlYxa2Q0RW1oMThZMG5aN0RSY2htcWhxWllpWXA0eDBIL2hl
-VnZhQk0KbVZoTERCc1hDb0ZpUERjZzJOdmlsOG5SR0pub2JzZGFHeDVHa0xnR25L
-RQotPiBzc2gtZWQyNTUxOSBTcENqQlEgNXY5dTZqdUZyejZVUFlLVnFMV05aekY1
-Sy9WRkcyOTYzbGVjM1NtbTd4cwpGVzdlQldYeGxvd0dnMTNTMHBzRzNqU2padDJ6
-RE0wcFdaVENrMlNjRDN3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyAxWlo0U051ZkZv
-a2V1R1d5Rm9EcW9lMFN1MldrWkxKMjFNZlc0UXNRQ3dvCks3ckdkdFl3K3ZhS1k1
-UVg2UWlrYUNqWVZza3hQZ2x5L21UTDR5bjd5OU0KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGpyaU9vV1JKVUY1OG9CK2hvNmZZUFZTNWlCR09EZHgrSWVtaGx0dnN5VE0K
-U3ZCSUJ4bm1yMklZNGxOZ0lFQVovemlJZlZHMTdzVzZjdHQ3Y3NVRXNtQQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgSEYzSFRYNjhkc0ovaCtTdThjWmk1TUI5WDJTNVlz
-RFM4Q1dlUnY2dUVWawpwMnhYS2R2UzNsc0ZWendMV1dNMTVYbXNGRzJXb1ZTVzI0
-dFQzRDJ2YzVnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBmSGpHVUhnMU9Ub3JrWjV5
-THI4TXNvTGJvbks4ZUJxWlJFME02elNHLzBBCnBaTFh5b0g2ODdEYlFnaHNXbzUx
-QXNwUzcyc01qWm1VYW9MYTk4UUpqM3cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHpV
-ZWUwMExOVTc3ZW12NmRPZitWNW1JZnY0MTVFWTJwNlhaT2FkdVJnQjgKK1Vsc1Y3
-WTNvQWgydFEvKzNNdEUrdTU1N0N2aHVpalpJZy9LOGo0NzhNWQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgS0VOQkF0YzZlemZFMWxoallwL2VhZXRWMnJ0TnBnS0dSZVBN
-SkNLbjF4OApwRlFYanlDeHk3RnlXYlljK1h4UitKT2VwNDkyUm1xYXhpZ0hCRkZ3
-QXU4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBMa0FJNFVTK2NmaXlZQlpQbGMrRkNE
-bDRwaWliOEs2M0dTWmN5dWwraHlFCjNXK0Y0RjRiQldMaDNTNVRveVltQ2w4dklW
-MU5LUU1ZbjZld3g2eUtkTXcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDZyaEVVSFFW
-d1ZQTllsM1l3dVBuR3d1bGZ2Smk2SytLR2lJREFxaFFTSEEKYmo1ZnNjaXdVZWEz
-em5mRmFuN1VzaXl6VU9tNGp3VXJoRlQwQnBybEVvMAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgdDliNHk1cHJQRXVuRmxobWRMbDVZTnYyL29DNUJTT1R0UUpZNFEzdWRp
-ZwpYM0l1SnY1K2c0RklIVHF3cXgvSitZUEVZODYwRVhqeTZVUW82N2NNcTI0Ci0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBzczRTcG5rUGdaL25YWTJqaE4xL3RKWHNtblQ1
-NGk2dFBndHRPWkVqV2dnCjl6c3VXTG9XL2VqVlNwazM2cFVtYnRYU2J4UTNDOUo5
-MFJHMWs4NDBQM0EKLT4gcThWTn5kLWdyZWFzZSBCcD5tdDVUCmxta1NuYWU3d2Fr
-TXZ3STJxVjVZenNrSms5OTY0UVIzWTN3Ci0tLSBUeUJzb1NOaUtjOWJmakRVWVJT
-N2tMbnJQdWlmTWN2UUY0Ni9TSzBWVndnCvz3vV6dSNSOT+ys33Mda63+AZi4CnTk
-CxDT2hImfzAyzI8EW7ls7ov5yzb0r+p2MLp45JfTE5LJq9kTSpeD/pNOmRgb/7Uk
-493VGddxuG1Ebh0pS5ZnERSTPivQHOwMrCKvjaCcO+KpF+6QkghM7JKx8gVkx14K
-7aizD5kg20iWFG5Ir0ydYuiJ0PofjKj7779aCSuzVbwBjuwwIpXxHbE/lVPJ/hCB
-8HpRUYexMMHbm0qEbrHLhbmE4NeI6NcfDFj90OhW4ODePL+RUg3rEzG377xCoGD2
-6fRdKlZTZXMcuZOtc/F2cE2ruGwkxvDFLccrbntxAEkNIQjYniZhGOLdSVXWO4bh
-nf1pT14bYG9W01E6BCdbcpvS1W8GE2tJSRDSh/utv/zmYOMLZvIZFAcnfX9IQZ61
-/IXvRaPT66ZamlZO3eNc/KA32qP1v7euX+0akVLjntqObv2faiAMLzpY6m/F0L6D
-PAJQUyetGLY4WRiCmsj1Ede2Z6HJxf1B0V7SkxJP9T080LoD9DP9zx7zPvq05m/a
-HBcCW+ZWoTI4lOaM6cEC1xA9jP/EhOiO
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USB1VGtY
+MEdOWlZaSC9LMU82aWU4RkVQUEtmNXNtRE5jakhJOXRYelNNN3d3CnBBb1FQZ1Bm
+ZU9WWSszT1FUL0F1RDZ2anZRUU56d0lMeEhWN3Y3VjJjTWcKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEI4dzI2U1FkM0I5a3FjbWc5MEs5aEFPVWhCODcwaFpNZ1RYZnZQ
+bm15aVkKSUNYNjJjOHoreUJ0WUZEVjU0MTd3WXJ6VnNRM2ZlTE5UczdJQXRZN3p2
+OAotPiBzc2gtZWQyNTUxOSBTcENqQlEgNzFnd0JvbWxjSjJRYTR5REQweThRNjcy
+NldVeWVsTHRkempzRHJnRWczZwpHTENSd01zejhkdWFIVlNvVTc0UWVwY3ROMFR0
+VktXSDRCOG54R0d6WE9vCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBWZmdhZmpSaEVR
+d2tFbzhlOEVBdEIvM3pYWDczR1dRMWZrY2ZDVGx4bnlvCnk2Q0JGcUl6bnl5VlMy
+RjBIODI3dXdtb2JtSjJkT2huaFAvM20vM3VJOVUKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIFdleE1tMHNKVWVvTzMzTzV1R1lUeDB6VW9LTE43SEVLelJENXUvZHp0VkEK
+a1ZUTnQ5dEZHZGFuWnlJeHpKNHZ4SlFoaGgzakcvU24xNzZoRW5Xbk9DNAotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgUGhOV0dwNnl2SjdSb3RiZnNRYnFTa1lVN21XMEhV
+RU95QUkxZWRhajNWNApFZFd6OUpXREE2cnlGNmpLMlMzbVZYWFYwVzBBUlduOVcw
+OXpoZ3g0L2x3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBDcmQ2bVhhTkQ5OUIxMTZZ
+OUQzMG5senZoUWo0Yll2enpVcU1LVS9mRFhnClE4K3RLUVlQbk9lMkh4R1B6U2w4
+ajVFODBKUUhqdjlOdENubzNLNmg3RUEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEgw
+dVViclNkMEhibHlQOE4waGdjdE9TaTByOE1jTkdlZ05Jc0FvWUUxaWcKVnd5WVY2
+RzBGZ3RMY2xUWlFsMVdVTnYrQXBlbHVmMXpOaVlCU3JkQm5FMAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgcWRmSndkbm5VUXZhanZ2ZTZpU1NIT1cxbE9LcjVJOEh4Ymhy
+aU5TYjN5dwpWNXRJQnEzOXdEOTQvM0U1WDhtMmY0NlArYzcvNTIyS1FRa3dOSGQ4
+Nmc4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBsV09IOGc2QWEyUm9ZL2tMTkRvTVdj
+NEhIeVptanRYNlV6WC9kTzh1aERnClN3cHFiTnlQOU15QUNkTWwwdGUwTDR1V29J
+VnNUV29MblRMUVNYaG1oYW8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE5OSmxxWnd0
+Q25LdnBIa00yQ0twTmRUVnJDdUxnWGJNS2xYYUQyeDByZ2sKTEhlbEpaVEVsaUlW
+L3NSdXRwZkVHQVE3a1VZYU5pbi9TN1VSUGRGU0hFSQotPiAmLWdyZWFzZSA2dmVb
+T2I7WiBpIFYvIEBSTgpkTFNQUmxZMUFlcDRBUm9EaDhXU0V6emRtN1ljelZLUnVj
+SDVUM2ttU0l3UFh0VnJrdnlkVmRCKzJJV2ExalZOCjhDMWFkUEVjcmRSV0xRemdJ
+Y2xFUTJMaWZhTkYwSlhuMURlSGorZnBDMndWRGZqZG1xS3NSeDAKLS0tIFJScFFC
+OXRBK3NZbFRiZ2RmVTlhWTBaRWh0Q210VjdpZmlvY25VKzl5eWMK0R3SnMZjeShA
+rJ3mEOEIdaz5zvTnRkVvRaMOeSVBERJjm2pP3onTdwWPtr3hYUXWOBiaGJm3UVgt
+XV5rymdIWgDFPJQimxlsOQYWS2DAP08fa70OHNake1DGcnAShZbndv5XO+cM1WKS
+Fjy+/chkTJQAg7Il2NwheMV1m4zST3J0M2b2lTrIPqo/y1zH08OJAEWYRZrGmpDh
+4cqLt3B5aF7hmgFwS1EHg0gygjtg2GbL33XgjONPmL02TbLYMH+lCTTGfrH7NTQx
+06ixXsd+dkMu0SmUX3mKit5/ghNFpCNBOL/ptMJ/T10ryvjeZWHmYe+HlJhC9ncY
+rjjRwFXGGbU6RnzHoZ2I8C70/h3Tu0KXOHhxHG37EJ7PX7MnAWISAugNwGof/0kB
+DbAEw8FRCerrNdcCcTKXIIKCn5xNe3lCDZMtz1axUnN/POQ3uoynGy5LOtG6mwZr
+dIKFY0DLW6Vo2cdr4g/+fCcTXWAhE///kNaL6kUDJemf+L8hH7ZOmGW+udkvl6vq
+2Hc09/FWczLSfEaM+idz5D53gx7ehd/98EPs95AQiraBiB0aaDw=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gitforgejo.age b/common/secrets/secrets/nix2gitforgejo.age
index b3e413b..f19f974 100644
--- a/common/secrets/secrets/nix2gitforgejo.age
+++ b/common/secrets/secrets/nix2gitforgejo.age
@@ -1,45 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBJYnVW
-Ry82ckpjY0VkNmJ4OWdMeDFzdzBZYm00bzRZZGRTTytVOE5TVWlrCkxCcnpPcWN2
-N242THRWUFE5ajdWaXRET3BkRWtYQ0dXZitSTldyL2ZKYTAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGpWTU5UTllxdTZmS1ZEV3lIcm1WaFMxdGxQSDBFWWpYVW44L0Zx
-anJEVE0KdElzcCtUeFhBbFhndjVwellJUkphdmZzMFRMK2p6VERxZXBJcnBlRm5K
-ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgWGw5OEJUektzNHptTnkrb1FzWUJVd3kr
-ZmIxcXdha3kzTERQc0tYcUczMApjYTZOYXRaSzd0Sm5oK0orNm1LZTNWMS9DSk9L
-UXRJS1daTU9XdnJ1T2o0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBUZUpNMXdzb1FP
-SElEMHhacXlVemlPMytTMkllN1BSZE1NUUxsVnE2bFFZClhkWEF6ZHZZVlJtRGVi
-a0Q4cng0em80dmF6QnVKemZtbUpMc0VIbEd2cDAKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGVZdk50MVRkaU5LK0RON1BEOWRFbVV2c3VrWG4rcVFtblp0aWdMZ2NEaHMK
-MTMraE9BVTBnaTkyL3BQd2k5WGZnc1BVU2RMZ0s4Y1hHOGZKTncvL01PdwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgK1VQZXhTNHBDcjZPc1c2OWovU2FqdDZXaG81UUd0
-c041R1dBUndxYVVCWQozdjJmWVhIN3VVaW9DZ2xhT2FKaTZqMldQdU9KZUExa0d6
-cVBFWG5Nai9RCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSA0MjZxb1U2SW9CWmVpU01S
-WWc3NkZBeDFEWGh3SnZFMERUS3R1NXpVb1drCmNuY0xIejFUazhOVDNLRFJlRWFz
-SXJaRFBrMWpGKzZyRzJRc3MwdGVYbk0KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGU4
-cjlxMExHeGxOTXBLNTRSUld2R3h3eDkxSGlxUGNzdE8vYnpRSHoyZ0EKNWhVUXpJ
-VGFzM2dpRGdibGs3Yk5CVUR3R3hYVUExWFlkWUdJS0RBbnNFbwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgL1VFeWVkaHE4Yi85RnhiN1k2SWNZQTdOVTFUV1F4VXFCcDFD
-K3JxaHUxNApPdWFJT3NXaXRPbGE0V0RWK0R5dElJNlhJak53Z240NjRWRFZrSzJI
-Y2NBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB1M01qb0MxUGVaSFBwTDhCckF0UDE3
-elE1b1VucW5FQnJ4ZXRQSjU1MlM4ClpGWU4xelVGQVhWLytzRVpkelNudVhUZitJ
-SUVEOFphdzBzSnliK2NhM3cKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDViNEVKVFQ4
-cnNhNlJFTmVMZUlvUUd5Y3RoRmVDdzdSRUt2YjVuUkRCUWsKVkpYc3hXQWNubXBo
-dEErZmdsU1hkdzNyenlPLzlmTGkydlRqUExaK2N4VQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgUFhrTG9jcnFvVkxzbkw0YzFydEFYcW41czI0UE5DR2d1aGk3Z3lVYWp3
-SQpsUFUyVktMbWF5M25JVGxNU2VrUFUyLzIzNUJEUVFSbEx1R1Y0K0crREJRCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBtS29UR251enk2eExUdHIwZExCTjRVL050b1c3
-L2xzWUlJY2VFYzVreDNvCk94d01tbGRIM0xzdnRPM2JMbWRUc2Y2bi9QbHVLaEFw
-dkN5YlRiL3ZvUWMKLT4gVy1ncmVhc2UgVEZARClWCk5DZEcvd0VuSmVJYlNZRGgw
-cnJLUVFHVkEzcnFFN2g1QkRXQW00SEcxdEsvei8rY1BmV2tublhIQUJoUE44ei8K
-NnIwZURtQmoKLS0tIHZZd2pzaE1CMStTVytKUFBZbWdlOTFzeWtZVHRROVJ4ZkZl
-NHUrU2RMd0UKEIGfXRqr8prV877eJ+hFlZ0xfin1Py4KW6aojONCjQDZonuwN/qv
-KJPsITztoUw1F1dAknTFUZCQ5TqNw0u7rWUnSwhDTcCxrzKbsKjRaYZ8Y0S7Ow1o
-VzBmihb9Dx/S4a99vjrBb0KGBQV5CTTqrG6Cd1920l3HOemt8R8Cjncn8jP5FPGk
-yfr/2Kiw0Dym2V+grAmUQnAi6OzaMum/ONXix+4dRRXbsVvQ2gWrMSbbis5YnZdR
-XcuUHpCihAFTau+bXg28YHbY2MK5lvNuqTTXX9K/9gEF3mybYKX3PETFSilCUhBN
-pEUZSUAYurhGGxbMDiIPuY3H56DbuESNWYCdaGbcNyLXiM47GHLq0CffnSAUXXYs
-5gLf3js4y0HYMsu4GCtcmGEJGFuc+JX5v21NWcECficpjn2QBCzPj01CQ7v/MFgK
-rxXcyZb8kAaUNuO2IgclTXRcP/r496V83JsdZD6rrwoyc2J+HxpOKPXsg383iYGa
-rr806lmxePIgf+KHyYI+YuHAAjR8g/s9Lz7fHb16GTWUaZ8D62hCcwhaZDiDEBew
-JVUC4A0yB4PS/aXQifRKyrYXAyQ=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA0amp0
+ZzQ4QzNpcWhYdEYvWEh3N3JrNSt1dHZtVytON3JmdUo3d0pVNGhnCmdIVW4rUUNz
+aFVRcjVoTzdrVHNMbFRCV1JGRWxnWndvb0pKUENDTXBiS0EKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGtLWmhRL1pIYnZhTUtoVG95S0tSMUNvTkVEZUVQaFlOVklPVy9D
+dG1aVmcKK0RmNnU0UUtra2NDYTFDd0xtMHhPY1JZTGM4aEJxTmFhMFIyUE92VExw
+SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgQUQ2Z1VQRDNiNkFVaE9hVXlVYXl0bGt6
+bzBUaE8xQ2R0bEhLdGxyTVlpUQp2WHgrakhycGJNL3pXMjZoSFZiZlZBRkRKR1Bq
+SkJNNVM3M1JpRmRTME5zCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBOY1dwMGdYT1lS
+N3BJYXFhTFJJdUMvQWRoN0xrZlF6Sm53Zlh3K1gxNHhnCmIzQy8zLzhsblRhRkRM
+MC9udWw2WEZqaDVxcklUaS9lVm12SjdNMkVmcWMKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIFhRSG95TG5YazB1NnFiT1VUcWRQT0lzSkNmbllBclJ1VTVDa3RWZm5WRXMK
+VXJyNmZtSDdTSVdvYlorajRsRkJSQ25UTndyK2xIajZaWlNSK0ZlaHAxQQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgeUhIZlpDdU9ldExiZ0gxaXdVaThCdVJ2bzZ5a3Jz
+cUZhN0dIQlkxeUp4ZwpyTkYrSEVTWFNxSTJCSmIxUkw2ek1jRGVnelZ4M1ZLM0tF
+UUYxWFZCUktnCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBUZ3Mya1hGY25hWW1xSzlL
+L252a1llaHYwK01zazV2eW5PVXRDaWhlbm1BCkw4WldnY3l2WjZ3MEIxbHVXN01D
+aGZKR3QwS3lkQkRxbE51TUhKbWJiREEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEVw
+WnFZc0FxKzF6b0gzZVZBMy9SWVk5SkFmZlhZdU9lZk9nelFUQVhiVzgKY1dEYUlh
+QVZkQXE5ZCs1R0xMNzVyMGJad2JHcmNKdS9EU3NMZ1dqQWFlNAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgSURJUWlrMXhCVk5Za2FrMHppMDlUS2pwOG8xN3J3UnR2c3lv
+VmFTSmYwNApNdjJKM1llVEFSTGVlYnBPMDVuNjN1WDhJSXRQSlRsekF6K2trRDRH
+dW9BCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA3c00wVWZ2VzJucUtMTU13Wk5YNkdj
+d0FqK0lrT054NTBEUnlDRzk3MUFjClhUUldvTDRPMkQzbHpodUl2RHpBVk5uVWhV
+OWFwL1dJbWV4dnZHUE5BN0UKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDhkb01NbzJK
+RUhsQ3lJTHRsaDB2eUxNMHNqSk10WVNIbGRwanVDOVJMM0kKeWZEOWt2aU8rcjRG
+am9yN1h3RDg5QjVvTEQzamFpcWcvem1tYWFyVGx5WQotPiA1JVRtOHZoLWdyZWFz
+ZSAuTTBrdyBJIFZ3RVcgUXxddVcKQkdENjlleGdzWDFwSzY5aStlYkdhbnZKYlFE
+VXk3dkRnbkIyMDNmTlE3Y3hSdwotLS0gRDVnM29tMUhBaE9NVjBodHpTZmw3MEVp
+Y0EzTFhMUVc2aTRTN1pTbDlPYwpo9GQgoreaSkAZBUoWT/rH46och5cudiPlK1fX
+zSL2R5w/qQk9sBfBU4kZfJDsB7eoJlAb9D8qxj+jH558lzj4Kwon8LGopimSKlou
+Ow20GpjFOHJCwvBvfReqWxQcqYLuCxUKTQbAn7zW2/aIezptiPsQX1CzrJxG/vc4
+riXQyq17SMMUjeQCnH4vW0QztLKFNAEa1ANsTVMqzgvNoZWMlXMw+j83ciGKFaZv
+yaCtiDA2iQFtZhsqzFTI/kbhOPe8KerdoqB9XyX3RJD6j6oyjgfpPxDZl+ODfeTS
+9luY7F0dw4n480bs9RJuqocw3QoKm7/OL4IerDdG/6Oce1+hZ/yeqxBvwWEGUoT2
+U7UAEw2KSLqwO8IIqRe+bxF5mNHrKqwiSMNa67K5vN+rcnuLoSzTtoUNs9gXAVo2
+9YZlX0YDt2BB8osRGtWkIeNM95uPmAdRABs+4UtJYq16GN+I4usOEVZaNheZqLv9
+wRaSd6yXrX5IfyUhgsb52PhlUk6E79L8yfWz28qh7pvIpzY0aiMTA7MZGoDp3B/d
+1ciIcIXnFJ2OxKasDc0k8EMVFBSSRox84+tG/kJYlg==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2github.age b/common/secrets/secrets/nix2github.age
index c9d7e37..c04634b 100644
--- a/common/secrets/secrets/nix2github.age
+++ b/common/secrets/secrets/nix2github.age
@@ -1,44 +1,42 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBseVJL
-VVAwTlhFRDBDTGFaU09FNlAyeUNGMVFZZUNRYXBuSFc2Y3hQcmxjCktqSkVrTzZq
-R2hzVGtnS05iY1NySGJRWHRySWJOVHFsSC9BWXNlMGlzTzAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGxGV0h4dzlvYjNCcVl4TUtlNVZwTlhOb2lqbkhpNmkzRXF5WVN0
-eWlaQU0KcGFDd1FGbXZMNUNyQzUrN3FVbXY2TklQWEg5M3ZVbWlhZmMrazBWaFhJ
-SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgcnZXN2MzOVhxalA4VExCanZrNi80MndG
-eFdHWU9VaElCQ2NXNk9KazhDSQoyUUFkYVkzOHNCUWpPOVhidzUxY1F2SG4vRFZw
-M0U3NWxoL0lDN1U0MUNBCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBONmw4VkpKZzM1
-WDEyeTFQaldFQUFjQ1VpZklwRGhtaElidUxacUJuTURrCkJHOTFBbjc1U1IzVSt1
-bU9yRHdIOUdNN3BXeEpjZ0tBRkgzK1FiZU91Q00KLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHczUm93SGhIL2Fqd3FBWHJOdUpxbWJHYnErTzNOM2NpV0R6TllsblJLME0K
-aGppblpKQUt0blg1anQ3QWJQYjBucUVQalNpR3UxODM5dFFkTlFabnFrdwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgQW5sWEg5cHpwZ0JaVlJFSkNqNkJXN080UUNLVER3
-VDBDNEJJSyt0Qk5EcwpwNmRjK3pRbURGTWFEdFg4a09NYmplR3VWRDhhSnNoQUpL
-YmxWVHFWd0xVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSB1UnYydUZHaE5TTllkV0Nt
-KzRjRGZvYU16TVdUT1VOakZjR2tIOEZMbERnCkl1UmFIRlNMb2JMOHg5SHNkTkJC
-UHN4SUVFcEpDSkhCNTdVK1NyYXJwVTQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFFz
-NmVZdVU1RkZSWWQyY3IvN0RKU1EyZTJrWE9tSHRxM1NacUZ1N3J6blUKV0VmNldL
-eTNpczVXcjRyMjYxWjR3eWxqVzFXT3J1QnNqaDdQcVh6eDVKOAotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgajhxUW1OOTVNUDhyWnJVRmxHbFVMR0N1S09aMlBFdGc4R0Mw
-UEN0anlXRQpkM1BmQ3BhTDhJREl2bUo5akJKUUF3aDFIZXBGN2laZDBWUEdJSkpX
-cHc4Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyB4YWY2WStkRFZyVTVCbUpEbGlDY1l6
-cjVSeDJJb2JSTWc4amc5bGNXSDNJCmFmeEEvTU9XTUlMVXZCSFhyQVBkMVFZdVUz
-SkF4SWNFeFVldjJ1NFpqNkUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE45b3VuWnE2
-ZjUzRkJxVCtqaFh6L2Z0WFlUL0RBSHBXWTBsV0huOHBGejQKSzJoK2lhWllkMTNh
-M1ZmUEhaV295QytyY3B2cDd4dlRLVVA2MHFwRFhlZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgY1UwNzNSWGFRMk9YMkRSNWVGay85Y0dPNU10M0Zrai9zY1gzd0ZTakxr
-cwpXSFlITjRWdnVHK0tKS1Jub2dBMWpOZEIyWDZEMlJpNVE1aDZJZEd3WWFZCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBremFWbXBpcjFQWlozeVZjSlRadHU5Tk1BT05z
-TE5FeGJBblhFY1VpT2xvCklsVGdyYlVROXdjQjJhS2FEWmRaYm1IZnVla1M1RWtm
-OG1admZsTHF1MUkKLT4gQE0oXC1ncmVhc2UgQXsrCmpKNEk0WWFvMlgwM2FUazZo
-SE5Uem5rZUs4NXA1WGM1VEd0TVFuSHJoUE9UWnFvCi0tLSBXRittOG9HL1FleUo0
-L1JwZzRodFpabjdkcjIwcy9lMGszVWNxWXRhUHVNCgcHsIn1vTYVsBrLLj45Mvnc
-5nPyOSmszRYqTEZIObtB2q5z8q3zxwuymBHW6jbLp1NGqT0w3NHfd6t4qaEoVtAv
-jqJZ9y0gxnIMX16tA4uSKyrB06BMs2ad2vcmSjASX6rC2HF7svGvdXI7LIdGhqfi
-GTglZmxXlKO+mVrLopanrpiUKmmb7uZaV6wlgDXi04IqGlajMKJnBAlhW1+v/ue1
-8tn/VWAY9OJmR7hS61Jo14SrgfOuhYLmMKoob9fboruLipEqw7AP21o1VAyq8ARi
-ndky08LSXmQiGVRWhibqHmm2sgIitv9vsbnq8tszWTOdqh7sYLuclbzYXb7Ui/FX
-Rm2lsq3zZFJgdLhb4FH4Wn1uO2ctImw/lm2iojGNptTHZovDTnkvrqOGB0UGYK7T
-5auTTw1lc0xhESUfR/nDaI3ozgV9tcW8epaBoIG02GZe90Tm9I6GAiaV3heAG/DZ
-1G/DhIEJ5a5Q0cgHwYPrfIqZsLOACx3MeyJx4xtdnETvmXZEbgUbHrStDtwYq4lE
-o9iYTrNnjf/U7V5YmA110nq8MNQktwczu3/Rusd5
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA3Sjdp
+bmxNOUlJbU14cWc1eU53dGQxQjhjbElZVEhKQVUwYVhXVy9QckJnCldnV2tiVnZx
+UUdRQ1FsN1FuOVRHRDB2WUpvRUM2ZHRWbGtGeXJRdUZ4cDQKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDBLc0ZZR3RvczVHUzY2bklhWnhqWnJVbkp2bFVLM2hQQXg5V3I3
+Z2Vpd0kKYlNMcnNweVlIYjk1U3lBelo1WmxWaFRRMVlRNkswcEZBQTVlTzVFaFVK
+WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgRDNzeGsrTU1FckJJeFFja1hTbFU3cVVt
+Z29ydW1tOVAxVGlCUVluMW1FTQpzRGU3eDYvMGdUdi9ERDRTNWI0aHdkR0gxL21Y
+R1J1cTliVTRZYXdIM0p3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBmWTVGc2I0ZnJN
+UDAxbHp5c0xJelhrTTMrdnQyR3FtUDZNVFhYY05PMDJJCjFHVU4yVWkrNm9KZ3pC
+Tll6R3FiQUVCTndYRlBzeUNmMTlDU0NHRVYzZ3cKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIEltakJ0Qlo3cXdCb01lYUNXQ3VyTkJwd2cwT3BpNXhOR2Yvd0ltSThRQ0UK
+enp5cW9nMDhRQmNFWjNjb1NTMTVhejliODZCSWcwcmlpb3lQYnRIbCthQQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgSXhwL01Ca2xpZkVkNVp2ODVidWlhU0FISy9tQ3dO
+YWRMWkdlc1JjVVBtdwpsZGV3dmZteFVvR0tZeWhDM3kwb1dua3JzYWVNRGxpTmRW
+RzdZdnZpMU1NCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBMTFAwQWIvdE5YTVJiSWJ1
+aVZBREdXeSthaFBJeUJhbFNrTXFlYzMrVEdZCnRjNjVZY1p4OGZqcHcwWDgvZHFq
+eE51YVd5cVdUWTIzQUJXbXRDNDZHQW8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGZ0
+Q2toWnJWd2FZVDFRUEVnOVlZbkxoQlFzUDNHZFFJZU9EZGM4OWhZVjAKL3ovMC9h
+Yk5RdzlRM2QxWmJqNVVEZ3RrOGl0cXlvK2pjdjhKbksyQ0UyQQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgU3kxUWEyUUdPbmxaM1ZzUUlNOCtYQlo1dWhhS29hWEkvK2g5
+ZkVGeWN4cwpPSDFEeEE3TERGM084VzZjUFpiMEJZSkIyWkY0SzhsUGZoQWVTWEo1
+Mk9VCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBHNXlYbTQxNXJINTVkR2pBOFB0MWV1
+Q1UycEFqQ2RUcThObjg4QkFSZVZZCmNpNFc0Wmx0RzQrYXczZ3hTU2lOWGI5VUlj
+Y2FPNFpKL2NiKzBEVjErSzgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIElkUWhucnVz
+MEJjd3dLUlhSalZVNWlXZHNoRzU1TWMyS1pWaU5Lbk5nQzAKc2orbmhhWW1yc0J3
+SDIweWI3WEVBeGJJMmEyQTVFcjk4eTl5Rm1aTllrbwotPiBfOmR9SFh+LWdyZWFz
+ZSA3dV4ocWU0WCBbbFAgZDReCmpRTm5ianZlc1RKcTNwTHNlaXFFNmZ2K1VpRTRN
+RGlUUUJhaGpTekJzY1ZZMFM4QmFpZFlBTDJmczhhWHRwZkUKU0RueU1sMlZENi9M
+RnVjbzgzTDN5UHQ3Y0R3Q0YyS0FYcGtQLzhvZndPZjBibGM0K2pVRVpjSTNURmQ5
+dzh1VQpXZwotLS0gNDVMb2tqN0dSU053NXpYZSs1WVQvaHhKYXN4dExTZjZwcGxB
+ZlYwaDBRQQoRn3fGi5O2d7yMfThg58mtf57eNTiUtUyD2Iq6ToRr2KQviWZChhWW
+2S/eOIkFCk6q0Srdo2pP0yIChT6KbmfLkP2H0TxqmwrxJsKrqEBloZlN7hQmD34D
+ZGatzk5TwPKIoZTdPis+tP/7RNtHhDlAQdpRnpfKT6NtW89asQK44XBh80G25DyC
+kD5oSNi2sHXMDj8b3mpUkhqzYh1xlUAuR5KxPtSXSp+d2xQwnmi3Cs0xi5oyYQQA
+VvWVyNkKRJSkSm1+KLej1urqGU+z6KHjv4obF9rtxv0NGUL6Ii4RDFWqxWLHC3JM
+81v3lf65Fb3f9F9L7AfN42tPHogRZz31HlvXfUoRiddMrB4rasaTXjZaciZdf5IK
+WQC6bmI0FYhtCh1o+75QHke3lpaBbi5xuxq+nv4roFeyd4Uqx4i/wDQ6cS7vb40J
+CULCnkHTydNXJODhNlFisprS/b/tR05/Ds+Xr+J3OAdyjK/nKbe525IZKuY6N03q
+tuAyRLxjZQQpOcGSzWxP/hIFFJAGxf/8t1BqYInQ4ikUtnmgHXp2Lumkxti7HSDz
+oUl23nL69A==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gitjosh.age b/common/secrets/secrets/nix2gitjosh.age
index ab9bf92..1c685d1 100644
--- a/common/secrets/secrets/nix2gitjosh.age
+++ b/common/secrets/secrets/nix2gitjosh.age
@@ -1,44 +1,39 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBIVEF0
-WGFrRlZOWDdmTUZaVDhqcjZBRXNkSmI4UU1oSGF3L0tUcUdDRWhVCjY1QUpZNzFz
-ZVpMeGcwanV2ckJ3WU5rV3QxejJSalNJVXZaUUJXcHhoNDQKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIG1XM1k3N0VQMThSc0VGelNJaHBMVE9VS2NhWjNOUE14ZmNzdHlv
-SWQ1M00KUkpyMW44WjRpUStrMndNNjlQR2F3QU9QOENVdzZUNTd4dVV6QURGRTE4
-SQotPiBzc2gtZWQyNTUxOSBTcENqQlEgRHhFdFphSzNCSHJsbngrNHpaOHZnTWpo
-UXp4UmRNNXBRUUpZRzN2aFZtWQo3bXFxYlo5VElCSnd5ek9oY2lZRGJOVTF4WG1r
-UXdBekgrak9KZmEwZTlFCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBnYUp3Q2FjSkkr
-Y3d5dDIxdkFRcjVmREo1K2VLeWYyL2xzaUFOaTdKWlJFCnFENFVuS2NwdmVZd1or
-Q3lnRHEveXNibi94VEhHMnJCUkpqalMrcmZyWUkKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIENidlRXaGtnRFA0dnl4emtiMllBYXJRdForekRxZXJFa0pzMG82aitWRm8K
-N3dLY05nWVBxdFlyS3JNUjNvODd0RzNIcG9mZ3FnalNsWUx0RWM0bWpSVQotPiBz
-c2gtZWQyNTUxOSBSNSt4Zncga1JEVEl2OGVWU0NNMkZicmNOV1BSUkl6ODNHQ2lt
-NW5SRkM1MVJVQ05sdwo0QWpSeXBlOEZPenkxNDlKNzdZdVg2UVZMS3UvaWFwNGF1
-MVZMRDZTajNjCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBmRUZkeVpTaGpSZmJIbnJ2
-bEI1cHpSZG9meTc1dTBvVWpaUzZlVUZGbUU0CitkOGV0YldmMEkreDRvVGR4NjJI
-RjRhOG9QTGVCL0wxbEE0MGl3d2xMa0UKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFRE
-RkJsTWpwQXdsaE5leC9seit6YVpnTTZYdXJxQTdGN09weWYxSTNuMWMKNWRLK0tv
-R3VzOHgrMC9SK01DNXF2Q3JLWld6VDY2ekxtZ2ZBbFhFZnQ0NAotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgZjJ3UmNHVTBaaEN4b1BheTloOTJJSGQ1bWdNVGQyNWNHR0tm
-VXhRelRVWQpLdHdzQWgrOURvU1lZd3c5OGdubXRkcU1vUEdWb1FTKzdaUks2ZUgy
-bU9JCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyByc05UU0haQ2ovdE9JMTk5NGp1VTRr
-WUp0Z0M2SlFtU2lZTnpEdkUwUEE4CjgvWWhaZzhTK1RzTkpxLzV6OEI1VFc4c0sz
-Ulh0UVdBRHdVcWQzeFJBODAKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGRxbGh5QVpo
-OUk3WGc5cm84NGRzYmpzWVlIVzZsZUFVeUwxbFJhUisyeEUKNzB4blhHT3hDTXNE
-bTFVTW9na2xVMndtcTJ3eitmbjZ0dFhubXE1UEQxcwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgTXgvZGk5UGVvdndNZ0Rha3hIVDVneEg3MnpFd05rWm5peXZ5KzhTYTdD
-dwoyTWRNWllkOHVoaW95WkJGVEtkYW1EeURmbkMvVE9KODdTclZ1Nm1hc2o0Ci0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBoUk9XR21vdzZ2ekN4RnJHbjUyOURHOUUyRkpt
-UEpNRUwyMGNTejlhWndVCk5pVjg4Mk9YT09DNnB3NXNXTmRzRkZhcE5GQXl3UlUx
-K05MZW9Vb1NLOFkKLT4gQHctZ3JlYXNlCitLcnhqK3l1d3BBaWIzSjVYemcxb0w0
-czJRZTNvWUk5VEY1Wm8zTHVubkc0NzBFRytTSnVycjdMajBnUSt4YXYKZmh0Mgot
-LS0gQ0FGcVU1dmo4VzJoMVRnWE1xQ2F5VmMzbCt1SzdaRzZPVFJkeFJrbWJ1MArB
-NZEFsF9k3XK1GoMUCOdsNF2AOehFTcLfRkhRznpDFIRJtJN5N8JRDzvLvfeLcFVn
-5KpmOk13C8mZM0NFW5okxu+8M5POuq92TBsWmQO9L5yjN30upu9tquRRSfq3d3nB
-VBI5ikF9+Mr+DLtAUIiIRyR10sJIa16OSZc5dJXiK2qZy3hTFxzrpi+4uDCYk2Oa
-w0Xsx4RcqnACOPIL545Ug8gcInMoO5ClrOkYO+B5VhtTCWD/6Myqj9DR13agPgIL
-M/ofiaN0AA7GagJBLFC3djA+2jfCzf/MZZ7HA1AAPNIpnrkIihmgZ5KUkBd3xq9t
-pE8mbFEi5pOcq0Qm95SshSPYBfTQcRMKz+BWSQlHEfGxx/3eKSVWSbyQPy1NVTAm
-8rVLzXMqF+XoE/wNM29zHgEufwXOyfvYV8KG+CWG/sjM1SlqF4uH5MbpHFotyS3s
-Q7g554/3pJA5qRcZGXIbcZdQlseJwqH4PSoFgoqGiHL+Qv/A1K393Yjt7XgZBvgm
-EEkyRCFI2rxSOs+qdJrbey6CqvvJJXCgSZRrZZO2s+MFVIunC1rv9arL2KBN1Q==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USB6TGVm
+TkdpelRGS2gvcEJxQ01XLzE5SHd0OTc3ajNMNWlwckR6YlViQmdVCkYwYmFIZE1s
+bWtoUDlHSFl4enhOcVlCbjVYbHhUdE9DRXJOUldCcnA0R1kKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEdUT0lBcjFVVUVrWXY1SGprTmJKR29hWDZ3Q2ZycmV4bCtQcXZO
+RWlrUmcKYlNCZ1MwOHI2VXZjNWxWekk1MjYwc05wcGxEaWJBVzNPeG0rRDBGcmxi
+VQotPiBzc2gtZWQyNTUxOSBTcENqQlEgZzZwR0E4d1JMM3RFUGFvQ2Ivd3hvV25J
+TTQya3pHYkNGTHRkbDE3eVdnSQo2OXBMR1FiZktXOENrODBvUmlrQy9MLzdGU2xT
+QUhEMEd2dlUzSnB1SFkwCi0+IHNzaC1lZDI1NTE5IEJZS0crdyA4OVF1S29teEd4
+UlFkWUVkblFnRlBYWWZWWUw5N3l3cHM5dTdnTGdLcXhZCm1jZnM1NGZkbkVnY0k4
+UEZyS09NSlExRzFFcDJlRDJNTVQwZUlPM0lsUTQKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDBWOTNjZUhjcGIwTXg0S3MrL1J5OVJqQ3VPMmtVdDlsSXBuK3B6RmFURUUK
+aVVqWk02R2pUNTE0WDBZV1FqNlpnbk5ja1JUcjNZcGQvU3Z4dm5ZTWtVQQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgSTlaTkxGNVpaVnpsblhSOVNtdGpqaUNhQ01zbFRG
+QzI1ZDNkTTAxeXF6awo0VmMxeEJXNnA2MUJza2o2MUNISVV6b1hMdFB1M1p2alJ1
+T3J4Y3RXMDNVCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBxb2t2ZjlSditxa0lnRmJZ
+c01wM000Unh2dVB3OFhwZzV0cklrU2VpZG40ClZuWTg3STlPVXZkZjlkVHZPWVEz
+RjFvTVdFTFdaa2puRGh3WTZvTlRvMkkKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHFY
+NmxrMnBIYThVTXFaK21hOVFjeGxLWEJRc0VwMGdFZktuemNQbDZ4eW8KWEFPNEpl
+elg2UnY1OFJFcTBHUldOM3UzdktaaVB4dUNoc0hVQ0phcC9mMAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgRHFkb0lTcXZ4cGFlZzkrWFRIcmVVOStyUmpyZzBhb0xES2h6
+WTRXRHdRRQpWYThoZEhYMGxMTUJEd0hQODFMTUJZT3RGM0E1UFRua1NKd3JxRmU3
+T3hNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBlenJkbWdVd0VkYWVUdWx2blhpYnNt
+RlRDeTdUdGY2UFB6eVRkK1lLRHpvClRQTGxLYzlMZFo1aENxS2pEL2lEYU9NTS9I
+RWh0cGlWTW11UVgwekRXb1EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDRXL2xUZ21F
+a1FQUWJ0VjVLUkRHZU1SRkV2b0RrbXB1MmlSQjdtcXF6enMKZW5oTFBybGo4clNs
+dnQrZWdpMDl0ZWdYU3Z4bDd2cTU0dGtseEFIcTVGUQotPiBpWEAtZ3JlYXNlCjFG
+VlBBbVdmYlVRYzRtd2Ivb2NjODkxV25KY0lIU21XS1J4T2N5VQotLS0gNDNWMDh2
+bGlMR3I2KzhNN3pWTC9NQmw0NEJ1RXFrRzE3bUVHTCtIUlZVUQqotvqxr8ikzOqN
+qGr5OKLvK21Pi6LR8mF/2ol/n7XKiJEzhNRXwqPN62TOMkd8ODKn0diHwbEvehcT
+jW4F448glda6phmnke29f2Uq8Ls0mivd752Z0mV50pIEKHc0Y6ogUARiMKfBKmoy
+Lebc2XY4Y/lFUVunGWaJoufQLMI4swKbwed7rujdq3sxinDSwzUAw4ltID8IMG4Q
+ql4Q54e7Qu730NcXucmNuryWW0DKopWTobsnDVCfMN7ZXC4u+IsuL1xqdd+yC65u
+6H+5x8EoTaH2EQDaGVa1B9BdTut9E+0VKZRW7OopwGFTuX94PmWrfaaWlfO3BeKx
+JcCMUvWgSbv0PVqHC++mbxrC4/JNC/fr/KIFmG9TEVh1RCVqJTug/MNyY4qwrzEX
+lLEbs6TDPMq77/wij1kbeNArynvzhDBVjPQD/V3xZi8XkaE/quOW9ajnb5P4W9Sy
+yJnqL0WvKER69gOkkouRWlEzS4LWVWCLHwuskpBlJYbmpAmmfSnXRlE9MFzZOwYK
+++yH9wViG0crNiic+NCCILFG2JjR1i0bNFgksNaswo374ActWw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2gpdPocket3.age b/common/secrets/secrets/nix2gpdPocket3.age
index ac66b89..9c473a0 100644
--- a/common/secrets/secrets/nix2gpdPocket3.age
+++ b/common/secrets/secrets/nix2gpdPocket3.age
@@ -1,45 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBLcm5t
-Qm1tLzlPbXR5NDFHL0kvQUJNSUJKeStPZnp2dlkySEdKWlRKd3lJCjVoa3dOSmk2
-WXZGQjAxZGZjcjc0Y05za3NvaTBKK0NjZ2tta3RhRmJ6OWcKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIEpWMWtPL29EM3FkQk5JM0haMFlXVC9NL3RkL2x6RExCNThqTHBh
-bEU1eXMKYytkOFlLZkt0Y2ZoTzdQakZaWFEya3hJR2x2QmpzK0VWSjc1YnNjWGpK
-YwotPiBzc2gtZWQyNTUxOSBTcENqQlEgS0J1ZE1MdGduVStReWZxcytnZVFSRkRx
-YXNTbklVaFFVU1o4alZtM3B5SQpJTmNUZnFYWVpKeDJrT2dLMlh0L0ZBN0Rva0pX
-azV1b1VSVEFlTWR2S3pnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBIUVZLWWRjdTU5
-NmVYVHN0MkFZbmxFQ2h5N3JzMmdrWFVOWlZsYkovYkhJCkE1SDF5cktNMDNiR0c4
-YndIS2V5akN2RmsybUVoQ2hTTU00ZmRqSWVJbmcKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIER2OWNNVVg0cHBRalM4a3lULzhWei9DSWg0WExBd0hJOHZmNzVGR2V3bFUK
-d0pZV2NHMHB2TktlQTAwMmlES25DTzJRQXN1dnp6SUhFdExoeldnV2JmOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgZnV4cUVzZzZhZ1pjZmVwQWNZT0lhNFlTcGZITWJv
-cjROSlhvaUFMR2lSYwpQZVc5MTlNSWpuV2NaVVFVUHhRNzZWemdQOTdQMDNKaC81
-NHZ6S25YOVNvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBoSVBPMDV6M0JVSnhYUnlm
-bndQcnJsZVpRRldIS2QzWnBkZEtEczBQa0FRCmIzcVNpaGFyV0VGRGEzS3NyYTJJ
-SFhFNFoxMlI5RGVLZnNGWWYvb2d5OE0KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGxI
-WlFRaVg2TkNreUFxdTRFL2FMTTZtOUpJbUZza2wwWEFrQVpFeWcwRm8Ka0QxMjJU
-em5BSU55Zkp0a3VHblhvQktjcnREek5VeWxyTE9mbk1BelVlUQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgcVBvN1ZiR2FRUHhmWkdIOEsvck13dllLVjA0bWE1NTBpZkp4
-eGN6TGptTQpZQ3ZFVFVnekppMnJOREllSDJudHg1WWpyZE5ISDQwRnBwUEdNZ0Uv
-eDI0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBKcHd3Mk81NEY2bjBxdVRjUUFGR0Yv
-M2R5bGx4ZVR6eVFGT1I3cVlVdUd3CnNGakdDaVphRHpRWXp6bldTSnhXVVFWbFlv
-K3dPYTlQM2pxcThUWFFvcG8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHZXaVhiUnlV
-azVLU3FURDJUaXBvOUE1THJNVExjQVEvOExIcTVwZEI0UTAKNjYrSmVIdHVtVlh2
-RnBQUDh0R0pIUHV0aUNMQzBXWUFucE8xMVB2MHJ6VQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgZSsxNzY3NEhiRW5vZUJjOFlJSGszekxVR2oxQnhKMmhsbHpKMkcxbXhD
-OApSTXM2bUdPbzQzakNJa0JYdUYxSHZud0k3L1RNSnNTTkN3V1lZY0VNL2ZFCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBISFNHN01aOGZ1RU5jcWEwaDdZa3J5cVVqRGJI
-ekdOdTBTc2FKZmNyVnhZCnRUNzZJSDZmaVhNZHUyeFVhdkZ6YzQ0RjBTUForVlBm
-bitEZ0t2US9sWU0KLT4gTF51QSlSVEktZ3JlYXNlIHsgVm1CIDk3YApKelBqYk5L
-NEgwYlp1R0ppKzhKL29WWTBTY1NKeWJ6QU0xUWJXYkNYZUNQbHg1ZEdhdwotLS0g
-NkxiM2ZkdlcyZnVEU3hESUlRbUR2NEg0QUtVQm9RRnhJMnFXM0lZSDd5MAp4Fjva
-VrFwqO1dSFFWDg5QPrBUfH95D/2x7HWQRN8eVLy1F2D5nylB2vNBQv59PV+B5FiN
-b8zGDXN5/0Y6Q7syX2uTTSpHuw3RiAd9Lyw+aSivoi0Rfzw70jCIImdl6dBvqYqr
-+g0+TMrYe2e/bsgnoavFRp3B1eXUFy3cUy0Rxsx+APjDQijdm9NX7uWtC2qHYcIw
-YgVbUa0ev3N/nqDKh2bc0lbOxiVLqPgP2ivIyTskLRxko5Mdbq4Vkl0I9PaQE/xc
-of4WGC1IQ9zpzOA1MKZWwAsa0NMYrEQA7mxU2hz8BQCSSglKIzE8b7UPBqHZEHZf
-bfzj4rd80NGBmCNvrBsGNVPS/xQOGriPzgqfDV3/1U30RNcplxy7ednIIOnFc+5t
-AixVS3EiHQWSer2I64NwJNKWD5FqBN2is7mJbYMogYxPC55KdG2nJluv1JO53xLM
-9n8iIh1K5FATzNUnqZefn0tPjwsPJpuk7l1MUy489KjBAA6DQlF2YfgcniYL5o5U
-Pj1ZG22qYIrijiAo8FyV0kOjJBFCsqxEuEv/umEXiDbFxLRatez0zf3jCpZjKWXG
-Lv/OuxOMGg==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBPa21J
+b0Y3OXlUYmduTCtDVVc2TWZCY0RVZUxObW9OR0xmaEZpUjF1aUM0ClpDNzJRaVVk
+ZE0wU1BEYmM4MEw4czluSldHYnhZQldZVktieTdqMWM5NGMKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIFM0WkR2ZHplUW04UTRkenNqV3o2SUxzZWFic0p5WW16Sit1Rk9I
+cU9RaVUKWjhTS3d5Zy9BRVExaCs3Yi8vYi9UVXhSSmtRTEJxK1h4dHlydDhLZjBU
+VQotPiBzc2gtZWQyNTUxOSBTcENqQlEgc1F3QWFqQjdXaTJkQ2hKSi9Bc3pSQTli
+amY5am4wdlFZVnJWNGp2VGZoWQpNV0FSMWJ3c0twYk9wSG1PUjRkR0FYS3JZZVpH
+SGRoQ2RaWjJnUDJvVk5jCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBSR0FnNnF1bjR4
+bk05bWdYaFQrZkRFeGVIUzBCMFZKeW54ZHI0Mk9zYVRFClhEL3phVUFNUkc5amdX
+UWZ5cUtUWHZ0eE9ZbnpobElMS2RoT3NESzhrdEkKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIFJ2SGJYbG5FNmgyeW8xY0J1ZTRrcEZEYnhLS3dUL1VhMVI1endFb2d2M2cK
+cGF0Q2pKMklMTUJmdjhlVGlHc3pzTFdwdDZ1b0daQTI2bHhtNk1URWtNbwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgMjZGczJrQ0pWdGIrbTcxMElpZ0FSczc5WGVrN09G
+am5DUVhrVWZZRE5WdworaGozUWRCQmY5dWVOVnJ5YUI0OEJ1NENCbS9YeUI1YXF4
+eGxESVBEeW9JCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBVRU40YXpBdVZNYXBFVU4z
+ZTUrZHVxWi9KUW0zOHJMbkRFRlFEbGdUUmdzCmcxSndnbG9QSFE3LzFFTUdzUTVD
+c3RsOTdmRzByckFxZ0dHUmxJcUF4dzgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGNJ
+YnJpNE13M0FNSmxFaDVoc2lEcGgrOGhydVBVeS9Jc1hnckhqWGE0aU0KOEYzdEpS
+ZnRLLzVXZGYxeG8raUUyVDdQdEE1L3F4NGxJOFB5V2VNTlNTMAotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgYTZybWdSVll2YTNPN3AwRzBVQTNqeHF3SjVFUG1OcFh4RXNK
+UTNwOVF6cwpxZUcrL0gwbHlmODBvMUF6ZEQ2V3VjcTdvNzZadU9mWjA1M2IvVEdS
+R1RNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB0VTFXaGwrNUdPNGdhZW83Z0dOdzNK
+RTdlSDFXS2IrYVlzZ2dudnJUbVg4ClNkMHQ2SGIvckViemw2dWhoeEVxSlZhMEk2
+MURjTUNQdGcxYTFUeVN2OWcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEZZQ1dPamFv
+cjd1cXVacWI1MFNDY2tiN0NrbU9Jb1ZraFg4d3VIc0RzaXMKVnhEWXNxUkNJbVli
+Vk5NUjBoL1RXN3JpOElzWGRhdXpVemtCTUJWWE5aOAotPiAqUmI0SzxcdS1ncmVh
+c2UgTj5AWUkwVGggQCBCCnNEU2lEaTc4M0hEa2hQb3dmOWdUKy9VV3dKWnVjWnVT
+NW8rTGpGRzBpSXRUCi0tLSBPVzFxckF2NTJBQVkydUNwVVFETmgrcHZLcmhIVTM3
+a3lXTy9oWHAxOE9zCmz8lA4HcXxPG9PDsZrG/bRyYR9uXiGBQ3aPzYgovO7VALuN
+Vj3er0hkDRQOD5r0IiwUsJenqUd/BNPgT69916BOW1e+sugjIXUIjWlkDPuRI78j
+gueTRUnl4OQGEnOesN+qJZPUovyk2br3uKskCuZCAoYEvhgA3u/lMPb4nOj7oGT1
+pvwlJg6v5p7yJ3uBkBpXZEZJoHInF3PRwh8irZ0gJNSp1vJYIW805RGZ8tQ453/y
+a6VKBTk9nT2nOtrM2Fgm4IEqMOJ0aLcGRzLKMCHuALt6akqtuXpIWrc9mvHHZT6Z
+geoNhvFVOCREbksAQT9OqC2sWY77cwLl8GqFGtKOI7a+PSKbBxsZuqD8AgmIoNMq
+JKA1OviYfCc2+MhJ6woavcJp9jYC+uIRQWNeMv/pCBfUMI5GsP5NxocV0rq22n5+
+QXi1GW20cujqVgQjtMqyAun5u9xc6xeKJIKwxjK2xVbQ1Ritqn+Pj2jnUCh5KXBc
+ZCQwCInPO7z06wD5x0mEP+nQbFqe6BzyTtFD6u52gaGhELlBw6RvP7ptEG/GCAvd
+3L4AtcHj4melBlCC5XgW4BbEyvxOhCfY
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2h001.age b/common/secrets/secrets/nix2h001.age
index 0619a1e..40e56b8 100644
--- a/common/secrets/secrets/nix2h001.age
+++ b/common/secrets/secrets/nix2h001.age
@@ -1,44 +1,39 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBzN1lC
-b1pLaXU3dWFrWnRvWFB6TWs5dTRmZFJXTXFPMVJHaVIwbklIRWcwCkdJK0dmNWpk
-MjloV0YxU3hNOEs0eGxKdVE3WU01WXNXakxIWGo2c29NRHMKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIDBDdG5BVWtVRy84OC9oRzErRzJQRzlGMHVvM2lLT1hrOW85dzF5
-UkNlRHcKaEJDZzdEaENEUmt2c3RzeTRMcHlubHIvS29IMXdDRnk2MEc3Tm4vdTNo
-YwotPiBzc2gtZWQyNTUxOSBTcENqQlEgNnkrMG1zVjkzdllZTlAvKzZJbld5THhQ
-U1k4eHBPdktYcFRJRkE3MFB6awpMSnducVhJSFp5NTJVWGxLRG1KV1BKeUZiTm1p
-czZNUVYwMkZaWmZEcWRJCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBLbENTN1dmRXBH
-emtwVlovelgvQlQrUXBDOEVabmRJbGhYai9vL0N3aldVClo1eVc0aWZjQUhWcDc5
-ajZPNlRDRWx4VFcxWXU0U09Oa3c3N2JXZDJhcDQKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIEYzZ3pYL0NzSGpzSC9DTWVsNWpEbmRvSmNHZjhwMTFIS3l6blgwWUNWbFEK
-Yms0M2wzNmdPbFlzbTJIUGdJdHViaE1od3Ruc0hNdXZtQ2Izc2tZQlhjNAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgNWVjdjVZeDJOekFFYVdVUHAxUDM1ay8rUTJEWDZI
-ZjBQUEpDeUgzeEcyUQo0bWpJZld4RjhNZGRseW93YVRUUWVYNUk3SkpQUGFsWW5t
-aWJBQmZCM1I4Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSA5Zjg0dWsvTWhWUUx4QWNV
-N1JnY0hQVXg4cDZpUm5Ibjk3U0JjU1BzV1J3CnJWYmRjVlUySmoyZkpuTm16N0Q3
-bVE1ZUJtcFVLOXpWK1VGNHl5Und3ajQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFZl
-Tm9aNUFtTEduc1NjVjRndzhUZlg4MGlBazNhVjlXVVhUeXNPMHh0Q3MKcmZ4QXlP
-R3FRQ3BkREVyNzY0U1pNcGxOTitJa3ljOG1VU3pxZ1N3WklhSQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgTnJzV2o0Z0IySndpU1RXaXhmUVZsc2xoODZ6SGNlOC9FMjFT
-YUZJS2dFVQpNV1JBTHR6N1ZWdXVUZFB4SjBtVEhDUjYvZEVFSnNlYnN4S29HdkZ0
-dHlBCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA0SHNWUHYyNHROQmJENXlwOW5PNHQz
-SnZ4QkV6dDR1d2JTVWJFZXFGQnprCndUYUZ5a2labUcrakdZaDEzRXBXL0JKVThT
-eFJLaTlBVEk1RGhIWHBDL1kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDNUa1Z6TFNT
-Q0FVWnRVMmJ0YTNLdDBOcVQxRmpIOWVaNU50S2VaQ1Yva28Kb0NtRWhXOUZtbFRW
-TFJWdTgvUlZNc0xibEtBS3hNaUtEQjBkNmM1YnBTUQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgL2RCWmk5d2wwUnJ0dUlhRWd4ajlwLzBpVHRhVURLOHhKSkY0NzY4bndT
-YwpROHBKVGF1ZkZmcHVwSWhUUFRDbmxoT3JraTlaS2taMmtSZllDZi8wbC9rCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBwVjlyVXJWQjRZdmgvOVBwV3VZdGJXOG96Vndx
-RHR2WjR4REN5SklBbHhNCnU5djVvUmJuSGFleENRU053dlREdEVONk9SZlVxMzFv
-SSsraDVXcUVEWXMKLT4gKy1ncmVhc2UKMzdkdEtFcm5DSlp4STZqWFo4VFk3blpK
-Q1FrdTVYblZzZWJxUFUzYlZFNFF6TEl6dEtmTlFFTis4QQotLS0gMHgvdjZldUZl
-RkIvK0J5VmQvQ0FraDRvSi9XM0pheEcxMVY5b1BYK0UzZwrE+EOIQzbFUd9WT4Vu
-o0z9dOqnMnAfas9tVlRKUHO3eQGJ0XTJeOhd82dYfFAebfqIhdqWbYiBEdzAA6l7
-+fWiGspeGdoFXzOInrW3Dw28EDnVCXmHx9ZCjSnPFPTvtWPf3w39F5UED1qDXFQX
-tEmPPKe6NB/ySsuiQ0EJ8unaKDYro8yEUKxQfHeYcsksNXYOaLkWB9fcmQaW7OEt
-Vc1I+u2h3h33c69QAsMpkZPKzXyjeHqUNrwhh8d0DNIvzQyjc8mJD1A+ayZ57XBt
-9Zlv7NkT4FYdRtxsiUzDs9PqC6yohtbdWKZplrbxF/sgzOmuHpVJtytZ2jgOI4mE
-JCsPnLggFUTjyrWiIRteB/7//1uDY+rZmovnFEs1eNshZewSM3D6uUgwVB6FkfY1
-KByRsUKvO4UBAA1/y4VjlVVvLjEfCIAsX9WFvP3Vur4DuF+wckVfoFfdFfaC0LWl
-tMleUWzyHMjd8EZdNZ7e839678qPQFdVGQIXQObQlIvfWkAc+ZmneqT5xjopnJZz
-GgIkotEEyTLP5KGdXMe7VYyCQPVCFiZO9XvfMIcx4SIObA==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBoNVpS
+UWlLTzNmZm9ZVTZXaTVmeEpXSW1ZdWl0d3E5UE11eFJtT1BKZnpnCk1jREVVdUNp
+WkhNSyt4S3Q1MUNtMVVSZnUxbzN5b29LQk5lTWZoZTR2cmMKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIDA3NWl3dVVqbnB1TFRrVGJXb05Ec3QyOXYrdDVxblUrbE50TitT
+ME1lSEkKRWVOSnJ2SWE1OVIrMWdKU2g0YTJjaE5XUTF4a0ovdktsSmZydldXT3NG
+ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgdWVjQmxaQ2tieTdVeWgyUFNlak1HVVRQ
+Zi9EYVpBekxURURvcitiK3hDRQp3YVIyaWFTS3Y4RnJxUDBua2YvVXUwZjk2dkpv
+Q3pnU0NXNFg4K3FlNG04Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBtWjBxZXNEZjZF
+aU5Cdkg1ekZ5b2E3REpCQkZOTk1TL25ibUJrbjZBQ1RvCjdGNEVhUGhRNDNxVnpD
+blUvQ0hsYUhkYVE2T0VFb0JBZ1BNUGtNTmlCcXcKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGJXMno3NDR0OXM5ZkZFOUozSFN3L1RZMU4zY1J0RVNYVHI4REtNbnRVVlkK
+NjV0NkNkdU9Qb2k3Q0RiN0FtaVJ3dWUzdXJOeHVIUG5RUVc3aW5MUTFGSQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgYWlYMjkrZmxFckJ3dVBtdVFpd3lPT1ZPL1U1bGl6
+eW5pK2g5NmNVVHJUZwpEQzhKUWVtYUxYTVNPbEp6U1Z3Z01GTC9PMEZQdFREL1Rq
+WGxrRlhicVdjCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBmemdzeFo1T1dzcERtNU1m
+V01RMVE4Q3QzLzMzb01pOU82bEdUSGRTWkY4CmxsZUhFQzlUcXp2dHdIMW91SFFM
+REtZUDRQdU5sVUQ1UVJYdDIwdUJPMkEKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGFM
+YlpuTHRLKzVFd1JiT0wyVmo5WWUwaW1kd0VEYWVGQ09rM1JrU1V6QlEKN2NqRk92
+aWZxNlU0TVRvd3E2akY1UytQY2s0bE5PaCtNdFR2SEhqYlF6cwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgRVZNZUNHOVFIanplMGZuOUtqM3l1Ly9tcHI5MkRwYnVMeG11
+UUxhSmRWZwpsZHVkc2l2RVZCZGxJM1gxeFNVN1k2Rm1mbnRaY1lzcE9GSWVYdzN4
+OURVCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyArc0VlME93TExrQ3JvWlJudzZ6TGJq
+UUZZeW5LUVdjQ1pCSlMzUnkySUJZCjJVSDRTVHY1UlhXdkh2NEhJajhQTGU0ZVlz
+NDV3Yis4UzZGQlBJZkt5dkkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIG16aVJoODBp
+Snc4ckpaVmRSamd6OTZTQUh3dTZsMW53NzY2ZjMvMkx3aGMKUzFBSDkzRlBvN2Vl
+dkM0RXIzNks5MFcvb1c3cjZBV3piVDFSd3dKZlFydwotPiBsaE1yX3AtZ3JlYXNl
+CmxwTHFySDBzOVBRckgvNThGNk0zTktHbTY0b2llVXJYZ1EKLS0tIEpLN2wxclVK
+MEcxdjUvUnFtem1XQW1UYmVzUGhRVkUyUWN2czM1RlQrSTAKZB2uCnpt9Xqz1w7+
+jwRVePaF2c2mWxgJUdpKpAZVgEUWkGSO6NEh3iTdLpsI9mDfh9KYRSPFqC9P1cf9
+5KId2A/oki3PNUtcuoaLn+xLPV06Zs3QsOds1ghO2AcCsVW4hC+Sgr02JelS5eCt
+Q69nBpQSw3ePEaASSFMCU8Z4F+n0WpkAq5ERACZiHIwWDes4+PR3BRVDvjyUlFG0
+3mtSpotzlTtBJldJTado+oOS8eKBCMgoXmP9t8zFBLe+Aj48humYnNT6rPv2xj+C
+Y+7FK8441uWdbu4PyNJEknF1k5YHYIg5pyrrDRGRtoomShZyqhufEAYpMIlCABpp
+vPYj3iqqyV1T980Od94qlYJgpHEX6650gMSAtqpQdLmhnOwF2LW+g1Gpw7lfk4P2
+kzZCflwDGtXXXXPIyUiAB30zKCufjPXEl1x8oTXzbBKEE6lvHDgixtrNt6iMjVbN
+n+Gon4PcolTdwkiEEst2POOV9Ll7KfOidMl1VfJxXKyt5jBA61xv54IQiCouUan8
+EhD4uiVHoPjWQ5E+h3YvedT7hrGWOzkxNbw8NUf9LDIk7EA=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2h002.age b/common/secrets/secrets/nix2h002.age
index cc2db7a..f055178 100644
--- a/common/secrets/secrets/nix2h002.age
+++ b/common/secrets/secrets/nix2h002.age
@@ -1,44 +1,39 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBoVnFI
-cTBRRUdwSkd0eXBiTGR4bXlFcHBNakFxeE5VYXYxc25JeXNtbTAwCnJwdERxYWpM
-YVJER3c4dUk5aWhGeEgwR0lzUlIzRVdRZmExNmlqZUg3TVkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGhNekdERHN4bCtaYzdzRG1tUTVlMmUvZFQ3VG1wbmY4UUJ3NXBG
-ZGZ6UjAKQXlhQTdVL1BZK09zbDVmc3g5Uys5aHpqMm9zZjdqL25EV0Z1V3ZTNFVY
-NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgckJOTHl6UFJjQ3ZxdGd3czF0VWl1VC9a
-M3ZaZWRuTTNPTzZJaU9nRWtWawpvYTNialcyQ2J5SmxodTVZQ2EySmZ5M0hCUWcw
-Qm10c3E4OVlaVG5jWUk0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBhek5VUWdReW5a
-UG5aU0QzdVFZZ05xMFY0TS9QY3ZHZmFidldYTWpFckNrCkJCem5rY2hUdlpWdjhZ
-NDBDL0JJbDB0eG8weS9MNThEbWhKa2l3MGhiZzgKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHB5QWEzWWJiWmxYNE1oYVpVeGgvMXplYjJrdHhwMThKSE9SUGxac2M0RmMK
-UlV3VGh6NjRLcDJkMllXRkV0ZUJyc3dyZlhXamlOMDVFK0ZkeDVJandidwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgNXE2MldzL2ZlZXgyTmtzUVRFVXhSb3IrcE8rSkVo
-L0J6RXV3WVJnMnMzOApSSGM5M3ByUVlCNWZNV0Q5V00xaTQ1ZmpLUzJMQ1hQeUNa
-R25VR2N2MnRjCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSAwMFZPTDJGRHcra0w2cURo
-ZUIzQlNXY2NiWklvdmVGSWNqK1lGNHNyS2dBCnVBRG9qdHVEMGdmcnF1VWxSNG1Z
-cHVEOHR5NVZsdFJVcTJKSVYySExka2cKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHVw
-MXVpUURLNUxaMzI3dERzd3dBTjZFWCs4ajBRRGxJNUQyZEVNMVpFejgKWndQNE50
-ZDZpSmVCZlYvUXlTb0lRU3FMMHhiRTJBR3ErS0lObUxIRzhKYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgREwrZHFRNXBHZDB2V1M2alhxaGg5RjBqWjRuNXpGbVdaQkRs
-SDVuQk9ScwpqWkwxTmVLbEdZZ2JiQWhydE5QejRKWm8wOTVRbUdzMGprT21LVmZU
-QUkwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA5U0gvK3A1TVlzbzB6dThscFlNSVha
-MGNxMjdid3VBd0ZRV0xlWFlROEFrCkEwY3gwOGdYanljRnRaY0lzeFVxR05PMHJa
-Y2dNcU5CWWgyQTJJOTZFd1EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFdTS3JUSEdq
-R1RwOEVGa2ZQcy84eXgrejJYSnZIUHhFY2pYZGJOYmprUVkKTisySUQzRTJ3RG1P
-bUdKRHp3TWpzMkdOWVdIODNwV3ZPem5UUTFHVFZyawotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgZFhXbFAwdVIwYVlZM1lPdFpLYmxEYkxCWjV4Zld5dmNyam9XZHp2QU1S
-SQpQS1FBK2ZJQUxLYjVwTG5QTDBFMUZFbWxuaE5ibDU0VjFUNXJxTWdocFBrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSAvMW5uSVZFSUVyTnNQcFFDZzhORG1Jc2QzdHdl
-ME5mUnkrMzE5MzduVVdrCnJFN0dPdkpzN1dIVEVHY0RZTjQ5RlB3VVYwNklZVmZH
-eTVyYitSVUh4OEUKLT4gKWQoUHstZ3JlYXNlIC52IGFIdmpSQiogSX0yczZcb0Mg
-RjQ+dCcKbkxFOTdiRXdyNmpjRHlHTU9seG0rRUhhUE5MT3VXdVVUbGcKLS0tIEtp
-ZDBxTkppVk5KQnB4ZHFnUDB2dHc5bVh0S3J1NFN4VFFrSXlBV2JhMDAKSYuA1rcY
-xs8cJ38Z+SQ9o87+cS30u7iWvd2JjiEQvKVimZaqTLe9oT35atx7ZAUtNB+ViM6y
-MLJQT7DCuHbRhFxwmBC1oa/bJuZK0ZMyN0pjQ6fplk9qVvjwbr+NBgxzKlAft4bG
-tqU3VtgdR1KVaP+fB0ayJ1F8FbJK1SCrhSMWy6gMQe1haBJsVRqb/jE7WOIECgXF
-e9so3m8RoJKHLswEEGI9S621lDiPA81g0bsH7Xkh3spRGY1BRihU7rgjlsVNbCuo
-DOTjA49heOG93G05x6zWqb70uqSrExA9shmIKl6cPH4fyMpLX5QjbXp4JxdS7xzv
-QG1mCR7SNELel26Si0MNzrXXOMGe6Vtq3iMJhVIcHNKa8+TYXMEqXms8XUGMsVGh
-D6Cfhn8FvZZc4BiBHiqa0vl3AwUGaVx1OUdNg2y4Xt+pJJDBTF7h8bP9lJxYyfm0
-bVdJbmtg1BxSUWDr/VIuNzlARdp4YVOt+5iN+iQ8L0OQCSZnGlPsbUEHbIdUsnAm
-fMQlwNg5wJP3IMSSg61wpkNnS/K/t+6auKbOYoeUyyPBCGjbVeCn0mQ=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBsNVNo
+Z2ZuYkQ5TDhZNEt5VDFDVUlETFc5TDRpcVoyZVJqZjcrK3VTRkY4ClBJd3cyaTd2
+c0dVZXBBSGpQZEhiamEwSGJCZTY5K3VKVU4zSnpmUi8yeEkKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIHd4MnFBWmJiZXdVd2FEQ2ZoS2FjSmVmaCt4Y1J1dFpuVndDTHlr
+UVhpbW8KT2lyc3dxbTNacnprUDBmV3dPMGNoeXR4OWhCKzRLd050bjhOdmxmdlhT
+WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgS2dYbEdxMlZaQmhOSUtkcjg5YU02Yjkw
+Y1RINWVUSVBZRE5MSEd2MWkwawpTZzhPTUlLU24vQkdkSDhsSUNta1h1T1FFUEww
+R3RyaUVFZFpaN1I0ako0Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBsN1JhTDE3VFNt
+T2xLMmFLUlJBSzVudU4zRXNUM0pWajQ3Ujg2eGhDV1V3CmMwRm9wRTRmeFUzUDNo
+cERtZVhkMy9wYW81OUFMSnFDOWRWc3Z3QlBUWXcKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHlLS1lieWoxRGlqYUVoRW9zY2Ftd2RyeWNmbktvd2s5SkFKOVF4UDJnbmcK
+ZlRqZEUvN3JXRTM1ZUZoMkRlMUhyUWMzNjgyenROaUNzSU5SRFdGdFJXbwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgTWJjbGRkOWMyTGN0RzYwdzd1eEtsc2xuT0tlNDdQ
+NlJYVll6UVhBWkdXcwpVYnNZSDhQeDlhYUVOUk5xb3JlNEVJME0yY0FRcFY0V3A1
+ZDArVXp1bkVzCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBXaktIV1dQdDdsMkVxOU1z
+YjRFWVVPR0E1VWVmVGxFOW90S2w5ZEMwanpJCkw4ejV5M3RSZ0lYYjI4ekp5VDFO
+Qk1ObzNZRDZtL0NFRWJMN0dUMU5NeGsKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFBK
+UmhSM3JMRCt3QVVVOUFyVzJ2MHVVRno4NHE2OWM4WU9rTnJQbFB2MTAKVXJySC92
+WldVV1FoL24zeHhiUEpmNDYvZ1NraUZwQmRrMGVXb1ViaUcvTQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgVCtUb09INWxCVmNQYVVPaXRHS3gzallUS0xjd1hCVUE4TytV
+RFJlLzFscwpvOEdTZEJiTVY1QmE0OTRRMEZlYjRrM21oRzAvbGdMZVVjOUtma1Vs
+Vm93Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBPZEsvbjF6NlZpTmlsVkFpbUd3VTFu
+TEN4bGIzSGlZN0tSZ2hrQnhjYzBnCjNzOGhoQmtQRzQ0bXBSLytid3JaVi9pZnlP
+NHpiOUR1b0ZCTVFPUGFTSzAKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGlGa1dKMzhy
+dHl4NW4xS1BBS3lqdUQxMmJOWnZkaGlkMk5Hd0Q3RjBsaTgKeWFYQzVCVVhGMXZ4
+eHlUSko3dUhVcG5UVGUrdm9lY2FpYjNickJ5WjNjZwotPiBJd35rdy1ncmVhc2Ug
+X0hMXlxLQgpIZkFlCi0tLSBKU1BvTGN6a2JEL043czlmeHdFNWo0amZkelczRW9X
+RVVGdmt4OFg3cTJVCoQXkEX485m5lMpu3aosZI0Smyp+CLo9V0kTfnYGfgcf5tXl
+Foip7PquFErhYrKTumAY0p5VWqdhmTYu57yJW7UeuAMxyBgpVabcf28aFL3ricK0
+CgBSr3JqC2Am9C8Kt4aXm6/m6ylOHFKKyBFcDJlXrgn4c3WpJakAZc9056K+ndMi
+5uGbKZxBYm7TCPvJtt1/78iiBOfrkPRcEaIwwhzSizPC/W0i/QdiWTbzPHoF0vr5
+NBfrIDuCX4ZNfV27nS1vDFfWEynF15vZkszmBSgVz91b0DLarTKKeTGVt/LNimQP
+veUSBa2TAOmf+3OXGPicG/r1hewJtybs7pGMbxFItmjKObgZ/oH3Oa3ITrnVbjCo
+IjCnaFBA/LdoFATLNx1zQh8eNVD1TROzFrgnoyGCEgXTg+FfOAIplFEScq9f3mYT
+ZOWjkqNWWGIHfwOCFW+Isu21EIU+gZQ3kScVbuNSfSBD19cZCsTinR5TjWYgv59q
+N669N7vjX/d+wbcZMllx3ZfBT8CQSf1JCC3a0pzFOEMQdLMmT0HOn9s4zp65kgao
+x8J5Uh5avL1qPTMc
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2joe.age b/common/secrets/secrets/nix2joe.age
index ab6021f..359a84c 100644
--- a/common/secrets/secrets/nix2joe.age
+++ b/common/secrets/secrets/nix2joe.age
@@ -1,44 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBjTXlQ
-U3c4VEZvT1JGS3BaL2Y0WHdSL2VHbFNZampiSVF3cFMyK09FUUN3CkdYcWduUG04
-RHozZG5UVVlZTnBWaWQ2a05nSDdmTzEwQktmMXFvN05pUWsKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFdQdW5yRXY1bTZiaEErb09ZalRLbUV5Wk1VT2FLUjhYczJhSGc4
-RnZkREUKNmFsM3A1RnlVSXBqd2I3Z0tqMmlkT2xqUWI3YWVBSDB1ZDA5WVpQUGVP
-NAotPiBzc2gtZWQyNTUxOSBTcENqQlEgR1dxdGRIZGNuUU8wWmhDNlpUTVMxbzlB
-UGY3ZnhiRGUrQjlaN2tRM01URQpPeVNZc0pOdTNYYXNsWVV3aXpwZDh0V1Exc1hn
-akRTblZOU2hraUUrRHNvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBWRnl6aWs1aE1S
-eGZPVEhsSmZhN0Q5d2RWZ1BKOWJvVmdrM3FIMktrQWs0Cnl4QWxrekNqODl1Z2cr
-V0VuZTQ3WGpYUVlyUlk0K0tPTzg4T1BJbW52aFEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGtEektrc2tDQTloMGsydkJmRERNSmNzbnNoYThHSWVTeXp0NEovVDd2U2MK
-TVlVaXJZTU9tbnpLNHlDUmpJNDFnUWRUQ0NMYklHN2hjem5IUGFuczhNWQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgUkdDZjdDTkxzS0lYd3Ezd0RreWNyOUIreCtTelY4
-aEZqWktsdFJwVHBqVQpQeGRIY2dERTgxQ1pSTE5zdXFGcnZwZ3Q5UlBoWXl5Q3RG
-ZWU4WjR5TWlNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBjM1hFSUk1M050RFdMUHEr
-cHd5MTA3L1l3dkZTQlpJR1ZyK3pGNURqWFFVCmUvZEhvcTFRTU1XV2gvdDBpWWcx
-T3dPUGhVdlo1cThldGN2akRtb3MyRGsKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHVh
-WVloa0VSK241K2Z4MmtnZkVQVGptNVZoL2N5VENCWTVqQ0huSUl5anMKRHVlazdZ
-WmhQSHpMN2hReUdrNG9WdGZZNHJnQy9uTVhjcWlEYzV4b0d1cwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgSVlab3kzbDBEV3dLY1FRTHdCMjNRcERpbWR4SEo1SURKRlFN
-MXd0WFVndwowajdGaXNHaUU4MS8xbU1OV294STFRelYyWVZnekR5RE9VS01pZjlo
-T1U0Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBNdUdMaEFzUzlZZlhDUXI0OWliem5T
-blJMcDdsRXdLc1RydVVoZXdIYzI4CklBMlBhL1BVNWhJNWhHa2hPUldJUmxFV3dE
-QW4wNmlWWVRqQTBBaGJ1QjgKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHduOUFtOCtV
-WDh2M3hHekFsczNGOCtRV213VGlvSDJFTUtvYjNodjc0QVUKSUlmc3RsWU5wL2Q1
-RkRPbnBBeGhnRDdxd1RMbG9sVE81KzZvSnllczJlRQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgbHlSbitWVXdNZ1hnLzk3U1Q4aXJUVGF4YzJ4UllBTUVvTUxnVmV3UGlt
-OAo4STRlclBQRm45UWVOSGhvQ20yejVaM2VjL0F2WkpiYmlobEVLOTNQU29NCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBQOGxxZktqK1pYMkpmUUVwYVU4N3dUcTcxcjh1
-YUY4MFhwVVowVzBvbUNjCmdUWVptRHc0UGNja3V2MGNBOHpHZW1NQWNsT3RDdWFB
-a2hXVTJqeFh4K28KLT4gUiw4Im9XVC1ncmVhc2UKbWltYXFaemp2SjhpczVQRGl5
-NAotLS0gMVVrTUZOSGc2Nzh4VFYzOUxsTFRrNUZNeWozRUdDM1MxWEhXU0FpN24v
-cwrts/RxCDD6wySEPrydlQ9kqSgrWR039uzPt8Qp8eXz+5LPJEnzMZ5kkrODTahX
-UaE4M8m9w6f8edHtJTQzkujqNEDDkf76uCYKearh9DmpqAKSoxNbbtPiyrbyQFy9
-sD7zdBUiawt/LHYT0IfDGlR/giD1rRmyzPvmvpAR4lj7ou7zcbx76PJPZeCjwIj0
-CTlpOMK0/9jJ6g3iSXpNvQHpJaP6AOZdkIG131zcvRZP8YikKE+2OBmLZk/P+Lmq
-DgsHcY9O9UppHdciPt4i0WkSxCAwpLZIIfjmpAjFF8p2E1rm082GNyswQgmF53Kk
-StAMRtwW1ZI6ylHILR0YMtpJXl7pEMDZi+uZtH01o4TOlvgF2WuVlp9dIwHUfQyL
-TELLVmS8BZXQ8EDJtPpjrgJmuYTN0KaZmJKGrE+Dg0K2AoCsjySthDdNijJ3Ms04
-UFbIQsO6r8W6JO5CYCC36yOXwb7HupBXxYUzrlMnmZRniXWUJWCeFT7qO1e9M6El
-TqfC1v5Uzv+ZhXYzrZDOFXmFfUsEeUCzVR1RcVk3czRZabWP3sgfl5W9evwmnbVC
-OQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USB5em1S
+Vkcyd0NFT2EyVlBuSmI5MmEzVmZ4TmNCdXhWMTFBREd6TDhySFJRCm4weWZjdlF0
+QXIwSURHWDZ2RWl2UEFSSlltdHRNTG02SERPUCtrUW45SzAKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGpWckxUL0t1a3kvMGFSSVNCN281djlYdDNwTncrMHMwYmIvOTJK
+Y28rMGsKTFMvdzNqNS9EL0w4eVpWQlRpS1Mwdk1HRnZVM0c1L2h0Zndybm5ra2hP
+dwotPiBzc2gtZWQyNTUxOSBTcENqQlEgKzFna1FLSHZxbWI5OVlpM3ZSOHp6QlZX
+L1dyNnBtUThUR0VjYTdpaHNqQQpVeEJ1RnZzTnU4Vk9sajQvNGd1azZKUUZ2dG16
+TXUrYnI1UTdkclRCdnVZCi0+IHNzaC1lZDI1NTE5IEJZS0crdyArbmdIS0ZaSHpr
+RC92QzM3WjlYYTRYcTFOUGhPNDYvSDkvMm5RMXJISmdrCmUxb3hvVG4rek9SMHhI
+dlp6VUkwMG1JamNGOTBueVNVU0hsWVZTd2owRkEKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHBDWFN3dmlxL2R2dGp3SWhJYUovOFZoUGRlQ2w0VkplenlCVUpwaTk1VWMK
+QlFlbnQ1aDJ0QzBMQU53anpNUTBxbUZDY1ljOTZ4TTcyRzFjQldkZTFmMAotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgbDNFcTdJR0ZJVkNJRkUyR29CK0t2V2w1Yy92UzRh
+WHJUSHdqSlFnbFEzRQpLN2R3dldoNUFTQ3VndVphbDhUWWJtdmhkVkI4alFkdG1N
+WUJWUm81SmZBCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBKTzgyckMzMklZM2RhZC81
+cnBMY0N3U05XUDNZSTdWYldRcEx1eWFNUXdrCnhlU2FyNDZ0Skt0VDBzWkJMUGNq
+YUxxK1YwTDZTV3cvalRsamdHV2phY00KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFY3
+cDYxanZRWHFlTDZPT2Jod3pNLzRIWjFnMGdHaHVROGlwVlZWaGZpeDgKT0M0YWZ3
+NGhPdlcxQjdrTms3UUp0TStUazFHUWtGVDFUbnZZU3hpVW5yWQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgZlpaUFhnT0xXQzRuMHJmeStCTU8yQ05FRmo1RmJ2MDlnRGdE
+ZS9BNmd3UQpiMkpTTmJIZUM1NHlQN2twdkZvUzlWSVhzU3l6WVNVcVcyRTBsMDlh
+TmEwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBIN01sZnFrUk12MnJ6NFMzelpJYnlC
+UGlBbDluYlN1ektSZkxBTUlINGhJCjFnQWFyM0hVajBHblR6U0hJNjhuK3psM3dj
+cXNPY2tIMTFLQmsyL3c0aEUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDFIc25oVkZX
+Rms4a2V0NHF4L0ovbmlDb05hckJkZUNIbkdGVzF4LytkbjgKUGFMOE45VXBtUlZl
+NlJCeml0ZGNlQktWWFlzRnp6Tkwra0RjWThIT0VUYwotPiBjLHIkLWdyZWFzZSBw
+ClZwdHVUVlNLNVZteEtOVUhoUXo0bnNFOHIvTzJYNEwzRjJOZDYwUysvQmdpY0Fu
+REhicEljN2RoK2VldG9BCi0tLSB5Q2h5dGdZQURpT2pzYkF2QVBnWStpNTl0Wm8w
+OXEvSWxxUFBJNGhRK0VvCnEE9IZkJlvovun4LAyNFKRfn5f3vC6/+Q3QTrL5AOuS
+6UsEYBDc0gaXl8fy/7B8tW2slsWuGnXE8qtXZS4l6jrg/UZiNGkXFyOjv8YhezDr
+QvkBNtgTdjzObO7g0QYoH9cgANZguIZgRKrkmZnKMjqhm+etXFG1v8LYUABpbfRt
+LECIKGLDLgoRnZFaQbgZuVjDZlbKa8bCH0Nz5R5RiJWVlc+Qv37Jau35Qo3dsQgW
+pHlbp/JAIYJc208scmeLz2DqM+1WY01DlGbvcsVnpYn/AkjAN25ymHaZRqj/wAqW
+Zf2GzfpF9B2PeqWpELw6Ag0hWWbsaIfm+NVGYmkMaJf3GnRcozwi4WwPmLle24+r
+bsPBlmIFa/GLSZa3o/EMwZ+uJ7fxMPZGFcLr3s84fSd/7DKhLt6HeJWJfSE+5Tv9
+HWzEy7XU1wz6esaGAMn1KB7lt1o22qoyChEfjTpJUBwAmICnNb3n6l+SDFze7k/w
+IytdbHOcwrbIJScuxXMT1KYuB50MFbZpxGFsjBUfqfoM0vBdxC20NO+T2sCH/NiS
+Oe+f4VrEWDnWkSLTKJoR
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2l002.age b/common/secrets/secrets/nix2l002.age
index 78357d0..4efb4eb 100644
--- a/common/secrets/secrets/nix2l002.age
+++ b/common/secrets/secrets/nix2l002.age
@@ -1,46 +1,39 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA1Q3VZ
-TEhzdjY4b0xCYnd2Q1UzemQxK1VsbmRkUlFtczBXaXlnL3djTFFBCnNndVNIVVhh
-VThZNHpWRkZPcTV6RHJQbGdrcERuYXFXeHdKQjhKbGZxYTAKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIFR6U3FoRk4yQ3Ztb2kzY3FEM2xha3M3eXBCVnF4WWVjd2Z0Z2Rp
-SW5lZ3MKOFZOalNUdm41YWFrQ1hXc1VtMzhWbGwwbFY3VUJPeWFpcmdmT3A1N3BF
-awotPiBzc2gtZWQyNTUxOSBTcENqQlEgVmo5d245MkF1a2g1SXZHKytFOHM3UXdp
-MWh3TmE0eFFMd1Nib1RFbTJVOApaZWxocWRyTGFJbWZzRlU1L2ZSL0JkWUJVaTdU
-KzM1MzkzaS9qMEFZWmhJCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBqaWR5SldpMWxK
-b3B2NTFVY1pTY1dWRkpEZEdlMXN4QzhSWnRiUllwM2xFCmFydTZuK3h0Y3JCSmIw
-YW0zVHRXOGNqWVdFa2lCb1Q1M3FNYWtsd1JJV2MKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIGY2elkzTm0xRTJXcVFKR3NHcEg1dmNrNHU0ZzNqUjA0endDZEluV29PRXcK
-RGJ0cStnSXhEa1c1TUg3eThyUTVJTDA5aG9uWmpwUnVRdjI1SmFtTVBHQQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgN0kwOSt1OVVjWXhEMmMzejBqWkNaRXRDZ3FjYzBz
-RCtoQnh5TGxYeWppUQoyeDZVaCtXT3ZtRkUrbmpvcVhpRi85eFF0QUFwSEZEaFA0
-d05Ec3dlbFBBCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBZVDhjK2tsOTF1enhSQjAv
-VHJ6RXhWbUZQNEd6ZGV3bVI5VVdmY05tS0NZCkY1YUdsVksxa2xzbmlPdjk1YmQ4
-Rnlzdk14eDNrOW5IZERFcVl2bTgrSjgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGRY
-dHpkYituNGVrcHoxZGk0UFYvT2pvRlFPdTUxOGprMkc1TEVpN0Y4WGsKOFRGQllL
-M0N4bFkvNkNTQlZEN3JlMndXWlB1Mkp0Z2xSbkQvZFNiQVVnVQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgSHhGbXV6UStLcmpqUHpoY0R3dFdoeEpoMUpPN21pMXJOTnhS
-VTNCTXBsZwp3eTJFc1FzT3RSbVFhZlFkK1F1eXpHeTgxa0RrYUtueTgrMnBnN1pX
-QURnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBBUG9iejBJd0R5UVNKM1ZWMVJDcjJY
-N3ZuWjFpREoxcXZSVUs2cDhLeEU0CmU5MFpsa0s5NEhGOVR1UWVCU3hUalozbFFF
-a2tnc3I4UVlHRlhOWnVjREUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRICtYS0JJR0lk
-b3JaakhrOG02TEVncHRTNVN1UjFCejJ2azF3TENHU1h3M2sKU0g3THZXMnFOeWFX
-ekNDSVhTcTF6SXo0dTVTSVdRUzhaMXUzYWJwNUpobwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgSVBHTU11eS9jejdPZWVJMWpOOGZ6cVFIdmpiajRHeGMwQVhVajc4ZGpq
-MApwNjByRmVFem5Na0RabTFhQW5zd0N0cmJEOXV0MkgrQUlKZnRrUFZEWVhJCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBlWkVrd1YzOTdQK1IwcWxqWXkrN3RvWHJHbW5r
-Q2ZRT2MweFppN0hISFFBCmJ4MktacTcvWGVUSVYrNS9neVRPdms5WGJTaUxkR2Qw
-WUNOdUxYYU5lR0kKLT4gY2ctMi1ncmVhc2UgXWxZWSByYk5cJS1+ICQgeToKWWIz
-R2s4V2dPVFJxNE1lN0QwMUhVeTR0T0xiNmNZNlZweHp1S21tK09rYUsvQkFydW94
-UU9DNk1kbi9pVzlFawo4ckR1eVlWWVY0NzkwaUJ3S1d2eGNiRkN6YlkvZTNodC8x
-SlhYNytsVmVYT245TnM0NGRQWHVRQVY1SEgKLS0tIHV0YVBYblZ5WEdJZnMxd0tR
-b0hJRVlZN3ZLU0x1OGpGcWpvSk1HTDVOcDgKG0WYxcx4dLIm2aiV+k1e2ZCH6esO
-JLANoa6fl6nj8ea56EpfaJ/jHTKBYubFbXn3fhXizWj9lIvmmqkoZiCfACGVM2SZ
-P17CZLwr5W1/uXQwBaHuG35fejB6ipIg+QD+d5r4XQJIWik/fVAkuQxnG1PHIT9Z
-8j51dQD1mENRsTE0xFTyWS6jP/B808Ewvtm59Jf93yj/4KZMGohepb78u2L7zox2
-NDEEEPTFQcCXFBNCMuvpS2tViLnxbCXW/jyTHMnyTxIJwxdav9HjqTfH13flIxa4
-wSPJgxnK3rN1ppvoDempolIqXKq4r2o2GB4hf6ER4F3G4rH0QWNgZ6jcjOL7p1RT
-Fg0wBU3q7EoYlnvNGKWOVwK+Dq5DnPi2JuhNv1UvL/n6SER+TJUjBrukFeOd+32L
-v0FXa28a6Sa6A1e2vuDaJh+Nkq/sXrklrvj7Qa3hlEgl0aVDWqIftlnT4JqaLlE4
-uQVV3IsRLp0m3pX4uvk6EKvt7QahlXtfC2EPq94RIsLe9TFbdnnXexbFjIwLazx2
-Jp7ZN+b1POMFxLrG7Cf4/4L2sDmX516miPE=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBUQjk4
+R0k5aTVtbDdJbXNvV01Qelo5dEhHMGdCQ09PK2k1K0h1WSsrSlNRCjNuSlZYN3BJ
+MHpxZHRyNkx6U214TTJmTk1vM2dCalp5Y1padFdaK0dUSEkKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEI0amEvS01qRTE4VWNCOVlFQWpwZVVOQXpwclBnN0JKaUppdXA0
+c0RYUUUKOFpKNG9Ud0FHam83V2NCK1UvYmN5YUJDdjM1Q2luRnJ3SVd0elcydlVh
+MAotPiBzc2gtZWQyNTUxOSBTcENqQlEgZ0VJMHBXcklrZ1RmTFZ4NU45V1IzRldH
+clV2a0RPT0tkaVR5UlozbnNDcwo2b25DZy9iN055VHJsNUp5S0krS1ZzTzhKa3lt
+aFR6elpHT0ZzYVNEYVlRCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBMQ3I3ZG43WkdC
+ZjlTMENVY3UwOVh4VE5GNnE3NW9ILzJDRmRkVHV6a1VBCkJ0V0FwSXQ0QmM0SG5i
+ejZ4SDlBWTlvbmZtSHJTcUdISDFQWUQxTVJicDgKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDUyNTBTOGlKcUttYzNZL0RGL08zdmdwL0hKbTBwZ1FtU0xOcEt3am9LeXMK
+L21ndXRvSGQ2R0VNNlFsaUhaTnZsV0xsRGRPQU5PTEZCSUlBYVpkRTR4VQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgNmIrMlAvS0dRc3p2VGFUV2NDcVBVZTg3N2diM3ow
+djJ5cE5ZMUJ2UGRUMAp1N0ZhVEFsQ1piOUVYN2tRYW16WjBPNjIvNDl2bDdIZ0sx
+OEFFQWZuWjR3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBSV3EyNS9LaFpkdGNWeUVF
+cUVqd0ZSclhLVy9vTjVpSURsVFJ0SDFiaWpnCllUdjAxMG5rOWRWSGwxMXJCbk9r
+NUlZTzFYNHBXdDd6Skd1Ui9EVjY0K00KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIExu
+WkI5aHV5THZEbEZZWldZb0U5eDl4R2d3OVRGUFh4K1ZXMUpBZTlVRFkKNTFZN2d4
+MjlLUk50Y0FaaFRnZHFQVGtWN0V6Ym9kb3J1ZTFkMWhxS09kTQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgbEtUaGlPSFJNUTlCaTNTZjBVS0gxbjFKYjNFcHVxRldVZUda
+ajh3OGJnWQo1dGlNRmlRZU9IL2F1a0xWemh0Y2hBZ1A1b1NORVV4STY4Q01Tbkpa
+SE5ZCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBKOUtiOFljK3NRdE40MXNLQWtnK2h1
+d2xIMnJYc2hib1hDTnA5elhGWG0wCm1LaXptdUxaTHkrRWxBY2Vjc0tUQmIyWmF4
+cnFubC9NY3MxMmJLRm5Ra1kKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHU4OWNxajBL
+dlRwSHNxUUREZ2tVcUpkUWpINmVTY3h5U0Rza2Z6UFpuM2cKMndKSklhOVhEeWt4
+WDRFeHVaSTh3VHcyU1hhKzJyV2lwMHVpWHBwM0ZpMAotPiB9ODdBMj5PLWdyZWFz
+ZSBxLkkKUXBzVlFKawotLS0gSmczS1lET3BHODZIb1kzdVlxVmJyTnhnZ1B1dHU4
+VWJyNzdhWi9sbUJkZwoixf1N43xLWsnwn59HIDqvZaZJ4DZQLMwZV35Q8JQ5Rox5
+ZGyvsR8YCnuXeN4PuycqCYeDZrCPpauY58Ga4A2M+Ix+BalNNtDCV6HEFPsfeWtu
+7tp/rvWMEGKJqulYysuC8uXaWgdc/FMcOhr37b5ErH004RKz/+Mr7Cm9h81KCwhb
+MX4uGWYuhIEATgLaY30djh/eZasKpLN2Fk/zCsEm8wQc0BAF4b0VNMlJsRSEWY8h
+kDDplK++qfp1J0fpCiPXCO2DmgKCrG2D9g5/ahh0W4mQFM0MRDOkmL2VLnHUS4Z1
+CfE5j5/7Xk+eCP44WqOFS/cBOduty89oYbjfwio9Ep2kfBpM1jGSOHyNMMv/oUOr
+LjwLCUVcMX/N1lsQD8Q4Az98QpNmStDfIbcjYLO/c6eAkRNmYDiS2/Zv6gd5NS+S
+jkULCWsHDhUssh24Z5yvwLW9lsgkdTF8Oi7crGaJsy8UJBY+3Dx6qV7UeXXLa/sT
+DEi0CvB3iZiqmyctLDMUI0F3BibasRnCYYsNM36vU5NviMj9wh3DXiAVaN9/QerP
+vLVf8sjTlRFO85bZyw==
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2linode.age b/common/secrets/secrets/nix2linode.age
index f4c3cde..ac062d9 100644
--- a/common/secrets/secrets/nix2linode.age
+++ b/common/secrets/secrets/nix2linode.age
@@ -1,44 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA2WWx3
-RmQ2M2ZMV3RDWHREVjhpUFI2Q2RoclRpYkpXRnJNeHlGNFlGaDBVCkNLTHN0WjVv
-am1udEhVZFllRThFNGg1VkFUbVJ4UmZ1akZhSEc5dk4vSFkKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHJQNmZXRTBGUlVVak1rNjBrMDRDa1JKUmVWVGJjVmluaEVTZkxh
-SlRiVUUKSTlIdFV5VlNyNHVWdmUrWlFRejBabmNXMzl2L2hSWjVSQ2dobCszaHY3
-MAotPiBzc2gtZWQyNTUxOSBTcENqQlEgOGdQN003ajZMbUFRQW9QWWppL2hFMlRl
-UVJVdGRRVElFZG44MWhJNTNDUQpVZXkwbnd3VEg0UjVBVlFJbnVqUlVMaGdpYlk3
-WlRTaW0yTDA5Uis2VldrCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBTZTdkWDk4MUFm
-UDh5R3I0R1V1cEpHWU8zaC9PMlF4OHJ5ek5qc1Z4UHlzCk1MMyswWDBVaEFPd0Ji
-SWFyaUxDSFp3TTRMZFp2ZWh5bVJ0NzF5MUJ2aWMKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIFRSbFp1dEJFejJyd0hEQ29UZ0F4U24xRmV3TU1tSVRIaDVCSUVqVnRsRUkK
-cE9LU2VlTGl1TzY2SVE1QUdDOTJxcDBxSVA5Yml2U3JzQTQ0K1JXVFpvUQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgR0pLQU53V1VQKzE3WlhNMVBVRmRHOXh5RzRRcExZ
-VUZndy91T0JOd0l6dwo1dDdESFZIS3M3aFZESUZzVjk4cFdkeEtCKzNrLzdnRXVz
-MmhmUkNiTG84Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBod3NpaVMyckFyYWRtQnNs
-K3dPNUFTNVAvMlNsWEg0QW9nVitDREszSFVjCkVjUG9pZkhQa1V5bUpaNXZoZnk0
-MVhyMmtLOXIyL1hHS0Y4WTJDa2dUZ0UKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDcw
-VW54ZzZZYjV4dkcrbEVEWGcyWUh5eXNsMnBRZ3VxSWVwdmR5ekdsVkkKL0pLMjls
-cnQwSU1XZjhhMkdpNzhkQkhrMUI0MllNZzYvV3RkbSt6MUovYwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgRlhXeThTWDl6T09tL3doRzM1blJTWmhOM1dycDM5dmJnRStv
-bWlNUm9WdwpEblo5MVc1T29xc1Z2VGtkaXBIWHkyZUJnZWlLM1E2YXJIQWhKS3JR
-L2pnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBWOVdpb1ExM2NuK2xjTGdOVTJuMzhT
-aFBqRTFnc3NNdHZPdWpBSzNSeW1VCmZGSFFQRjM2SDFhY2dtdjUvRVlhVzhzNDFy
-RjFTVkJCMk1RcDNvcFUwL0EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE52dnd2NFFC
-NHpSV3NNZlU5VlhpY0UycUl5ZTZYTkhSd01MUGswK1ViMHcKZVF6RTQyNGdRdmJQ
-MGRFOU1KTkg1cDh0N0pHZWNEaFEyWVlwWnpNUDdrbwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgRTR5RjF5MHM1OXpSbTFmejUwd0hNdURsUU5KT2wyQ2dsNE84M2FZOVpT
-TQpsRkxLWFAwUlR4d21MNTcvYzBIRXRXM0lvMnlKZFNwUjBTeHNTUU5PWXEwCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBQcDk4TlBPaGptRDdrMmtIVGRJdVhuUjJBd0dL
-WmRzRnl5dzNlZnZkeXhjCmpBdWVUNXNsdHBhV3JFNlE1SzBCOE9OTitnc3NsMXg0
-azRSall0ZkZCdnMKLT4gLCwtZ3JlYXNlIGo0MGkpZiAwQFguUzRdciB5ZCdcUQpk
-dFZIenhXNlAzaFRDcWdBdW9ac2ZaL0luclhJa0FsZDFRCi0tLSBaOWxEVFRtanY4
-NXFkUUZLdFFxRGU1VVA3ZU92VTJPYXVaaE14UTJrNjlrCj9mpRaEWjmSyXiyEUl4
-r1Ix30lrwEBo90ppY+Lj3L5JmggXi5LnCkKe3gckcDdfJrFAb59YfJGHye0r19Ut
-v/9Ep/x7NXW80MAbmlPpqAqRAzR+o+X24dBGYeGGbjD1GAOizRicJnnGfcKhXAqs
-bF/A7GFSChLY+/qzhrrSiecO7rO3wJ8yBhqgKVzHawUuRmkNqGek6PVUIsC/qKnv
-Mi695NsEpZUV+mh6IuKZcyugdhYeJUKEsKcsBMnx0jSLYy50U29A3VfOqx/dNGyk
-MgrKRASfHikCevWRZFGHKUwlPmSyPx2hTjKaytywsNoPGKgzIlIwzdOjXAa3Uw61
-FnI+vFwco8FC7wK40cF5Am4WVUlcA8lwaga1NIbcbFuCpj10RUvw8IB/6Qh2uLvt
-YBhfQbWed/SPdefH1CBzJPcY9yOJAvo1ZnK24l0Ei5mFHyPUxBGlOX5CclGNBhiV
-D1F8s+H3AN1nHyAPkT3ZmCwA7YlnU8vP+9VbTkY4zgxDqn66RX9uh0sQLzGqWAYZ
-d+dskYNSgVuGocBCe7aIaU+pGMvIJIz8KMNEp88iNfb8
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBQQ1VG
+cnB0WEtRSTB6eDNZYXcwNmZwL1lTVUlaT2lvaCtHQzJKM3VRUWdBCm9WV3ErWm1L
+MlJOMG9abnZjUkRrbi91d2o1emp1YTRYVkhZSDVIbWdzZXcKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGRmT0ltdFJYaHhGeE1oNlRsNEFrUlVhUDZUSzM0YUNvRktGM0pM
+cmxqaFkKOWZXeGJDQTUrZXlmRE81MURDL2o2SkpjZ1NiRWRFVUNlTFlsZzJTUjJq
+cwotPiBzc2gtZWQyNTUxOSBTcENqQlEgaTFWdG1LOGVGUVlrN1RnaU11aENxWXlh
+enl1YnB4MjBMSHkwQit1ZkQycwpNQWNFNkxQUmdWVUxQOUFSU3VORVpTdEFnNitu
+YStFWG9ZaDNwb0NNYWdnCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBMM1dEYnBmL1Bl
+RUhURW44WDdDVWVNSDF6aEVxRnlqbW1qQmsxQ0g5b1FNCmhWcjZIQ1l5QndIRE5D
+dE44aDBzTHVGWTdEbDMrbUo3bDMzUlhrdkM5SjgKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIFF2Q2VJT1orUzhHZFRLb1NRNlRaMlVyK29NVGQ5NjZZU015K1R6cHVwVVUK
+WkM2WVJtWUk3OHNZb1pXeU9KZG9GQkJvcXFCd3BCL3VOcUIrWS9iQkJXQQotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgRkFtblVwZGtndlJUYkNjYmIzdEh5am1IYXFUNFBj
+OExLUi9NckVxS2JoZwpHMTJ3cUU5VCtrUDBlakNxanJaWU5zSHB4bW9EKzhjUlZu
+R0U4c3hOdHBBCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSByTGkyZmY4aTYzQTBxV056
+OWNzdHNrMUhqSGNvTU9VajE1eWwxNmo3a24wCkNGc2w5cEhEcVBoZllOM2ZjSS9w
+WEJBcTRSQVUvVTh1L3RJRUpKUVNNRDAKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFYz
+WGh5NGEvZ0EvSkVFamVpeU1wRWVjaE5QcGl5d3FpaTgwZFo1WFhla2MKeWNlNDdP
+anF2K21peEVBakcraDkxV1htU0VXdVlKUHQ5Q0h5eDBqSlltVQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgUXlmSXliZFBzamlST3lkTFFscktYbi9QTm5pelVrY0Z1c2J4
+WTNDc1BsVQpxeHZwdXI0UFNMSER0WmZ1Z1lrSDBibGd2cEJGQjQ3VnZmRWZFMkw5
+RklvCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA2bjNlY0dvT2JjMFp6cTlXT2M5WjUz
+eURzaHNKN1h6SC92Q0xsOWdOSXhNCjJ2dDdGNWp2ZmwyemplRFk2SUxVMVdFblFn
+eHNkREVhZ0k5aFZKTnY5TEUKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIHEwVGYwTExB
+V01YT3dUZlNWV3Zwem0ydXFtQjlnVWl4NW9FRVJEUDNEaGsKWW5Cb21mZ0FFZ1h6
+YUJucVc2amJYeFdHWnM2Y1FqMjdkZTQ3SkIzVEFlTQotPiBJKHtyey1ncmVhc2Ug
+OF0tP1UlXyggKCcnXU5FIHwwNlZtMyBsVSckS1xSCkVUNmlxLzVvZG1QVXhacjdF
+c0l6YzJFTlQ2VVZEeGFoRzlVCi0tLSA2UTFTQlh2bG9WS1l3T0J1ZjdhSzcxOUd6
+VXA5Snloc1F5bTMvSi82QWVBCrpftJGo7RMOlfmxiUgnwuKVjo97b6fbgNgJaBBb
+6nXQfGOxsfWDv38CXuIA0QVuarawk6MZUdeflEoH8SlTihZ/YGm3m66ddUGSQANB
+QLl2q3iFpmrAgyYMYh+3htHhxeQ1XqUGGYgQUFqaD+mevmGSRozH+3lJMi9x377/
+qI+hSy3WZTg4A3czLk5xu3cwr3jTyINBz+yWKudtGmSmPZEoWYOtv9+jWmEsZ4rh
+9dkhqdas89zYBnAaJ6T8aS9O5QnVPqpx/5AzK1YCY/aRM6TJMAq39fttbmAg8P4I
+ueiHAEdmeNpdHpPy3fbw4uPjlr0u0olBawE+XzpziwA+R1+p8pb7BTrbvNL7tT+U
+kUojuHBVsS0f1/FD+LnHXIUU9BEq1Ld3+BOewyhdte0C+FzQcwBID3qMrapOwcRC
+SK8xwNFwmxUuwFuA2uKEmnVyDGFIkOUymSrMlfzc6GzSHWMIhXnhi7mMknYCgSNQ
+WzfLPoZevuxRZ4jXi9/O6/35eYjK5tapCuELRnzTHf27xaYSWThv4fBEg1JntNOd
+rz/5PBvnlsccjJU73UrB7A1r
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2lio.age b/common/secrets/secrets/nix2lio.age
index 04e8458..219d288 100644
--- a/common/secrets/secrets/nix2lio.age
+++ b/common/secrets/secrets/nix2lio.age
@@ -1,45 +1,41 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBUYWNn
-QVBoczYyQ2NuazFyRlpWdmxMeDZKM1N1RFlpWExkdm15UnFXSzFjCjVYUm9PNURB
-R2paemlEQnFLemJRWTlTV1A2MlgzbFgrMzlIT2o5T25lVFUKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHJ2NEh1QzRVQ0gwWUhlR3ZHelk2OUhGN3d5SWIxK1NHeHRvUmpp
-eWR3ekUKMHNldDJGYmtUWkNvS1hWWnZwaGxUZUw2MWdhcWlNcGtBdjFWN3h6dm1s
-UQotPiBzc2gtZWQyNTUxOSBTcENqQlEgYXIzbkpNNUU0bktkeTZZMktya1FJT2xT
-aUhHNWxFWHZJVVNkOG5GK25qdworMWVUMTR6YUc2cmJKZmpVdE16ZDlMOTcxeWJh
-RlowUG5lZGp3TDlpQk1vCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBGUDZJK1VRQ1pL
-WlkxcTBNSWJ6M3krSHRCN0t4RFNTcDRxRjc1UkkwU1FjCmU4ODZoZU9kZmRrV2RY
-azhGdkNSLzZUcGVIRytWZ3ZXWW9ENGl5amw4dEEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIC9nbWtEYUg5T0ZqV1NvZUl6aytoU0ZPeEt0anJobTdmMTRtSmNvYTNreE0K
-VUlKbTZrNExCdEdseDkwVVVzdFJWYmp4bTB1cm5UbytIekp0WExJMDhXOAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgUXQ2TlYycUxtb0M4bWVLQ3JQV0o0azQvU1cxQzRK
-YzNkTEFndHdiU2tHawpXb3FyNDdVdGJsb1FMemQrdldhbll6bzFCTWtsZ3VESHln
-S1Fna3U5aWN3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBvTzFjRVZscHlmdjFvV0hw
-WDZ0b3V4Wjlndnp0b05uT00yd0pNN1ZiSFJFClpGMjVoM1dySGtESERpS3FzcG5x
-dkpRS0NLUDlTV2pDQzVITTZrMmxuczAKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFJx
-SGxlZG9nbmhYc2FFK3RUenBvdEp6MHhXTjZqQWQ2dVpySkp3eE4yU3cKcVZ4Z3hT
-cWVybUNGRW00S3BoN0lQYzBHYzR3L3A1UnAyenhwQTUxOXcxWQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgMk9vcTJoZDByVndWZnZ1WUJ6UVZrNmt3eUZLNHRERm9NMlpO
-SFdibisxbwpKZGRkbVhHOGlwZHgzUHR4dnJ3RWgxbmhJeHZLWlFrd2hQUTlteFNt
-a0pNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB1aldWU0NSQUhBQVZYY1JOeVl4RmFS
-TU53Y2NuWjVnanlqOGpsZTZjWlI4Cm1jVk8wMUxyYm5DencreEFlaGVvS0ZHQ2JZ
-VlRaQVVlc0pDckRWQzM0R28KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIEozZ1pRd0JT
-dEJ1ayttMzMwQkEzWkVYM2pMeW1rWFplSmduS3NMUytzUzQKMVJpM25LSFlpS01X
-L0FvM1lFb2k2eGlGeHpuTTR2VTVGTVRTUG5CZ1p4MAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgalMxajlaMUFUWTdtTWExaVFveW5ORW01TzBxRVRWYmhxNUk3SVJNZXhR
-NApIVHN1L3hxM3ErMzROZkxuVHYwbjNCN0ZZMmwwM2kxcThqdFgwRkNSMTFrCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBvc1BxcEFCWVRBblE4TW56MFBMVENoUE9rSWJQ
-WlhycjQ4TnUwUE9XOFI0Cmh6TkJ4eGd6RFhzbDVZTDd4NEZ4cEM4eWEzTTU2L0lG
-QmJrKzFpZzBiOEEKLT4gRzlbLHwtZ3JlYXNlIE9lIGM4VCBtRCB1QUZhWUddCk8w
-RmtVVkpPQm5uT2xiZ0pGVEdRc2VBcXM4K09xMmU5OUgzQkdZRGMzUkd1aXI4a1Ey
-OFpjZwotLS0gMUZUbDUwVFYwV2I3bnZNMzhTNDg2WjIyWlE5UTVGMkMyVjRIYnZS
-WWlUQQrlJLukoKS9qcIcd4Rve1hfyGO5gHS6tp0gtLLO7OHAk1TMGBEidRCsWrIu
-7vJtuYigjPLEKMnn9SKJcIg3+/PveHkUSRQQmZom6ctIXbyDQUSa525Lp5IFjfWt
-GjbQTfF+rhFXL8kchIYtf9bLcLhCHDgTETNRElUB5BtrDmy3yw96fCJ5JP1YulR+
-DScffzLnyY9ByJArx/KXGDkkYQWjSN5bwFYSqfF3ks54nOZGPHbavLlOFxRftDtw
-Pe4aFxUFcu7j7+YPL30wZH5gPfFSS6AzgivFnMevd4BTrN7PGyu7AdKnbaFdrJkF
-nqoyQ5L9YX4q8wspzxyTVF5HcBubg3o1a3exWVNSm13ulg4hEs/FQ83fVfh6dfyG
-PVFI0rJw7YKbX/8dfH7DJ6r3cJ24EHMLAEcNMjJIp7fVBY+4uG4a9NAL5WwJQLoP
-R+aExrS/nsDYuqinvgeD0Fhfx/jejvbHYOSZfiMZ3FxoHgRDpkvtIpz01yh+a4Gg
-l/hv1Rrao1Af/vsgd7UsJFXazuwYKErNg72PejkWR8vKq0/N5lgF5HIImFWGAE4l
-bFllHQ==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USA5REFK
+SXBXcVIyVjZlKzA4UUVQbHhJNjcwc1JXQ2RPTUhPVERWWUZCdzJRCi9CWndhK0RD
+dHZHYzgrR1hIZzU5R2s0Q1N1Q29pSXU0QWNqazE3RHZEcFUKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGYyVGZwMWhNVTJHVTduNURBM29WL3ZHVkJJTVZzTFRJNUVTdm1R
+SEJVUjAKR1RVR2FvY2NSVVBaaUR5eU5Pbm9BRXR4QzFJeENxWmFxS0FjVFN1UGxL
+UQotPiBzc2gtZWQyNTUxOSBTcENqQlEgTE9IaWduejVsM01rTnUyVEJucm1wS2ty
+VjZmcE4yenY0YnVvdDI3TXB6YwpyRnN2U3FoS0lwYmtzNTVXSFBYZm4rOG9sNWJX
+d01jcVdmbVFLK0tiUW5nCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBCSHQxV3o2MkVh
+SGlnMTNOWXNYMkc5YVVtV2hEbFdrdjIzRmFkOEJOd3dzCjhaRjMwV09IYjQyRnVa
+MUs4TS9zdnBVQis3OTEwZVpWOVFvWVNNSnZwVWMKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIDFVby9DNGRqbE12ZVc1OUpxUEVLRkRDcmkwK2ZjTExQZTUyemNacjFyQVEK
+V0M5ZXVHd2JibCtFdm01YnRRU3Jwa1VDQTZxRG9oZE40bFJKMzJ3ZXJmcwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgcTMzTmp4QXVGaDZ1akVIWktmZkJBZnpPTitwL3dq
+NnI1MXU3ZDd0Ym5ubwoyTllzNDNFWlVYK1pNSzFISHlBYmwyNHRBVHpxUy9LUjZw
+L0RNemwyTEhNCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBhblRMZUhTTi9nTWJGZHRk
+MUhCN3lsUW1QSWZKTWxzVUk1ZmdqMmN2SW1JCk9pd1F0elpucE54bWExZmVUbHFB
+aXVEMFB3dnB2bEtoWDJ4bFkrdDFYZTgKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIG5S
+UFZyc3ZyRW1LMnFBQStUa2VkV3U1aWVSbEt4UVYwTXdmaGZMeEFvajQKeHM5b2Ru
+bDZNb2N1MHk3Q0Yxc1BodnJZaU03alFXeDVCYnJzdXRRajc2ZwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgd2hVa3VkbzBDbjlLcWJsSGxtSmhHMWJNUUNkSnlwSVlLcFhM
+b1cvM0RWYwpBRjc2UmplVDBzek5CVkZKUzEzQXMzc2F5cytaRzc2SVhpdnNhQWFX
+bmh3Ci0+IHNzaC1lZDI1NTE5IDVhZHFNZyBBN0pnSm55czgralJJK0I5SHJKeTh0
+dWZoYXEzVzJ0TDY4Zno4MDQyMlJrClE3b2NTWW4yUEFMaFhEOE9DVG1IZTR4dFBo
+UGxTZEYxcTlUK0Y3UGJraG8KLT4gc3NoLWVkMjU1MTkgWmUxTXdRIDV6YTJjUW1Q
+aTZvTjYyQ2lKUWlNNC9UT3I2T0RpTUllcG5Od1BUNG51RncKZVYzbEd6VjZKVEla
+d0lPTk5iTzNPTURrNGVjdzJYaEhoa0lEM3piaktwTQotPiB4SDZfTT0tZ3JlYXNl
+IF5za3tQaSB3XylqLC5lRyA+XW5AMF1qOyBsdDhiCkZpNFJPaXJJSG14QTZDS3pz
+ZzRBSFV3V1BnS3d0N2JLK1Bia09JUDRWZVNxamdMdU0zbmdEekQ4MURnL292dkUK
+c2cKLS0tIG5QTm9IR3FyUGVGWVM5bjNPYk5vdnVpaGswSWlCWUxab0FaZ25WZHNG
+YW8Krvkb3AjClvfTUHThubvKKHjLuIBiQc8NlW6PClnGoh1J7pTnIObysgYRGemR
+gt6ilnB8NGS/iUgMvGNlJbqt49JIejCajmLyFLzlOsn6TPe2GvhWNtf3DA0JtcW6
+7GHBrHE9c9fvfqCGoW6ywFxXeOhcCYsBsXMuUu8dB3nME70TaA8lAUSI0Gvx2u8U
+qcH6Oqh0lG4/98s1dCe2TCqjqa/0xQ07PE/7rbC2+YpuX58UYDDwRFDzPtiUihNI
+hhp1Gco3DVrJwpNmXBe2TuE70oKRzlvmwbiuK1lQ4B7OWyFds97RP4h9OGq3Tn3E
+qENrcRTd4MdHcj3/TqriLuHZwJCNxmG614JhlSrzjZtlUuyCa4Q+UfB/9FBq+lkZ
+jNttM+gJzt7HY/5VSl2EY6GtbpbIpJU3W5D+fMneB0no2jOc00YVLMjsY9uDF6nY
+xeVBOMJpYHZrlou54xeKmaXbjrdEwYGqt6syz2MW8YV0VtJc1piVsoeHtO5ajDMt
+7WeyklfOSx5ZDUCKLlXP3u3en3fXsAtKNa/JT/hBWf6JvCdYlI6SZLsGGSz/wD6g
+w8c=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2oracle.age b/common/secrets/secrets/nix2oracle.age
index 2278f28..41f4cc4 100644
--- a/common/secrets/secrets/nix2oracle.age
+++ b/common/secrets/secrets/nix2oracle.age
@@ -1,45 +1,40 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBYMTZS
-OXc3eTFLNlFjUHZlUU1rSTZDL3VVVUphU3I0ZlhsVXJremNJMmw4Cjk3Q2ZJcXNq
-UzlHOEtpd2x0Q3kyUTBGbG80MzAwc0JFM2lDbkJ2TmdpUFEKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIDJsdlZER3RZRlVONmRFQmNjbldTVEgxNkZjaWZVN094c0d1V2h5
-KzNKQWMKMUZqbkxvb1V6bVhlUnVXd2xIZFhNaW9JSU9GYk9HRGRTNjRXQ1owOUt4
-dwotPiBzc2gtZWQyNTUxOSBTcENqQlEgaXhXa3BiOHI2TE5TQkd0ZXBDRUQ0QzNq
-TjR4KzBFNWF1RS8zVEIzZVdSVQpJUjUzcUtiY3M1QzFuYWJTODYwbnFkSE8rRXNG
-bDhZZVBjVlNLeTRGTGh3Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyA4cVpaVlZBQ3NB
-SVZxZEkzUDZqNTdISjZtcnNWT0dHMkRFcit2ZFU3bUFZCjlxV0dib2ZvWm1jckdE
-VWpyc25JWThqcmJua0JOWUJIajZ0a3VINytpaTQKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIHo3WTJZeS9OSkIrajZiMmpxV3A4eXpyN1U5d1BNb3BWcFF1UDNmd1pobFkK
-SlhqblhqaG1FR1RFZ0dWaEV4THdKMUFqUnk2TldBUDFDc3RJMERkU0tYTQotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgSUMwYkZSR3M1Mjl6RkE4TFpIUzV2cm91N2lyd1o5
-TE5sVUV1aE00MGJFbwpQYjJKY3RNbzlPdXRGSnhtQUs3U3M3ZnJiK0NhcDJJdWhJ
-WUtqMjdCZnFvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSArRjlVdjM1VXNiYlEzRFQ0
-L3prUlNFeXhsUG5mQmdGbWhhc1RqNWxUYURjCmhJQ05rWHdsdWVnYVVZc2RrbWw0
-b2JWYmxCZUpyd3ZmaEphQitqOU1TVW8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEJZ
-c2pqVm5vc1ZtTVFsbUVDbzU2dnhXUUdSMzB3dElpb2loODVyTEs4RkkKNWFHeTFO
-MERZbXZmanVOVlcxa09EWkJzZG9QS2ZNM1VGSU5qcEVKeGJibwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgYitZSXA4YmdnQWV0ZlFueEpWZVV2dTRIT0cwTDMwM3cyelpB
-RzdKenVUTQpDMlA1Und2S011L09ZY0NtN2FyTi9nakczYjQ1TkJKcENmWE5aQkxq
-Q1hnCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyAvRWRhMVNrdnduSkxsTjM5WUhlQXpK
-NENvYzl6MThWdVdzbEpzMmVQTXhjCms5b0Jrc09tU1VLSVdBQThvUHVWcUtLdm5v
-cmt0WllNdWVlWVJETWRocVkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFRTVzd6YzBJ
-WUI4R3NuVlFXNzl6bTZRbDVqY255dXEwSlFYTWFzN1JKUjQKVVl3UEtvRXl4aExq
-Yi9CRGljdmh0ZGhUR2xCVTNmYStodlAvNUNycmZtQQotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgUDQxbVRxMlJhaFQ2WHFYcXVwMHVpVkZheTBwdDVtL0NaVG41eGtEREFs
-bwo0VWRDZWZrMlhETnZEMU5BV244WE9UMExibnBDbGVlUXJxTE9IZFE0SlNzCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBNaE1hWWF6NTlvTlVPcmlhTnA4TFYvKzl2KzVa
-TCtyUlhxelhVbUVjK1NvCkNUKzhrOFVnY042NCs1ek4wQm5aNWorbmZaVXJjbVQz
-U0liRmRjZDNYRGMKLT4gbXt7dT4yLWdyZWFzZQpJL1RteEF1cXdYM1UwelM4aGtu
-UnF3d0hQaWJyOUZyZ0lGYWxUT2k3OSt2SVlCdXJRWmY4N2VPNk9UQkgyYy9RCkNL
-ZVNDdHpqNGw1c1BvalNBUQotLS0gd201MHV2anlJZlgydjkza0VpRk9ONm9HZnRm
-MThmSkw0dUZHUnVZa3E4MAqVUq6AXtNmLa++7a+A2SU7vyX95lsanWGrI1Jsp20S
-8WH1bYqXAp4lkQ1G9a7xBf5QNm77MLT9MD6zMU+qF0+uc7K3eZf+sGCiTZA18519
-Aftbwfqsx+NFifg0a49zb3FidcEjdQ+spXwUbsAoQuwHvVi4T8KPVQrvK829OhK+
-l/LV4PNK1v8guBHvEEv630PwslRv6utlXQD2CNV5YQfGY87fX3V0GVWodmka4Ou4
-eNQm1pqSUH+dq303CD68Z47wR1jBfxIvDCIMcyk/aAi/lyKHm/g1EB7m8atbNICq
-f2JJwdQ0acQJl7BPYiO7m6t8ZIqP46feKqqVgpKHJY5rmp6vlJ8TWFb6jcNtQNNF
-quF4Pa6ggxk+qme3Iu6Wac1nRGKa718+UvWuRg42ceB2d0E2ie5bJKmfzqrFij07
-bSAafq+6Ks9uF0TPYex1Sh2zAhlr6jwMMGCtmxmYR3zsE2gdv/rmF1Z3Nr05qIU7
-flpA0xxtc3yJcKc6eoeme+nSeQxDRkUGNTbAAWtc297rdyLfr5xtSz+62xNelCGI
-lO7eHxJxb9HgtAQRCErbGw==
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBuQnNX
+UUtpejU2Ym5ZZGg5dUt1b1VNZGZMZzJiSHBKRVk2OEN3V3dWdVg0Ck00UHlIcW4w
+cGp5YjJDNERFUnlPQURucUt1NWNydjhwL09DNG5NdmsrNjgKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIG5sdjZzckpIaW1LUHRJelNjYlNET2RhcEsrZXhGR3hLZGdvVi80
+YU9qbEUKSExvTTZKZXlDRWVDcXVqVFhlT0NkZzhmT25iNkJVU1N3SXZib0FlODBJ
+OAotPiBzc2gtZWQyNTUxOSBTcENqQlEgNGIzWE1LcDNrN1RlTTQrQ1oyME90c2Fr
+NEFjblpHcStlM1RkbTZHd0tsawpxcFQvR0dRcDV3Q1pmV2JFSk1sV0x6Qlh5cXZL
+eFpWdVovU2RGTnRWcUZRCi0+IHNzaC1lZDI1NTE5IEJZS0crdyAyZGl4WnMvRG5V
+Q0YzRDd6dXdtNTlTbVlFRTFWRkRzdnI2NmkrUm10MmlZCkk1Snk5eERvcXo2WDRE
+c0l6L292aFVERHUwNDBPL3cxbXBydEZsQ2lhcU0KLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIGdVQUhDZ0FVTG5COW95K3VPNnVNY3JZbGVnNDhWTzRubkFlTUMyeTlaZ2cK
+M2Z1MFZna29sMGF6MG45RVVZVnhVOWY1alpxQW52d1E4bmNLSUtnVjNvdwotPiBz
+c2gtZWQyNTUxOSBSNSt4Zncgbnk1ZzRDbzZBczliWFVGVWU3K2RrQk4zZEFNOWxS
+SXUzTjJnd3U1MjFqOAo3L0JCSDh3MmlPSzVZTnBwYUxSYXNtKzIzY3hMTmIyS1cr
+WGthcm02WS80Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSAwUTlzVEVsT2JaWnU0bnhi
+V1ZBV3NKU3RVTEcxR2N1NHFtTDlXMWxKZERvCjN2VE9CSzZVRzVDN3I5WFFKVm9v
+aXF5cVh2aXJ0L2IvcFFqcndjc0F2dDQKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIDhr
+MXFrLzlWZWNvdFZZWndNYzhzeHFzMXAxdGx1d1ZnVjFiUmZlY2xSMzAKOVJEM0hO
+Tm1KZHQwbVNLcmkxQndjQ2M1dS9YWlRZUG9wdGplV05PQkhkQQotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgdVlMN052Mk9YT29BUTBKc1JSZ2JQK2FCalR0RTVWU0tzMlFa
+MU9GZXdocwpUVHR3a2RHSHZwSXE3WVZ4dEdQTTNNblZBVDNaMFcrWEJVa0ZrY1VS
+eUhNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBEUHlnaUkxbnJRYWQ0UDVmbUhzcXBa
+VE1FeE5YbWZFR0p3anUxN0krNnlnCnFCNXZBSnhzZ3FPS0V4OGs3YlF6RVU1M2Rk
+bGNiSGl4VEV2UlZHMkI5QkkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIE5raFFWOVhO
+Q1RQVjBqNEIxMGFtczE2STRJN1JqNW1MaTNNOWs4bktGWEEKMkRyVC9XSVdFVGVF
+NE1jWmxWSzdPdmZWV2haY3ZjN1FIaXZzVS9yQXkydwotPiB9SlBFNS1ncmVhc2UK
+RE1xM1MrQzZXVUFQbTNhSlpwaG9WZ1NVcHRnNEl2RlNUUmtTaXdhbDA5M1JyUVU2
+cDl2MTJVbkgKLS0tIG5ZV0dhcVYzL0hBTWpqUWtNbS9nUDhJSGplU29CcGU2UGtI
+Ni9ScHNHbEEK+33ZrBrxJELcVu6ZdYmZOQyJr4/CwlQwPAzbMqjhyTGqxbOlAyvf
+hZVVfv+HIVZdj911jjKY/EMOv1z3uAzFFMEdMQCBhjuC5dk/MEtQipJexgdupRfN
+y6DK9ns1TyMXWCvm+EsSsOSYfV69l3uee9lsXDGG05EmJJ+nLNkeODD3kr2uwQbl
+b4CI/Eul1Z1Bzi9Fc10yp5daJt+8yEWhQp4sPKlSdYOjFV3+EIK9ZUOE+r9gG904
+FIqeNLv0Sed01TEeDcFhSzLCrbMsMzesBh/uxSOpAjqJsoJGTqF/Qjlq1YMQCBrV
+JSC3tP+XOUokK/yEBeFuE2EmnF+dh3HcSWXOGoh/kViqoWYdpt/V4Mdtzu4wppgv
+V3ri2C4CUfP4zwUm90wVU7fW6NmfGdRg97w7IIrRdTNknN1O5g5L+zoXiA9RF7ac
+qZkrv6caEgiGtrLIVVkcHujWApvcYHYhxRi0KRLFwjUYNrOaMY9k/DgP6eY6pFLt
+jPcxGEalMxgIwORJ7rG7+u7Fjbaw9Aa8klsEVnjVWJBDwa0Lbaiaz7ggPzQq5lKB
+/zg8ixczAUY=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2oren.age b/common/secrets/secrets/nix2oren.age
index 303cb98..25a21d0 100644
--- a/common/secrets/secrets/nix2oren.age
+++ b/common/secrets/secrets/nix2oren.age
@@ -1,46 +1,39 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBwV042
-d0xuRDdQUWtDV3JXQklzeHo1R1hQaGVsL0FhWWxGeVM3VjdZVzJZCjJRS0tRYmVh
-QnVaMzZEcHh0OSs0MFh1VWhGRFI3M2VxUGgyeFpGWno3c2sKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIHZZWUJPdzVFbGlod1hrYXFqVFhDYU96L2lJNUFMbzdqMEZJZTVE
-T0Fja0UKWFpDSmc2QUU2K0FFVlZRMFNya2FtcWJ4ZWkwUzBxTE9VVUpScUZULzdl
-awotPiBzc2gtZWQyNTUxOSBTcENqQlEgQmFMRHMyR1lGQzNLWS9Ed1FJTVVQayta
-MVVoVDRRU3dJRUpWenIzR25RQQp5TUg5MjBCb2lHT3UxeFVjSitoZ0JXZmZJWW1U
-MjZFVGdMT211ZWV2Y0ZvCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBkdEZVTGY3cFVU
-VEtsR1RjRVV1bE1VRmE4b1BBYUJ2UWZ3R3cvb3FxMFhFCm5lTVl2UHBZbjNTdkR3
-R1M2SU9idzM0biswOVljeEFwRStMYW5XRFExUEEKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRIC81ZW52VDV1SC9BRmU0RVV4dmQzbGM2NTFLYnp0djJUVGNrK2p2dVhFMnMK
-OWoxT2xlMXpZK2ZJeGQrem9EZjNCeEUwNlJyaEFNaTdYMUloYmFQYm12YwotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgZU1zRWJWQjk4S1BnOVduUGJtbGpuK0pHS2dOY00v
-TVRyNVVSTlNuVllVVQpBNDRjbENPV1M4WVlkQThKMmNaRXRSODJueGtnQkN0QjZu
-YU5SaGZFZFF3Ci0+IHNzaC1lZDI1NTE5IFJvWDVQUSBXRm5RYVIveTR1NE1qK0JY
-Nit1dkt2NXhpOFN1bTJxQVdmNFIwS3N6c0RNCjRSZkJCajBzMnVEVHRSbTc5UzB6
-YXdHbnRWdTFQK1VpSUgwRUdzeHhwV3MKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIGNX
-U2VhcU5ram9UVnZlRlNZYnVhYW9qNFFCODZzajFpUmxVaVpXQ3dZbHMKd3NPTE9V
-MWk1My9PNXRzeHA5QURIaVF3djR2djE1L1VXMm5zaTc5azZMQQotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgMjFPdktLRStBbmJJK09nbFg1U3QvWDdDVGpNaTJ0Y21WSjVK
-a3I2SGN5UQoxSk1kN215TXZFMnh5dkJoWDU0bjRkOTJPNDRRaFJqOVZXOW5mdkpY
-SURRCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBxY25xajg1MDhoWTBVeVdDcU5oSkZi
-V0tQeUhtdWo3UkR4MHZHTlpIMnlnCnB1ZHFIczltaW5SNlNkOVpNT1pBYVRJTVRJ
-czJxUXgwUExHanNrZHFzZEkKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIFc1OFU3Si96
-TGUrR1BpdW9iVEVkY05iOFZDYTVuczZ5SzVBc1dMa0dSU0UKMEV4UUI0TEMwdll4
-N2ZKODliZHU5NStuNGFXbEV1bmZSQkdPcmpVUWxyNAotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgTG9sRlYydm53Vm1QclpyVVNCRzlJTWJBeHZCWGNKUXNNcXpVdHA2eVhX
-NApHc1MvcWFidWZIbVVrUmk5L0hXQjltMCtJWTk0T2MzMVlUOEd3U2YzRmNNCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBDRGR6OVVjczN1Mk9mbzhOUjY4YjROUEdBbGdQ
-S1VtNm9qZzRDbk1mWERzCklKVHdIc3ZOL21HbUFlekRHR0M0R0o3NTNiN1J1QXlO
-Tk1zZGVFUXBLU3cKLT4gfi8tZ3JlYXNlIDsvMFAgZWRSWCBnaHR3SmxjdyAlcgpm
-UFhycmdYMVZLVUVvVWNyOWlQTzNnOWlLVHVhZ3ZZK3dkQmNGOGtsZVpoak5mdHlW
-dnZjRHNIeWY1ckdtK1ArCllxR1BwS0V3QU5aUWxodkVFa29hWERJOEhFcStIU2pR
-MmxDRVR1aGlQMWtCaUlmeXJpSVArS21LOWVoZm9NTXUKdjZ3Ci0tLSBYT3pDZUVv
-bWpnYWdRZVliTW0xM3NsYVNMQVQyQ0xGMW5Ya2hyYk5Md1ZnCrnX8IOa8etI/DR3
-FwSyUqm+2TnMPOJzQQH2obofeyVIs6JfsUspW490t6/0Ucbcm+5/wATBHSQb3pSt
-lLoSgq9SBws7C9oyFB09GKcM1jbQILNTSQVYLK60lUPqwQh0yPE1+UuPsa2eFneb
-JNiXvfGtCMIf6AsczRk0olyBSkUug7ErTCyYLDR4MvisFXQ70jqEM4XPiVW3yHUq
-IWmvmr4IbDwJ8Omi/7vZEl7nRQvgxlmvJyvXr6r0DaKwu4mEIo6+vi7mrPi62ZP3
-RSJZLEtS7PJEHiiN+BwTFzdeBKylhD54lu2Lmm/IWoVxCohsklPwoEDvUnv+hrMx
-nqMk2vOHkXu6IBSwBH5v+4WPXlUdlZLhID2M6UagNwVXa8623hpdGTh6kvb/Bo2Y
-+VKbxAz7EA52CQ6E5QAVncHb4vMzBKSoURhrwd4UPyEWrUhg/amHe6uN6eenKnX5
-csBsqwziQ7MURVYLieGfPaaRJ1WfggcBAa12D4p+8KazHFh9OPG0vSpATBS36pNS
-Sn0BONB0w25emu45x0Z0A52jBz9tghkSf/J21McEfeAA3QAF
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBuMkZa
+cXZWUlhRbzNta3dHSGZ0Z1AwaDROOXVUczRSQTQrZ3JHQUpOc2dzCk5uc2l4am5C
+cUo5QnVpYVZZSkttY2xCVFJhS3VLTk45YkFWYTB1TnlRWWcKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIGgvVk5mOW96VHZUaE50QjlublBHMjFxelFUbXA4bC9qVHJMMGlB
+Z2thRTgKbzlPa3gyZWE4RElXY1BjbDFQeHRSY1NIczNDb0FURTJ1NEJLTktWUzVH
+dwotPiBzc2gtZWQyNTUxOSBTcENqQlEgcTYzV0xIQzdja3dKdUdMM29qaFExRUox
+ODV5bHFKMThvQWMwTkI5ZGNXbwpManlmL0szcFNRZ2FWMTZXMEdlWi9tenB4bThN
+RzUxaWsrVm5hZXY5b0RNCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBDUjlmcGJtRW9G
+NWVyWnBOeUZnTmI5VlBGVWZ4eFFTNisyTk9uWFRiNldvClRsNCtZOUQyYURxOEpi
+T0lFajR1bWhpQzRQbVVnMUdZdkNsbVBHdll0NDAKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIE04WTd0WW5UbUY3U1Rqc2RZdzdhV242a0FtQXFzMjdWOXlsNkdHanJaa2MK
+cXZUb09uSEdCM1JvZkJtQzlIcmdFKzlONHhkT3NHR282dVIvTEdPRGZqMAotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgUTBRUi9UblhnUFZMNUMvaTU0cE1KNUZ5eHhCTnRU
+WWdySXU4T0RXWUloOApiSE9BMmtTM3ZxbTBReHZKdTIxb2pkWThKa2NXRkNqN3BS
+YUgwNmEzMjZRCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSA1M2VOc3pGZmlha0ZNUStC
+VmhRQ3ltaFVxMVpmRHJTUzZQWVlJdjZpeFNNCjNtV3c4V2xNMXBONmxTZGpOemMx
+WjF2NmFDbk1lSU50M3RvL0lwNzVHSjAKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIEhp
+VnU5a2xKaE5PdWVSNXN1NkVJaGI1TTBhQUc3YlY3aXZJTmppcHpjQWMKaVU3ZEE4
+VmcxeDRwanVCanBUS1ROMU9ha0FvU3AwQWtNV29LYjhtMmw2awotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgdU0zdWZBSnVDVW9INnlQKzEyOW1xdlJqZWVqMndOdkM3THpM
+cTQvZGJTcwo0TmpHeHdhVDlZZUo5MmxIVkFTQXh1UDhDeVQ1TEI2SFN2bnNONmhX
+R0FNCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyA0YjFCMDJyWHp6YzZBc2xUcFJVWUZm
+dVVPNCtxa0FiUEFhMmlXWFcvVlFrCmJGNDVKNXNHNXFJdm5nVURFV2hMbVFOV2g4
+bHFKdzlpQ1pDd00wSFRGRVEKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGhwTXdZMXpV
+UjNkWllYblFPbGhKV2w2WCtlSHhUWXZTdVZqcFhoZEhhd28KWDJqMEF3K1oxNFJ1
+T1h2RGRpNUVESWRWdTlFSmVvN1VhejVJcGo4ejcvUQotPiAkRkFAfi1ncmVhc2UK
+a2NzVnJ3Q2IxZWh4L3VhUisrUHIyNVdOCi0tLSA5TWl4MGJvTHgxWDRZbUFzR3hq
+ckU3YS9iR3lZUXI1azVjM0lnYUVyU2xNCrjDUQPzCmlDRAY0VnzJVb6bbuxh948S
+i0is7Ak+hZUQYrbDJUsTS5bYyXiS1SMGUexa+2C0Se+q/U8ylPJRR/TyGK0Rz16M
+nOEjnamHw+OQwDpye6DxDLDNE9QbJ4uhtT5eHE51UO0afq27mI7KyYCAz840XpQO
+Ed6aSiaoGvHqCQRbz8dJYdfBGhssgNWsXZ1UOoUmOonqRGty2CUOfXo6ieF8FnLW
+n8pJiHwkxpgqe6kx75MlXDFXVsJI2WLgVhbLID7a1QkTyQbaepHZhch5GEFkTqob
+BwE8kmu+aa5yEKrpZ0aSjMbxinHtsHb2Iy4+MegUOA2hAL5r54c60ZWhm6l7U9BD
+YpY404Cd1No7+I7WWE6d7m+1Pkey7CuB6jt4grEOkDT5bt1UIo+T4obvdS8AtWAB
+VKu8A2gaFKe0u6nVhGuvMWUZkocKosXVtsAW5J4iHcrMQlyJRDyIpByODmZzz80I
+42gJo8gXvFWUG6R6Bt31XvwItDgZHCnJ92EpN7lrrdPPcR5P9be9mzpJI+HDIBqk
+0k+mvoIILqoyi/05aAgRYdmBKCR5dswf
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/nix2t.age b/common/secrets/secrets/nix2t.age
index c18ef5b..17a74b2 100644
--- a/common/secrets/secrets/nix2t.age
+++ b/common/secrets/secrets/nix2t.age
@@ -1,45 +1,41 @@
 -----BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBFUzBx
-UlBLTDA2K2pwVWZPei9uV0FmT2NrdFZTY3BzckhicXFucS95eVNzCkNlRVk3SURj
-eDZtM1RXdkMxQm82R0EwVTNZOHBIc3RDak8zQlVzS1pqTFUKLT4gc3NoLWVkMjU1
-MTkgSmh2TCtRIGNzTDllYmxtc2JDcWROd0RFb1E3eG82dWZzc1Z3VXduU1p4c0dj
-eEhISGcKN21SWmZOM3cvSGRYTmo4Uit4anBGSmdkN1h1RktQcVlWRkZkNFhMWDg3
-WQotPiBzc2gtZWQyNTUxOSBTcENqQlEgdUMxN1FDUjhRQVBwblVVeXBHMlNnMTli
-WmZYSmpOeUhKUVUrd2MrV095dwpIckZ2c2dJSnlEWEY5K2xsWVFWQ2diL3psK3pG
-RWNOOEVENUVwZTRUb084Ci0+IHNzaC1lZDI1NTE5IEJZS0crdyBoRUZXMWR1czVV
-SkY0cEozRENmK1ZFUUZhcHNNamp1bHNEaThrRFovbWpJCk9HUEYxaVBlL2xmNkVj
-ZWIzVFpsdnQ0ejdMaVlQdmhDdi9OR3VRZlNLeWcKLT4gc3NoLWVkMjU1MTkgWHpm
-bWFRICsyQ2E4cjNwTG9na1A5SkhhaWEyMFR1aGR4Y2drZEZmVTFBZ2RvYVpxaTgK
-bFYwdW4xMTB4VTdnS0NNbmRwU0Zlc29GSG05RHBTS3VBMnBtTTZnb1JaNAotPiBz
-c2gtZWQyNTUxOSBSNSt4ZncgdGVaL2hBTGhGQUxRdTUyZTlKaFFCRHNEZzg0UWE2
-cU5lZURNZE9CcURRTQpHeGhuSytwWUtLMStHNWUzM21Ud1l4RFRVeGM3YWwxNEhX
-dEVvSDhta1FrCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSBDN0Q0Yll6M285Y1N2aVRR
-NGJIWVlwalFMclNtZG8zMUEvRHNqTGEvM1JZCkY2T0FlQzFRRUZjUG5pdGJEME9E
-d3N3NkJ0cjNEVk56OEV0UEYxaTJvaG8KLT4gc3NoLWVkMjU1MTkgRjRiYjhnIFhG
-WDFDWGU2WDVKRVdXMUw3Q2Izd00vVjRzdUdZVVI2OW82N2JJaUNzaEkKMkRDOVJP
-Mkh4WjVpUGNKVWZwU0ZTaTRnTVZTbVA0MHZ3MVBNTStGU2QwdwotPiBzc2gtZWQy
-NTUxOSB3ZHJaSkEgVHc4YVF6WGt3YUFPK1RYdHZXb2pWM3hxQnJuQzlNdFlTYmQ4
-YXBJZlRnTQovL3JWTUpKQUU2anl0ZllxL2Njelh4RFVmWUNhWk9DamhEVmg3SVIr
-R3MwCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyBsVGdwd0VEN2pqQUw0K1pQTm1CeHhz
-aUFvdGxoOStBSWpFclBnOHZoY1hjCkZMNW41TmVaVDFHWHo2SWw0L2xJZWwxSmV5
-S1licTVrVXVyT3VIbU9LU0EKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIGxldGpyelBP
-d25pM0tGQWZMSnFOTWtLSUVhQ2F5aGg0TjJObVpVYlBwUU0KZVdBWU9VYTZzN0xk
-Vk9GTTFZYWNXZjEyWno4K3RIT0VxeWpzUTJjUjVCZwotPiBzc2gtZWQyNTUxOSBw
-ZUZCUWcgd0QvT05pMXpFUWNHbmVMd2ZTVnlzcnhiWTAzZWhETitzdENlNGE3RkpV
-bwpyOUd1em1EaitqcllXV25IMFE0aTlEeGU4RGNCdnlQYXBaK1BDVmtDR09NCi0+
-IHNzaC1lZDI1NTE5IDl2LzJIQSBuYndHSDRtWTZlMUh2L3VSUFJMRXJxYk9VOStk
-U05GV21PTXh5VjIzd2tVClV1N0RBdTRBNFZTUUlSbWpFVDNza2ovU3ZuZU9CY0RQ
-d09LL3RhRmdOWmcKLT4gfT5mLWdyZWFzZSB3alNnClRiSUZrU0NvVGx2dHlGSFBw
-YXNMTEZmNW9Wd0JjSUpkSEwrbXhleFZiMHl2UUpnZDFiQmU0U0JlV1R5cFpuZDIK
-VXlSQkJhcGo0elJ6d3QvOVVUaW1aa3lvQ1IzRVZVY3VqRlRVeGRRR1BwT1ZLdmsw
-SDd1UDhZUkMKLS0tIGd1V244TTFSMmUyNFAyY2hFbW1HUWZPZUZocjRkeHpHSmwx
-Mi9pazM3RXMKxrQCVrV1nM4A6qr3QoMt2hamB0xMLgeAW+TAR05/zyXwEvZtWi60
-RuoRRz6dojKNedQY+Mxct/nHNc+UsVSciZgKHNs/1lRzSTtdCsZNiJ0y/ZPaFDVG
-5fqMuQldtX2an/EWuMOcTBpJVSzl4xYWSu5rra6NTIpOb2ky0tkDRkvZX98Inu4J
-K8QimSEmz/tlRbTL9NV4O4mjyKVUrTdsHdbL6tdyero72RstMLGaAZc3e11QhF8w
-q5zNGGLiGtBrRQ9cTJJ4gZMaCi0JXkGUJgfWSv67Qpy14BaEy+fDylaK4Z/r5gKo
-qb5g6gCp6F8DdpnDbpEDfL1Yk8WnIKDAwa/2ZDJ5aUWJUUQ6FKw31NMwr5poj7WO
-NJ4lf/etZVxXhvhGs0ycSG/vQoVymy9XWPWCsqwnO0h7VF3UyHfb2kEK1HJIsz1Q
-patift/a/0Sp2EgmiVe1UKF13tTP3r0pq3LVjII0Z7EF5XMKvDS13e5YUPuXM4P0
-neqnEqkaSrodOf4dOPhUWNTEeYJRMW/gr0/d7+MtZrMNj3OjcZRHjZf76Ag=
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IDd6MzN5USBWaXVx
+enVoekp2ZG9nd0ZQZ2UySnViS1hPRmpINFRYbndxajVRRFBEU25zCnJOU3JXa2o0
+anNkVStiY1lEYVppSHNFdjRPLzNobTVCZlVzTjY0V0dWQzAKLT4gc3NoLWVkMjU1
+MTkgSmh2TCtRIEF1KzhtYlh1Y3k1bFZYQSt3OE1PYzAzQ1lITEQ3Y0Vlc1ZIMnZ1
+NHZiREUKSW9tZ1FxdXAzMHkrbHgva3ZROTFjTzFvb2JVeUllZ2IrUkJKWUo5dmpl
+ZwotPiBzc2gtZWQyNTUxOSBTcENqQlEgeDdrRDUyTTBySUhMZ0pzdnBHbmJQWXh1
+SkdrTjBRTG5PaVh6L0cxZ1drdwpVZUtDN29wQ0tWNjFMOWlSSE9KUVNQRzF6ckto
+SS9EbzJ0ODFsNTJlcW5FCi0+IHNzaC1lZDI1NTE5IEJZS0crdyBPMk03MGQ3UWdy
+M0VaTnE2Q0pVdFM2TytsS1g0WGhkckVzdEE3L2xjWXlRCmJCVncwZjFUUGJzaHR5
+QmtPU0F5K0duQkRhRkMzb2FBdGErRWQvb1poS3MKLT4gc3NoLWVkMjU1MTkgWHpm
+bWFRIHNqa1dkYTdKbjBHTG1OYTlONlNTcXpCSGxQdWllZE9pOXVDWjJFSkY2VjAK
+VjRnZ1JyOFI3cnEydG9uM1hhbVVKeXFkWU5DQ1lPdWU1ZHVMTUpCNXRpbwotPiBz
+c2gtZWQyNTUxOSBSNSt4ZncgWFBuWFBjSGFhdEVGSlFsalh4aXRqZDROdWpZK0Yr
+bCtwdWpxRm1SS0NGMAo1bVc1Nkc3T1AvNFV6MlQvK3dLZzdSRkZyVTM1b2VnQlkz
+elRwc0JqOVJvCi0+IHNzaC1lZDI1NTE5IFJvWDVQUSAzSDBXb29lT2dRR1F2d25L
+VjhQVjY4L2ZqT2N2ZVF1UVBSQTlqUVJlU2p3CklqUnVyM2V2U1IwWURVUDZGbGZY
+aXZWYitMTmtlRUprZnBreWI0UTZjY1kKLT4gc3NoLWVkMjU1MTkgRjRiYjhnIHpC
+TVZzZHV0UFJlODc0RHY4OHJJNTd4VEdnK29vUkRwMWV1Qktza0k5aG8KbXJtTnVX
+MEN3MjN0d1pSOTlpazN2Y2R3R2JrVi91eTFIdFRwNGFTZmJOcwotPiBzc2gtZWQy
+NTUxOSB3ZHJaSkEgdkpiUlFWcVJKNlBYanMzVUZ0K2pKc2hiSGwwTi9lSkJPUW1r
+M0NWOGxDcwpZQlVWNkRIeFNvV3ZHUlFBSTN2RDZaUGhobUdQQzNlNitpZ1h0VmR3
+T0tRCi0+IHNzaC1lZDI1NTE5IDVhZHFNZyB3YVdDOTRoemdjVHFLMUNEV0RXcVF3
+am9sNkY2eG9vRGZ1Qkd5aTUyVmlJCmw0ZHpqMzBWRnU1RUkraExTVDhEdnQxQU9t
+STl6ckJsUFhWMmI4enVxYWcKLT4gc3NoLWVkMjU1MTkgWmUxTXdRIG5SNEhGb3FQ
+QkYxcnJBam9GazhXNE8wZW1OZlZVMnhUZnRPT0t2UkVHaG8KQmRlUkVkRk1QYlJp
+Sko2OWNSb3ZLbXVGOU85dGt5ZjF4cWsrK3ZZYjJ4cwotPiBaPykzYTw6YC1ncmVh
+c2UKRkhKVER5M1FWdzNScEd0STRDdit0Lzl6Vmh0RE9kQjNPWFFEWkhla2JaZlZx
+QzVRMVBiSVIxbDdGaWlrZC8rcgo0Z2lRbGJwKytCRWRvRUhMSGFoclg1UjFwYTUw
+VUN4UlNHaEtxZTJmQTN5MVNKcG1naDFRTncKLS0tIGNaRG5CQjNWMEozNDVQNFda
+M1hoK3MyUWk4b20zN2NCa2w0NkRTM3hMdVEKVkLTC4doxAz7FnAkZfezL3XxVl48
+12l/ReMfiBHh1Fv5U2Z+/QjewTiBm+liq2zdvpAZZpiSLCPXEIAZDI8g1mC5eEgp
+7jVhi78v8qPQexx3DV4t5CqWaP2tpJWXNmxQlTp0zykgxSZuMtNF4B3UefCTQK7c
+RV3awDpKDj5ApyC54BhkL+OmSxlvaCwbeGL9tgNKhFV0WEwFjWHrMTI++Nu0K5mG
+X8Hj0aqDKO8k5Bku+hK/LHNDT+/aCAfRfKMfwyo6ABBCej7YfTZKn/gyp+dDr6o2
+B2MBB4Dkuk7ioVgH5Iw4yxm97RHk4Ts+8Ntvhc7hOwDAnOl2bkDWBxPsqkXzHuFc
+nTBTSh5Fl+/o2O+it2A5I05f9TN3ZucKtI5dkG/HSy4sDMJZ6hsFA5dXvJ1RQtfZ
+qjoqjv70+zJ3fCQ939IxMBDEZhkD/WlxMnkNB3GNKZsOGd/YxyGcqVjmZ/SePMjv
+qpYhdPzfoqUp5IpsaAwHexUKa5S8UaMEEfXhDbq8UlmnA+b8E6UcRlbpq3b9j8B6
+1rcXbEyHOAw5+HJDZv4=
 -----END AGE ENCRYPTED FILE-----
diff --git a/common/secrets/secrets/secrets.nix b/common/secrets/secrets/secrets.nix
index 6d32978..97c831d 100644
--- a/common/secrets/secrets/secrets.nix
+++ b/common/secrets/secrets/secrets.nix
@@ -19,8 +19,6 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKxNhtJNx/y4W54kAGmm2pF80l437z1RLWl/GTVKy0Pd josh@lio"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK7bNX7R9ApoX/cHdXIhQdpA2sHrC9ii6VAulboAIJM2 root@oren"
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICauUtSa71+oQAiLxp3GMMbmNXcbr9Mc7eK8b/lqZbbS josh@oren"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGTAz6n35c3r8kSuWJM1JzMVx6jK+0EBwpJA5eTIvy3N root@h001"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICRHer3NrJiklp4oDNRCzDxc9fXpXn5rPAXGFce8ugy2 luser@h001"
   ];
 in
 {
diff --git a/hosts/gpdPocket3/flake.nix b/hosts/gpdPocket3/flake.nix
index bbf4d86..eeb3e24 100644
--- a/hosts/gpdPocket3/flake.nix
+++ b/hosts/gpdPocket3/flake.nix
@@ -4,9 +4,9 @@
 
     # for local testing.
     # common.url = "path:../../common
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
 
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/hosts/h001/configuration.nix b/hosts/h001/configuration.nix
deleted file mode 100644
index 31575b9..0000000
--- a/hosts/h001/configuration.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  system.stateVersion = "24.11"; # Did you read the comment?
-}
diff --git a/hosts/h001/flake.lock b/hosts/h001/flake.lock
deleted file mode 100644
index 0faa78c..0000000
--- a/hosts/h001/flake.lock
+++ /dev/null
@@ -1,1302 +0,0 @@
-{
-  "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager_2",
-        "nixpkgs": [
-          "common",
-          "ragenix",
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "common": {
-      "inputs": {
-        "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
-        "ragenix": "ragenix"
-      },
-      "locked": {
-        "lastModified": 1745881365,
-        "narHash": "sha256-ihAOLcQf9VGLCW94POGL+aoqLK9zvC05IYEYg0GAjmY=",
-        "ref": "refs/heads/master",
-        "rev": "e671f877d9a07907d07bd3dfdad581aa09c057fc",
-        "revCount": 408,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
-      }
-    },
-    "crane": {
-      "locked": {
-        "lastModified": 1741481578,
-        "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "common",
-          "ragenix",
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1744743431,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
-        "owner": "rycee",
-        "repo": "home-manager",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rycee",
-        "ref": "release-24.11",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "common",
-          "ragenix",
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1703113217,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1731755305,
-        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1741379970,
-        "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1745868005,
-        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1745250177,
-        "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "d1e61a9c582ec2f701b36d4600ae19b8099c5211",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-Almo7aya/openingh.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744327913,
-        "narHash": "sha256-WQ7GbrjtikpMnzzME59QSibZI0hjzt/KAGDmXa677Rw=",
-        "owner": "Almo7aya",
-        "repo": "openingh.nvim",
-        "rev": "ce19b5ffe09e35cec600ba794df280cbb72c015f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Almo7aya",
-        "repo": "openingh.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745008876,
-        "narHash": "sha256-/GdJNqoDpdsPCOjcESbtEEDCz5TYkvbPRY1/T0gF7IY=",
-        "owner": "CopilotC-Nvim",
-        "repo": "CopilotChat.nvim",
-        "rev": "634aa58117a9b70b3f08a0b150f11afd64f1c0eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "CopilotC-Nvim",
-        "repo": "CopilotChat.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733574156,
-        "narHash": "sha256-AjDM3+n4+lNBQi8P2Yrh0Ab06uYCndBQT9TX36rDbOM=",
-        "owner": "JoosepAlviste",
-        "repo": "nvim-ts-context-commentstring",
-        "rev": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JoosepAlviste",
-        "repo": "nvim-ts-context-commentstring",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-L3MON4D3/LuaSnip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736009707,
-        "narHash": "sha256-3ecm5SDTcSOh256xSQPHhddQfMpepiEIpv58fHXrVg0=",
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "rev": "c9b9a22904c97d0eb69ccb9bab76037838326817",
-        "type": "github"
-      },
-      "original": {
-        "owner": "L3MON4D3",
-        "repo": "LuaSnip",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744934679,
-        "narHash": "sha256-rTX+CCVOOU6ZzM5NvymJvOfJF10BRMfl8hdSJz0zw+Q=",
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "rev": "dfc1299d9f32b53b34b7ac6c3a7553b5fd29977f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MeanderingProgrammer",
-        "repo": "render-markdown.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-MunifTanjim/nui.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741233810,
-        "narHash": "sha256-BYTY2ezYuxsneAl/yQbwL1aQvVWKSsN3IVqzTlrBSEU=",
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "rev": "8d3bce9764e627b62b07424e0df77f680d47ffdb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "MunifTanjim",
-        "repo": "nui.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-RRethy/vim-illuminate": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744859423,
-        "narHash": "sha256-zqXKkrUNTH/EIx3PBRN8+mQcbWa6fO9i/UoSeav5R/w=",
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "rev": "1fa4b23409e22a03823648e344c77f260e2572cb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "RRethy",
-        "repo": "vim-illuminate",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-Saecki/crates.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744379189,
-        "narHash": "sha256-HsdDeV3mMQwrzlP23bJnNkiSL5OELgn0WBTERxehviE=",
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "rev": "73d2c590c74a0c582144987a4decb4a642755859",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Saecki",
-        "repo": "crates.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-aznhe21/actions-preview.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740589350,
-        "narHash": "sha256-MP1hohDL2JFembwW+cb2S+v2Y7j0iZw1jPPKTZiNCWI=",
-        "owner": "aznhe21",
-        "repo": "actions-preview.nvim",
-        "rev": "4ab7842eb6a5b6d2b004f8234dcf33382a0fdde2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aznhe21",
-        "repo": "actions-preview.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-b0o/schemastore.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745020938,
-        "narHash": "sha256-qDcVJ2RovKSIcUdVnXNcQZHoAf75IqsTMlsclDFrT2U=",
-        "owner": "b0o",
-        "repo": "schemastore.nvim",
-        "rev": "e623e30df4053cacc67fb7eb04e1bd0fadba52b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "b0o",
-        "repo": "schemastore.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-catppuccin/nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740764472,
-        "narHash": "sha256-4h/fzFY8JR9r+QnoiWEqgQKPMuu8i9HTC4v0Jp7iuUo=",
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "rev": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-chrisgrieser/nvim-early-retirement": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744450582,
-        "narHash": "sha256-ybs65ObtjcUBaGglxP3SIpYjlGSEk/MQI9nSN8S3Q1w=",
-        "owner": "chrisgrieser",
-        "repo": "nvim-early-retirement",
-        "rev": "3b14762a0186b1922cb5ddf3a760d8521c7b3d7e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chrisgrieser",
-        "repo": "nvim-early-retirement",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-declancm/cinnamon.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722992123,
-        "narHash": "sha256-kccQ4iFMSQ8kvE7hYz90hBrsDLo7VohFj/6lEZZiAO8=",
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "rev": "450cb3247765fed7871b41ef4ce5fa492d834215",
-        "type": "github"
-      },
-      "original": {
-        "owner": "declancm",
-        "repo": "cinnamon.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-folke/lazy.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740511197,
-        "narHash": "sha256-nQ8PR9DTdzg6Z2rViuVD6Pswc2VvDQwS3uMNgyDh5ls=",
-        "owner": "folke",
-        "repo": "lazy.nvim",
-        "rev": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "lazy.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-folke/neodev.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1720260306,
-        "narHash": "sha256-hOjzlo/IqmV8tYjGwfmcCPEmHYsWnEIwtHZdhpwA1kM=",
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "rev": "46aa467dca16cf3dfe27098042402066d2ae242d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "neodev.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-folke/which-key.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740233407,
-        "narHash": "sha256-uvMcSduMr7Kd2oUmIOYzvWF4FIl6bZxIYm9FSw/3pCo=",
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "rev": "370ec46f710e058c9c1646273e6b225acf47cbed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "folke",
-        "repo": "which-key.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-hrsh7th/cmp-buffer": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743497185,
-        "narHash": "sha256-dG4U7MtnXThoa/PD+qFtCt76MQ14V1wX8GMYcvxEnbM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "rev": "b74fab3656eea9de20a9b8116afa3cfc4ec09657",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-buffer",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-hrsh7th/cmp-nvim-lsp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743496195,
-        "narHash": "sha256-iaihXNCF5bB5MdeoosD/kc3QtpA/QaIDZVLiLIurBSM=",
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "rev": "a8912b88ce488f411177fc8aed358b04dc246d7b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-nvim-lsp",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-hrsh7th/cmp-path": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743497173,
-        "narHash": "sha256-thppiiV3wjIaZnAXmsh7j3DUc6ceSCvGzviwFUnoPaI=",
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "rev": "c6635aae33a50d6010bf1aa756ac2398a2d54c32",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "cmp-path",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-hrsh7th/nvim-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744514599,
-        "narHash": "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=",
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "rev": "b5311ab3ed9c846b585c0c15b7559be131ec4be9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hrsh7th",
-        "repo": "nvim-cmp",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-j-hui/fidget.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1738817426,
-        "narHash": "sha256-AFUx/ZQVWV7s5Wlppjk6N9QXoJKNKqxtf990FFlTEhw=",
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "rev": "d9ba6b7bfe29b3119a610892af67602641da778e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "j-hui",
-        "repo": "fidget.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-johmsalas/text-case.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1722628320,
-        "narHash": "sha256-2IMufSMy9JW50VzZ3SgOtp8kYs81ANwV0eP0ZH3rTFo=",
-        "owner": "johmsalas",
-        "repo": "text-case.nvim",
-        "rev": "e898cfd46fa6cde0e83abb624a16e67d2ffc6457",
-        "type": "github"
-      },
-      "original": {
-        "owner": "johmsalas",
-        "repo": "text-case.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-lewis6991/gitsigns.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745219545,
-        "narHash": "sha256-7WQ428oPr43z01HvNpArZJcUov61/pDtLqJtkEKnBAY=",
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "rev": "2149fc2009d1117d58e86e56836f70c969f60a82",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lewis6991",
-        "repo": "gitsigns.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-lnc3l0t/glow.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1693233815,
-        "narHash": "sha256-vdlwkIK2EkFviJmSiOqPWvc15xqJ9F2gHCC4ObJ5Qjk=",
-        "owner": "lnc3l0t",
-        "repo": "glow.nvim",
-        "rev": "5b38fb7b6e806cac62707a4aba8c10c5f14d5bb5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnc3l0t",
-        "repo": "glow.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-lukas-reineke/indent-blankline.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1742224677,
-        "narHash": "sha256-0q/V+b4UrDRnaC/eRWOi9HU9a61vQSAM9/C8ZQyKt+Y=",
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "rev": "005b56001b2cb30bfa61b7986bc50657816ba4ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lukas-reineke",
-        "repo": "indent-blankline.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-m4xshen/hardtime.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744007533,
-        "narHash": "sha256-KCz8UNL7SkI4cP7wKmQPJgkI4TsQftnHjaMSBYCgrOY=",
-        "owner": "m4xshen",
-        "repo": "hardtime.nvim",
-        "rev": "9aaec65de041bddfc4c0af66919030d2950bcea8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "m4xshen",
-        "repo": "hardtime.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-mbbill/undotree": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741878850,
-        "narHash": "sha256-HGf4Toe+12YZtIalvANDXAtksCsnxQkZbcevOAnl5G4=",
-        "owner": "mbbill",
-        "repo": "undotree",
-        "rev": "b951b87b46c34356d44aa71886aecf9dd7f5788a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mbbill",
-        "repo": "undotree",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-mfussenegger/nvim-lint": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745090089,
-        "narHash": "sha256-Pwxk2C5WaaaW7Ookbq2edvLSJh6ZQc3iWMxowHyQkFQ=",
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "rev": "d698d3b6fd7b1b85657d05a2a31d843ddb682c63",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mfussenegger",
-        "repo": "nvim-lint",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-mrcjkb/rustaceanvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745050087,
-        "narHash": "sha256-nkCVQ+TXiaKm17HXaAMVuRMV3Jbxv8aRIO6re4zEgDw=",
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "rev": "69636cedf0d6aabf0eac3dfbce24883fe1051a3d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "mrcjkb",
-        "repo": "rustaceanvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-neovim/nvim-lspconfig": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745247686,
-        "narHash": "sha256-rnm/BJNMVxcYH/ZXf1HciXgG0UWhAeQQniOaSvi0E40=",
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "rev": "b335f1c72877f101248d3b085d4b7da7576361d7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "neovim",
-        "repo": "nvim-lspconfig",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nosduco/remote-sshfs.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1743352525,
-        "narHash": "sha256-YNqj1vPc2oyVrSgp+huoMkrUAp2Lx3G4W52liOujP6A=",
-        "owner": "nosduco",
-        "repo": "remote-sshfs.nvim",
-        "rev": "1ae5784bf0729c8b03cb7fe6561508a673c9adc8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nosduco",
-        "repo": "remote-sshfs.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-numToStr/Comment.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1717957420,
-        "narHash": "sha256-h0kPue5Eqd5aeu4VoLH45pF0DmWWo1d8SnLICSQ63zc=",
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "rev": "e30b7f2008e52442154b66f7c519bfd2f1e32acb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numToStr",
-        "repo": "Comment.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-lua/plenary.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739311008,
-        "narHash": "sha256-8FV5RjF7QbDmQOQynpK7uRKONKbPRYbOPugf9ZxNvUs=",
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "rev": "857c5ac632080dba10aae49dba902ce3abf91b35",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-lua",
-        "repo": "plenary.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-lualine/lualine.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744482854,
-        "narHash": "sha256-XeAFXg6GWzMJV/HzfdCXtv/effAHVU7mioFKTf1kDc8=",
-        "owner": "nvim-lualine",
-        "repo": "lualine.nvim",
-        "rev": "86fe39534b7da729a1ac56c0466e76f2c663dc42",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-lualine",
-        "repo": "lualine.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1729728595,
-        "narHash": "sha256-VJbRi91TTOwUkQYyTM6Njl7MtX8/mOjINiqWYWEtyxg=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-file-browser.nvim",
-        "rev": "626998e5c1b71c130d8bc6cf7abb6709b98287bb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-file-browser.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741765009,
-        "narHash": "sha256-Zyv8ikxdwoUiDD0zsqLzfhBVOm/nKyJdZpndxXEB6ow=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-fzf-native.nvim",
-        "rev": "1f08ed60cafc8f6168b72b80be2b2ea149813e55",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-fzf-native.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1701723223,
-        "narHash": "sha256-YRhNmmG4gx9Ht8JwjQfbTjJyTHEuZmtP6lqnhOsk8bE=",
-        "owner": "nvim-telescope",
-        "repo": "telescope-ui-select.nvim",
-        "rev": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope-ui-select.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-telescope/telescope.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1742346322,
-        "narHash": "sha256-GF1zOHZItVZm3bx2wqI4hPj7EXQJ2F9KS4MtaEt2gm0=",
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "rev": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-telescope",
-        "repo": "telescope.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-tree/nvim-tree.lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745201081,
-        "narHash": "sha256-zQsqyJgqlvxniKOtwPSzArUaOwvIgo6Xm+oAjAbPda4=",
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "rev": "be5b788f2dc1522c73fb7afad9092331c8aebe80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-tree.lua",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-tree/nvim-web-devicons": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745131674,
-        "narHash": "sha256-uoT45oaeY5c1+A7pVQIS+Bj9JnrSy9rQAecvaWZht+c=",
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "rev": "855c97005c8eebcdd19846f2e54706bffd40ee96",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-tree",
-        "repo": "nvim-web-devicons",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-nvim-treesitter/nvim-treesitter-context": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744921782,
-        "narHash": "sha256-w3I3w1SGqtpUnu4KQyaLue+k96XmkgA3+DpxSEjj+WI=",
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "rev": "6daca3ad780f045550b820f262002f35175a6c04",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nvim-treesitter",
-        "repo": "nvim-treesitter-context",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-rafamadriz/friendly-snippets": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745202387,
-        "narHash": "sha256-R6xE5vwgFtyEYpET0E4ecZejuV/lNHFkumk+wGf3lbI=",
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "rev": "fc8f183479a472df60aa86f00e295462f2308178",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafamadriz",
-        "repo": "friendly-snippets",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-rcarriga/nvim-notify": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744548826,
-        "narHash": "sha256-m4dQ8KuMhbEpRh6zLTlIUDN9ojFj69LZnXXLepmdFI8=",
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "rev": "b5825cf9ee881dd8e43309c93374ed5b87b7a896",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rcarriga",
-        "repo": "nvim-notify",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-rmagatti/auto-session": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745009508,
-        "narHash": "sha256-NCytp+DiOo3obZeQ9bpaEaNMfstf1Ytn0OR5mAWodLw=",
-        "owner": "rmagatti",
-        "repo": "auto-session",
-        "rev": "71c8af9a99e96b9d2533cf4bac4dfed1eafab923",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rmagatti",
-        "repo": "auto-session",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-ron/ron.vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1660904719,
-        "narHash": "sha256-8/xJmymtVGVz2avzlamgK1cNflZ3NRL+B3c7xxbI964=",
-        "owner": "ron-rs",
-        "repo": "ron.vim",
-        "rev": "f749e543975a82e8dd9a6e7df9600a1c098ae800",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ron-rs",
-        "repo": "ron.vim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-saadparwaiz1/cmp_luasnip": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730707109,
-        "narHash": "sha256-86lKQPPyqFz8jzuLajjHMKHrYnwW6+QOcPyQEx6B+gw=",
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "rev": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "saadparwaiz1",
-        "repo": "cmp_luasnip",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-sindrets/diffview.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1718279802,
-        "narHash": "sha256-SX+ybIzL/w6uyCy4iZKnWnzTFwqB1oXSgyYVAdpdKi8=",
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "rev": "4516612fe98ff56ae0415a259ff6361a89419b0a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sindrets",
-        "repo": "diffview.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-stevearc/conform.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745180802,
-        "narHash": "sha256-J/GKqn2VHv/ydaFXWCFduV2B7iwZzHtUvFArszxf2Cw=",
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "rev": "372fc521f8421b7830ea6db4d6ea3bae1c77548c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "conform.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-stevearc/dressing.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739381641,
-        "narHash": "sha256-dBz+/gZA6O6fJy/GSgM6ZHGAR3MTGt/W1olzzTYRlgM=",
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
-        "type": "github"
-      },
-      "original": {
-        "owner": "stevearc",
-        "repo": "dressing.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-tpope/vim-sleuth": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726718493,
-        "narHash": "sha256-2Cr3h3uJvUL3CSoJs3aBFrkBeOBURSQItgQ4ep9sHXM=",
-        "owner": "tpope",
-        "repo": "vim-sleuth",
-        "rev": "be69bff86754b1aa5adcbb527d7fcd1635a84080",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-sleuth",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-tpope/vim-surround": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1666730476,
-        "narHash": "sha256-DZE5tkmnT+lAvx/RQHaDEgEJXRKsy56KJY919xiH1lE=",
-        "owner": "tpope",
-        "repo": "vim-surround",
-        "rev": "3d188ed2113431cf8dac77be61b842acb64433d9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tpope",
-        "repo": "vim-surround",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-uga-rosa/ccc.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744103477,
-        "narHash": "sha256-MSh9tJv9UNfceO1yQIvID36x/fLGmgFcnIzJ9LOog0A=",
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "rev": "af2cf5a963f401aad868c065222ee13d4bbc9050",
-        "type": "github"
-      },
-      "original": {
-        "owner": "uga-rosa",
-        "repo": "ccc.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-windwp/nvim-ts-autotag": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739910276,
-        "narHash": "sha256-a3Bcql68mp3y5bH9XMiDTQB0e75T+qFB593objIGg/I=",
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "rev": "a1d526af391f6aebb25a8795cbc05351ed3620b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "windwp",
-        "repo": "nvim-ts-autotag",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-yetone/avante.nvim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744881650,
-        "narHash": "sha256-BzRFgcBG4vn7mamwLvviMl4erTPwg+1AkAb3Ss4Kq8E=",
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "rev": "eb1cd44731783024621beafe4e46204cbc9a4320",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yetone",
-        "repo": "avante.nvim",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-zbirenbaum/copilot-cmp": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1733947099,
-        "narHash": "sha256-erRL8bY/zuwuCZfttw+avTrFV7pjv2H6v73NzY2bymM=",
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "rev": "15fc12af3d0109fa76b60b5cffa1373697e261d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot-cmp",
-        "type": "github"
-      }
-    },
-    "nvim_plugin-zbirenbaum/copilot.lua": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745111203,
-        "narHash": "sha256-PaWWT0mSsTfnBMrmHagHgemGN5Be6rbikVVW4ZBK/Zs=",
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "rev": "dc579f98536029610cfa32c6bad86c0d24363679",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zbirenbaum",
-        "repo": "copilot.lua",
-        "type": "github"
-      }
-    },
-    "ragenix": {
-      "inputs": {
-        "agenix": "agenix",
-        "crane": "crane",
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1741508717,
-        "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=",
-        "owner": "yaxitech",
-        "repo": "ragenix",
-        "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "yaxitech",
-        "repo": "ragenix",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "common": "common",
-        "nixpkgs": "nixpkgs_4",
-        "ros_neovim": "ros_neovim"
-      }
-    },
-    "ros_neovim": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_5",
-        "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
-        "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
-        "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
-        "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip",
-        "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": "nvim_plugin-MeanderingProgrammer/render-markdown.nvim",
-        "nvim_plugin-MunifTanjim/nui.nvim": "nvim_plugin-MunifTanjim/nui.nvim",
-        "nvim_plugin-RRethy/vim-illuminate": "nvim_plugin-RRethy/vim-illuminate",
-        "nvim_plugin-Saecki/crates.nvim": "nvim_plugin-Saecki/crates.nvim",
-        "nvim_plugin-aznhe21/actions-preview.nvim": "nvim_plugin-aznhe21/actions-preview.nvim",
-        "nvim_plugin-b0o/schemastore.nvim": "nvim_plugin-b0o/schemastore.nvim",
-        "nvim_plugin-catppuccin/nvim": "nvim_plugin-catppuccin/nvim",
-        "nvim_plugin-chrisgrieser/nvim-early-retirement": "nvim_plugin-chrisgrieser/nvim-early-retirement",
-        "nvim_plugin-declancm/cinnamon.nvim": "nvim_plugin-declancm/cinnamon.nvim",
-        "nvim_plugin-folke/lazy.nvim": "nvim_plugin-folke/lazy.nvim",
-        "nvim_plugin-folke/neodev.nvim": "nvim_plugin-folke/neodev.nvim",
-        "nvim_plugin-folke/which-key.nvim": "nvim_plugin-folke/which-key.nvim",
-        "nvim_plugin-hrsh7th/cmp-buffer": "nvim_plugin-hrsh7th/cmp-buffer",
-        "nvim_plugin-hrsh7th/cmp-nvim-lsp": "nvim_plugin-hrsh7th/cmp-nvim-lsp",
-        "nvim_plugin-hrsh7th/cmp-path": "nvim_plugin-hrsh7th/cmp-path",
-        "nvim_plugin-hrsh7th/nvim-cmp": "nvim_plugin-hrsh7th/nvim-cmp",
-        "nvim_plugin-j-hui/fidget.nvim": "nvim_plugin-j-hui/fidget.nvim",
-        "nvim_plugin-johmsalas/text-case.nvim": "nvim_plugin-johmsalas/text-case.nvim",
-        "nvim_plugin-lewis6991/gitsigns.nvim": "nvim_plugin-lewis6991/gitsigns.nvim",
-        "nvim_plugin-lnc3l0t/glow.nvim": "nvim_plugin-lnc3l0t/glow.nvim",
-        "nvim_plugin-lukas-reineke/indent-blankline.nvim": "nvim_plugin-lukas-reineke/indent-blankline.nvim",
-        "nvim_plugin-m4xshen/hardtime.nvim": "nvim_plugin-m4xshen/hardtime.nvim",
-        "nvim_plugin-mbbill/undotree": "nvim_plugin-mbbill/undotree",
-        "nvim_plugin-mfussenegger/nvim-lint": "nvim_plugin-mfussenegger/nvim-lint",
-        "nvim_plugin-mrcjkb/rustaceanvim": "nvim_plugin-mrcjkb/rustaceanvim",
-        "nvim_plugin-neovim/nvim-lspconfig": "nvim_plugin-neovim/nvim-lspconfig",
-        "nvim_plugin-nosduco/remote-sshfs.nvim": "nvim_plugin-nosduco/remote-sshfs.nvim",
-        "nvim_plugin-numToStr/Comment.nvim": "nvim_plugin-numToStr/Comment.nvim",
-        "nvim_plugin-nvim-lua/plenary.nvim": "nvim_plugin-nvim-lua/plenary.nvim",
-        "nvim_plugin-nvim-lualine/lualine.nvim": "nvim_plugin-nvim-lualine/lualine.nvim",
-        "nvim_plugin-nvim-telescope/telescope-file-browser.nvim": "nvim_plugin-nvim-telescope/telescope-file-browser.nvim",
-        "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim": "nvim_plugin-nvim-telescope/telescope-fzf-native.nvim",
-        "nvim_plugin-nvim-telescope/telescope-ui-select.nvim": "nvim_plugin-nvim-telescope/telescope-ui-select.nvim",
-        "nvim_plugin-nvim-telescope/telescope.nvim": "nvim_plugin-nvim-telescope/telescope.nvim",
-        "nvim_plugin-nvim-tree/nvim-tree.lua": "nvim_plugin-nvim-tree/nvim-tree.lua",
-        "nvim_plugin-nvim-tree/nvim-web-devicons": "nvim_plugin-nvim-tree/nvim-web-devicons",
-        "nvim_plugin-nvim-treesitter/nvim-treesitter-context": "nvim_plugin-nvim-treesitter/nvim-treesitter-context",
-        "nvim_plugin-rafamadriz/friendly-snippets": "nvim_plugin-rafamadriz/friendly-snippets",
-        "nvim_plugin-rcarriga/nvim-notify": "nvim_plugin-rcarriga/nvim-notify",
-        "nvim_plugin-rmagatti/auto-session": "nvim_plugin-rmagatti/auto-session",
-        "nvim_plugin-ron/ron.vim": "nvim_plugin-ron/ron.vim",
-        "nvim_plugin-saadparwaiz1/cmp_luasnip": "nvim_plugin-saadparwaiz1/cmp_luasnip",
-        "nvim_plugin-sindrets/diffview.nvim": "nvim_plugin-sindrets/diffview.nvim",
-        "nvim_plugin-stevearc/conform.nvim": "nvim_plugin-stevearc/conform.nvim",
-        "nvim_plugin-stevearc/dressing.nvim": "nvim_plugin-stevearc/dressing.nvim",
-        "nvim_plugin-tpope/vim-sleuth": "nvim_plugin-tpope/vim-sleuth",
-        "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround",
-        "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim",
-        "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag",
-        "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim",
-        "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp",
-        "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua",
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1745585761,
-        "narHash": "sha256-xS3068xhndFrZh9GcTTNTmeebGq1A3uVykRRdzJOj3Y=",
-        "ref": "refs/heads/master",
-        "rev": "e5523910a0c07c88d026d006f5962434bfa53548",
-        "revCount": 277,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "common",
-          "ragenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741400194,
-        "narHash": "sha256-tEpgT+q5KlGjHSm8MnINgTPErEl8YDzX3Eps8PVc09g=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "16b6045a232fea0e9e4c69e55a6e269607dd8e3f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "ros_neovim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745207416,
-        "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/hosts/h001/flake.nix b/hosts/h001/flake.nix
deleted file mode 100644
index a49f185..0000000
--- a/hosts/h001/flake.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
-    # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-
-    # Use relative to get current version for testing
-    # common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
-
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
-  };
-
-  outputs =
-    {
-      nixpkgs,
-      common,
-      ros_neovim,
-      ...
-    }:
-    let
-      configuration_name = "h001";
-      lib = nixpkgs.lib;
-    in
-    {
-      nixosConfigurations = {
-        "${configuration_name}" = (
-          lib.nixosSystem {
-            modules = [
-              common.nixosModules.default
-              ros_neovim.nixosModules.default
-              ./configuration.nix
-              ./hardware-configuration.nix
-              (
-                { config, pkgs, ... }:
-                {
-                  environment.systemPackages = with pkgs; [
-                    lua
-                  ];
-
-                  ringofstorms_common = {
-                    systemName = configuration_name;
-                    boot.grub.enable = true;
-                    secrets.enable = true;
-                    programs = {
-                      tailnet.enable = true;
-                      ssh.enable = true;
-                      docker.enable = true;
-                    };
-                    users = {
-                      admins = [ "luser" ]; # First admin is also the primary user owning nix config
-                      users = {
-                        root = {
-                          openssh.authorizedKeys.keys = [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
-                          ];
-                        };
-                        luser = {
-                          openssh.authorizedKeys.keys = [
-                            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZigrRMF/HHMhjBIwiOnS2pqbOz8Az19tch680BGvmu nix2h001"
-                          ];
-                          extraGroups = [
-                            "networkmanager"
-                            "video"
-                            "input"
-                          ];
-                          shell = pkgs.zsh;
-                          packages = with pkgs; [
-                            bitwarden
-                            vaultwarden
-                          ];
-                        };
-                      };
-                    };
-                    homeManager = {
-                      users = {
-                        luser = {
-                          imports = with common.homeManagerModules; [
-                            kitty
-                            tmux
-                            atuin
-                            direnv
-                            git
-                            nix_deprecations
-                            postgres
-                            ssh
-                            starship
-                            zoxide
-                            zsh
-                          ];
-                        };
-                      };
-                    };
-                  };
-                }
-              )
-            ];
-          }
-        );
-      };
-    };
-}
diff --git a/hosts/h001/hardware-configuration.nix b/hosts/h001/hardware-configuration.nix
deleted file mode 100644
index 9a0573e..0000000
--- a/hosts/h001/hardware-configuration.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
-    "nvme"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-    "sr_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXROOT";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
-    options = [
-      "fmask=0077"
-      "dmask=0077"
-    ];
-  };
-
-  swapDevices = [
-    {
-      device = "/.swapfile";
-      size = 64 * 1024; # 64GB
-    }
-  ];
-  networking.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/hosts/h002/flake.nix b/hosts/h002/flake.nix
index a3ce5aa..00a46ef 100644
--- a/hosts/h002/flake.nix
+++ b/hosts/h002/flake.nix
@@ -5,9 +5,9 @@
 
     # Use relative to get current version for testing
     # common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
 
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
@@ -40,6 +40,9 @@
                   ringofstorms_common = {
                     systemName = configuration_name;
                     boot.grub.enable = true;
+                    general = {
+                      disableRemoteBuildsOnLio = true;
+                    };
                     secrets.enable = true;
                     desktopEnvironment.gnome.enable = true;
                     programs = {
diff --git a/hosts/h002/hardware-configuration.nix b/hosts/h002/hardware-configuration.nix
index ceaa644..4065b7c 100644
--- a/hosts/h002/hardware-configuration.nix
+++ b/hosts/h002/hardware-configuration.nix
@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:
diff --git a/hosts/linode/l001/flake.nix b/hosts/linode/l001/flake.nix
index 8c929dc..167c53a 100644
--- a/hosts/linode/l001/flake.nix
+++ b/hosts/linode/l001/flake.nix
@@ -2,8 +2,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     deploy-rs.url = "github:serokell/deploy-rs";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/hosts/linode/l002/flake.nix b/hosts/linode/l002/flake.nix
index 55bba4b..ec12a00 100644
--- a/hosts/linode/l002/flake.nix
+++ b/hosts/linode/l002/flake.nix
@@ -2,8 +2,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     deploy-rs.url = "github:serokell/deploy-rs";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/hosts/linode/l002/nginx.nix b/hosts/linode/l002/nginx.nix
index 4b61a1c..7b47763 100644
--- a/hosts/linode/l002/nginx.nix
+++ b/hosts/linode/l002/nginx.nix
@@ -72,7 +72,7 @@
         enableACME = true;
         forceSSL = true;
         locations."/" = {
-          proxyPass = "http://100.64.0.1";
+          proxyPass = "http://100.64.0.2:6610";
         };
       };
 
@@ -145,7 +145,7 @@
     streamConfig = ''
       server {
         listen 3032;
-        proxy_pass 100.64.0.1:3032;
+        proxy_pass 100.64.0.2:6611;
       }
     '';
   };
diff --git a/hosts/lio/containers.nix b/hosts/lio/containers.nix
index c7ccf60..d22ca25 100644
--- a/hosts/lio/containers.nix
+++ b/hosts/lio/containers.nix
@@ -75,13 +75,6 @@
         #     return = "404"; # or 444 for drop
         #   };
         # };
-        "git.joshuabell.xyz" = {
-          # GIT passthrough
-          locations."/" = {
-            proxyPass = "http://10.0.0.2:3000";
-          };
-        };
-
         "_" = {
           default = true;
           locations."/" = {
@@ -89,15 +82,6 @@
           };
         };
       };
-
-      # STREAMS
-      streamConfig = ''
-        server {
-          listen 3032;
-          proxy_pass 10.0.0.2:3032;
-        }
-      '';
-
     };
 
     networking.firewall.allowedTCPPorts = [
diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock
index 0faa78c..5a7dc78 100644
--- a/hosts/lio/flake.lock
+++ b/hosts/lio/flake.lock
@@ -28,21 +28,17 @@
     "common": {
       "inputs": {
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_2",
         "ragenix": "ragenix"
       },
       "locked": {
-        "lastModified": 1745881365,
-        "narHash": "sha256-ihAOLcQf9VGLCW94POGL+aoqLK9zvC05IYEYg0GAjmY=",
-        "ref": "refs/heads/master",
-        "rev": "e671f877d9a07907d07bd3dfdad581aa09c057fc",
-        "revCount": 408,
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+        "lastModified": 1,
+        "narHash": "sha256-PLiddkpkHZxcS8MiVlI8k3rbBWNqDb0mrHWdRvadANI=",
+        "path": "../../common",
+        "type": "path"
       },
       "original": {
-        "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles"
+        "path": "../../common",
+        "type": "path"
       }
     },
     "crane": {
@@ -107,11 +103,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744743431,
-        "narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
+        "lastModified": 1745557122,
+        "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=",
         "owner": "rycee",
         "repo": "home-manager",
-        "rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
+        "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1",
         "type": "github"
       },
       "original": {
@@ -161,22 +157,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1744463964,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1741379970,
         "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
@@ -192,13 +172,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_3": {
       "locked": {
-        "lastModified": 1745868005,
-        "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=",
+        "lastModified": 1744168086,
+        "narHash": "sha256-S9M4HddBCxbbX1CKSyDYgZ8NCVyHcbKnBfoUXeRu2jQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "330d0a4167924b43f31cc9406df363f71b768a02",
+        "rev": "60e405b241edb6f0573f3d9f944617fe33ac4a73",
         "type": "github"
       },
       "original": {
@@ -208,7 +188,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1745250177,
         "narHash": "sha256-NPkMDgRHLVuNHs7y/MK3qYbE/5uo42mskUIygSHEOLM=",
@@ -1124,15 +1104,15 @@
         "agenix": "agenix",
         "crane": "crane",
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1741508717,
-        "narHash": "sha256-iQf1WdNxaApOFHIx4RLMRZ4f8g+8Xp0Z1/E/Mz2rLxY=",
+        "lastModified": 1744897914,
+        "narHash": "sha256-GIVU92o2TZBnKQXTb76zpQbWR4zjU2rFqWKNIIpXnqA=",
         "owner": "yaxitech",
         "repo": "ragenix",
-        "rev": "2a2bea99d74927e54adf53cbf113219def67d5c9",
+        "rev": "40f2e17ecaeab4d78ec323e96a04548c0aaa5223",
         "type": "github"
       },
       "original": {
@@ -1144,13 +1124,13 @@
     "root": {
       "inputs": {
         "common": "common",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "ros_neovim": "ros_neovim"
       }
     },
     "ros_neovim": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
         "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim",
         "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim",
         "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring",
@@ -1216,11 +1196,11 @@
         "rev": "e5523910a0c07c88d026d006f5962434bfa53548",
         "revCount": 277,
         "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
+        "url": "https://git.joshuabell.xyz/nvim"
       },
       "original": {
         "type": "git",
-        "url": "https://git.joshuabell.xyz/ringofstorms/nvim"
+        "url": "https://git.joshuabell.xyz/nvim"
       }
     },
     "rust-overlay": {
diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix
index 627e69d..564197c 100644
--- a/hosts/lio/flake.nix
+++ b/hosts/lio/flake.nix
@@ -4,10 +4,10 @@
     # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Use relative to get current version for testing
-    # common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "path:../../common";
+    # common.url = "git+https://git.joshuabell.xyz/dotfiles";
 
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/hosts/oracle/o001/flake.nix b/hosts/oracle/o001/flake.nix
index f18005e..8e0cac7 100644
--- a/hosts/oracle/o001/flake.nix
+++ b/hosts/oracle/o001/flake.nix
@@ -2,8 +2,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
     deploy-rs.url = "github:serokell/deploy-rs";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/hosts/oren/flake.nix b/hosts/oren/flake.nix
index 9701075..9e0cc3e 100644
--- a/hosts/oren/flake.nix
+++ b/hosts/oren/flake.nix
@@ -5,9 +5,9 @@
 
     # Use relative to get current version for testing
     # common.url = "path:../../common";
-    common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles";
+    common.url = "git+https://git.joshuabell.xyz/dotfiles";
 
-    ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim";
+    ros_neovim.url = "git+https://git.joshuabell.xyz/nvim";
   };
 
   outputs =
diff --git a/readme.md b/readme.md
index 066ded1..556aa39 100644
--- a/readme.md
+++ b/readme.md
@@ -24,6 +24,8 @@
 1. Install nix minimal:
 
 - Partitions
+  - <https://nixos.org/manual/nixos/stable/#sec-installation>
+  - <https://nixos.wiki/wiki/NixOS_Installation_Guide#Swap_file>
   - `parted /dev/DEVICE -- mklabel gpt` - make GPT partition table
   - `parted /dev/DEVICE -- mkpart NIXROOT ext4 2GB 100%` - make root partition (2GB offset for boot)
   - `parted /dev/DEVICE -- mkpart ESP fat32 1MB 2GB` - make boot partition (2GB)
@@ -52,14 +54,14 @@
 
 - `cat /etc/ssh/ssh_host_ed25519_key.pub ~/.ssh/id_ed25519.pub`
   - On an already onboarded computer copy these and add them to secrets/secrets.nix file
-  - Rekey secrets: `nix run github:yaxitech/ragenix -- --rules ~/.config/nixos-config/common/secrets/secrets/secrets.nix -r`
+  - Rekey secrets: `nix run github:yaxitech/ragenix -- --rules ~/.config/nixos-config/secrets/secrets.nix -r`
   - Maybe copy hardware/configs over and setup, otehrwise do it on the client machine
-- git clone nixos-config `git clone https://git.joshuabell.xyz/ringofstorms/dotfiles ~/.config/nixos-config`
+- git clone nixos-config `git clone https://git.joshuabell.xyz/dotfiles ~/.config/nixos-config`
 - Setup config as needed
   - top level flake.nix additions
   - add hosts dir and files needed
 - `sudo nixos-rebuild switch --flake ~/.config/nixos-config/hosts/$HOSTNAME`
-- Update remote, ssh should work now: `cd ~/.config/nixos-config && git remote remove origin && git remote add origin "ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles" && git pull origin master`
+- Update remote, ssh should work now: `cd ~/.config/nixos-config && git remote remove origin && git remote add origin "ssh://git.joshuabell.xyz:3032/dotfiles" && git pull origin master`
 
 ## Local tooling