From ccce9fbd311c0d377d56e6c71f0869a51d75ed76 Mon Sep 17 00:00:00 2001
From: Filippo Berto <berto.f@protonmail.com>
Date: Sat, 29 Jul 2023 21:38:06 +0200
Subject: [PATCH] Fix s3fs mount and secrets

---
 instances/baldur/hm.nix               |  40 ++++++++++++++------------
 instances/baldur/hm_tiziano.nix       |   4 +++
 instances/freya/hm.nix                |   4 +++
 instances/loki/hm.nix                 |   4 +++
 instances/loki/hm_tiziano.nix         |   4 +++
 instances/odin/hm.nix                 |   4 +++
 secrets/baldur_wg_priv.age            | Bin 966 -> 1029 bytes
 secrets/garage_bertof_baldur_key.age  |  22 +++++++-------
 secrets/garage_bertof_freya_key.age   | Bin 665 -> 645 bytes
 secrets/garage_bertof_loki_key.age    | Bin 620 -> 666 bytes
 secrets/garage_bertof_odin_key.age    |  22 +++++++-------
 secrets/garage_rpc_secret.age         | Bin 1031 -> 1040 bytes
 secrets/garage_tiziano_baldur_key.age |  21 +++++++-------
 secrets/garage_tiziano_loki_key.age   | Bin 550 -> 578 bytes
 secrets/odin_wg_priv.age              |  38 ++++++++++++------------
 secrets/oppo_wg_priv.age              |  38 ++++++++++++------------
 secrets/secrets.nix                   |   2 +-
 secrets/spotify_password.age          |  32 ++++++++++++---------
 secrets/thor_wg_priv.age              |  39 +++++++++++++------------
 secrets/wg_psk.age                    | Bin 1007 -> 994 bytes
 20 files changed, 151 insertions(+), 123 deletions(-)

diff --git a/instances/baldur/hm.nix b/instances/baldur/hm.nix
index 5cba2f2..f3fb113 100644
--- a/instances/baldur/hm.nix
+++ b/instances/baldur/hm.nix
@@ -7,6 +7,28 @@
     };
     packages = builtins.attrValues { inherit (pkgs) nix-prefetch-scripts; };
   };
+
+  systemd.user.services.garage-home-s3 = {
+    Unit = {
+      After = [ "network.target" "network-online.target" "local-fs.target" ];
+      AssertPathIsDirectory = "/home/bertof/s3";
+      AssertPathIsReadWrite = "/home/bertof/s3";
+      Description = "Mount S3 bucket in bertof's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
+      Wants = [ "network.target" "network-online.target" ];
+    };
+    Service = {
+      ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_baldur_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
+      Type = "exec";
+    };
+    Install = {
+      WantedBy = [ "default.target" ];
+    };
+  };
+
   imports = [
     ../../modules/hm/__basic.nix
 
@@ -26,23 +48,5 @@
     # ../../modules/hm/noti.nix
   ];
 
-  systemd.user.services.garage-home-s3 = {
-    Unit = {
-      After = [ "network.target" "network-online.target" "local-fs.target" ];
-      AssertPathIsDirectory = "/home/bertof/s3";
-      AssertPathIsReadWrite = "/home/bertof/s3";
-      Description = "Mount S3 bucket in bertof's home";
-      Wants = [ "network.target" "network-online.target" ];
-    };
-    Service = {
-      ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_baldur_key.path},use_path_request_style,url=http://localhost:3900";
-      Type = "exec";
-    };
-    Install = {
-      WantedBy = [ "default.target" ];
-    };
-  };
-
-
   home.stateVersion = "22.05";
 }
diff --git a/instances/baldur/hm_tiziano.nix b/instances/baldur/hm_tiziano.nix
index b66552b..f5429ea 100644
--- a/instances/baldur/hm_tiziano.nix
+++ b/instances/baldur/hm_tiziano.nix
@@ -13,10 +13,14 @@
       AssertPathIsDirectory = "/home/tiziano/s3";
       AssertPathIsReadWrite = "/home/tiziano/s3";
       Description = "Mount S3 bucket in tiziano's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
       Wants = [ "network.target" "network-online.target" ];
     };
     Service = {
       ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_baldur_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
       Type = "exec";
     };
     Install = {
diff --git a/instances/freya/hm.nix b/instances/freya/hm.nix
index 183a14f..1a908fe 100644
--- a/instances/freya/hm.nix
+++ b/instances/freya/hm.nix
@@ -17,10 +17,14 @@
       AssertPathIsDirectory = "/home/bertof/s3";
       AssertPathIsReadWrite = "/home/bertof/s3";
       Description = "Mount S3 bucket in bertof's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
       Wants = [ "network.target" "network-online.target" ];
     };
     Service = {
       ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_freya_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
       Type = "exec";
     };
     Install = {
diff --git a/instances/loki/hm.nix b/instances/loki/hm.nix
index 6c0d809..eca565a 100644
--- a/instances/loki/hm.nix
+++ b/instances/loki/hm.nix
@@ -13,10 +13,14 @@
       AssertPathIsDirectory = "/home/bertof/s3";
       AssertPathIsReadWrite = "/home/bertof/s3";
       Description = "Mount S3 bucket in bertof's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
       Wants = [ "network.target" "network-online.target" ];
     };
     Service = {
       ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_loki_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
       Type = "exec";
     };
     Install = {
diff --git a/instances/loki/hm_tiziano.nix b/instances/loki/hm_tiziano.nix
index e6548b2..d34cc44 100644
--- a/instances/loki/hm_tiziano.nix
+++ b/instances/loki/hm_tiziano.nix
@@ -13,10 +13,14 @@
       AssertPathIsDirectory = "/home/tiziano/s3";
       AssertPathIsReadWrite = "/home/tiziano/s3";
       Description = "Mount S3 bucket in tiziano's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
       Wants = [ "network.target" "network-online.target" ];
     };
     Service = {
       ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d tiziano /home/tiziano/s3 -o passwd_file=${nixosConfig.age.secrets.garage_tiziano_loki_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
       Type = "exec";
     };
     Install = {
diff --git a/instances/odin/hm.nix b/instances/odin/hm.nix
index 2e6e164..b9f6323 100644
--- a/instances/odin/hm.nix
+++ b/instances/odin/hm.nix
@@ -48,10 +48,14 @@
       AssertPathIsDirectory = "/home/bertof/s3";
       AssertPathIsReadWrite = "/home/bertof/s3";
       Description = "Mount S3 bucket in bertof's home";
+      StartLimitBurst = 5;
+      StartLimitInterval = 200;
       Wants = [ "network.target" "network-online.target" ];
     };
     Service = {
       ExecStart = "${pkgs.s3fs}/bin/s3fs -f -d bertof /home/bertof/s3 -o passwd_file=${nixosConfig.age.secrets.garage_bertof_odin_key.path},use_path_request_style,url=http://localhost:3900";
+      Restart = "always";
+      RestartSec = 30;
       Type = "exec";
     };
     Install = {
diff --git a/secrets/baldur_wg_priv.age b/secrets/baldur_wg_priv.age
index dd0e1e254de0cafa7e194320d77d0e2c779e9330..43239cc6b39eef8a2066b8e9716fb4cee052226e 100644
GIT binary patch
delta 942
zcmX@c-pVmSr#`6C#lOm^qN*q_u*kBYD!?GaI3m+L%P%Z1+{rSuFhgJ8F)1UhsHoW0
zgv-R$*sDZ8vE0ii(yOw<I4>mE!!X$}KeVheBF!Y&Bg!(+yTr4wATKc^olDnFp}06h
zH#Nn`)YQ;Y!Q9u$$iPuSKdi{Zr!?O&xgshkFVM-v&#fXnB;47;zbMzkuOu_r+$qb^
z!ZIi+B+1o;E66v=*)62dvn<ju(NaG%&^6b@J1WprKRYwrN8h_Bt+XJe(yu%x&DYa)
z;z#lDvh4f{%b-95uZ+mx<m@!#;>0}PG`G-9lWcQu@3KI{G&ipxFE2Oaa>GEbVzWg3
zpltI>Prt0PY**Jrw=73f|F9gxOmCxtoWdvrV{dbhR7WqfEZ6+W@r>f(0TC8X6+uo}
zk%p0m9!6=wzQws-<ymGvX35$f{*^wV76Bnip{032K^~!8DJhZWsV3nbx%pN4!A9XF
z<vH$Nr7mXrQHkbJ6(*@kJ{|!%6(OPNhC!i|&oYYFX9t9a6;)ORq*vxS`?}^hCOdkh
z<_Ec#dzU&!rj$jwyBqk0q??%J7nZwnnd+xU<&=7bhZ?(>`C62kmWMd|=lgpn8HAbp
zq#9Kerev6Sdgc4MJ9%WI$3R57vvGu@f{%NkN2F<KiIaC=c)q7wvSodErH8p+QmC6r
zm|tL3l~ZD6g_}`msd-9}Cs$E=gn?;}sewyoR9I19ZeDh2YGR;8lB-LSaY&h)Ur}Ya
zwnv_;Nxnw~hIKjSmZr{*3aO^)#x8#T-dW+PhOSOUF1cknE(OJbRmC0_X(1UA{^1_=
z+G$B);ief8$y_0MW=8sMiNUFv9$u~)?%AQP5dmJ|MP`LnrT%51fyO0XxkhE_MFHiO
zVC!<~%#Evc(~D9Qi&GWMVpO=oEK-g2!%`d*GYu<)60^;+6ZM^n%tCTYwLL1!!`(uP
z3rzfyQ!P_M%pEJVO^ZxiGXgy$>Wxy}10y2yy?rb*xSY+S5+l5fvi;KCT>Nt@^9n+8
zeUoxBd`%p=baizVk^|B*eKXA~0}QJQE&QFG3Or0xEZoEM98HZ9jXlG%Q=K#Y3=BgP
zy^M;vVj^N>U;GY`b!A=eC9?b4_ck+)S@YJVUw_ay?|9JnvVTp2@oF<p&WTgqr0{QF
ny>-^_?fD;H%E*Z?lWad*9l>F-=#<>X+pe?xt<OK3xh)j{I=VgX

delta 878
zcmZqWIL1Cfr#`(r%iPt~&oI)-F{Pr?#U&)&J15d5$EeCMD5t8xH9RY+Fvru&-^|g_
zmCHTUBHbd>#3<M&sv^nDB+@V?)WFXt-O|}HEiALp-#5a;zg*wcBh4VdlS|i5p}06h
zH#Nn`)YQ;Y!Q9u$$iPv-FQC-X!=ub3IHj`Gt-##V+s)S^(K5}f)WF2qEHA^w(>FUL
z+1w(?F*_rl%gx2bM8C+(uRKIM!muK+Si2xG#4RMnFRLUeH!;lD)g?47BQK!btJ0%<
z;z#lD3NL+Mudt#L*MeZbveJyq0<ZK6gS?!`aAOZkW8Y$DV{=o}$kYt?+$<9=e@l}L
z*W?U~oPr#eMBlt(*Ah>2lZ=Rb|7`cvU@yarfGY1&r?P-dmps?W@r>f(=7nK-K?NqR
zrMc$85n;JbB_$<h`L0IhNreIW>5e((d6^m67M>N^A#Sc*#b%C{PHCY*-WFl{McM9^
zk;OShKKgEsVfy*05pLyy9)7M)B@y~5Wf8uU&oYYFCzoagR7OUmn3h>&hKGj)XPD>a
zxOn@yc!YRGXeX7Jdm0oMRyz9@X{Q@-1qK-yrkR>JmWCCkhL>iVdgPXCo0^5CMmh)Q
z1s8c`c!rpTR|dJ3CuuvP$3R57vvGu@LQ1Z0aD-=yX=-UeQB_`!pJ%;cP)1N*xJy`R
zVOnK+SYniaRbf`5i(`aKC|9XlZa`FtlS^JyrM`>4Q)P&6xruA0UucfMldra!S-MG9
zM3PgmakgbdHoA2==9Z?;jtYKez7+<R`38xuZayvrrD1vg!H!P(z7_fgZkb7?W?}kO
z^`1o)?#a2q&Y@fZF3xEczGYbf0igkfnI`&P$>!$zWr03M#u?73d5NysRV9(hfgT=#
zdC4H_v|Q8!+;h!!(~D9Qi&GV9s_onq>U<Lv61nnR3_V@T+<e0IQz|S%Oni%61G#i{
zbrp*8ox>{)%9FJt9rexJ%bfC(lEYFBD_wmoGSkaUGxAfs9m5Ms%uK@)O-;DI_}g5R
z;?s!xm@0m^k?HgyliR6x`#AG1a%jn}KfUGDsr(RE-Iuc}rk#A(|N9|>XV$Z8Osn}P
duAjgr<FRQ)-b2rwY!0RS;y2j+Gu?6GGyp77Coup3

diff --git a/secrets/garage_bertof_baldur_key.age b/secrets/garage_bertof_baldur_key.age
index 18a839a..b070d8b 100644
--- a/secrets/garage_bertof_baldur_key.age
+++ b/secrets/garage_bertof_baldur_key.age
@@ -1,12 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ 3evCb5M2t5/qI3AkoXFwDzswW9AofCkqN2Ca4qqLNVY
-gNtgLnv/DaKVS+HI59WMziISxUltnK56UWAbU12W1yc
--> ssh-ed25519 7MB20A Rmn3xlZ5nhf6+nMrhZsYRf1TDnuKA7W879FJqGQ6DkY
-1gQlRxIV0ABpRScI0Qhq0yzsP3pyL7Qc95wADMOrZvo
--> ssh-ed25519 Wzv8ew M9PZsh+aDheaL7m89l3g/3ecq/YmJeH3mbtt8Q1QaUA
-RcWXxJGJiNwbz1+f5pYL0L3+jpSyTg1Q2+PIZWsrC/s
--> xdK^*-grease d
-uSLYEtSHXLHiDSiYjd4VAgIaA2qhNIXnam5zF3llgchSrk/3G5fUtAZ57i6ErnVW
-LXqj5uXVJrG5O0tc8aVDz3Y4NjUxXRwVxYM
---- /9L7n8gpyvn7/hSHqF5ROqm6vDJsf6T3Uy63b/jBCGM
-��r.���s6����y�:�!I.)��J2�pc�[Ee(�?hP��QL[��� ����3�y_lҔ�kި���чb���F�l�f��z�۵�{UO)m	���x��KO�鈫���
\ No newline at end of file
+-> ssh-ed25519 13iwjQ T8WFR+jpiGnzHP7E7E5jj4pl7SsWDkC9FdqBQ2X8dmY
+/q61iSC+mwHHCCyRiQBci4edvb3t+ZDUjULP0zmBa0Q
+-> ssh-ed25519 7MB20A UScCTlABJKMocqgEE2zU8rp+ND6nRfI8vwjki6LoC0Q
+i4JSJeeuavrAAYZDnThtDfkcpbYZpvWHPCrs0RgDFS0
+-> ssh-ed25519 Wzv8ew PqgRzMfoG+pa13AkvzDtiBXsCybuyZvYHorPpELx3T0
+1StfjLr5eiHeCN4+slh6iXGnMsh1NxklM92wikeMZFE
+-> yhoA<Yx|-grease $5weSkNA ^j
++Pk/LkSWndZxyak6xsBd5e5Of3MMRtoOxs3grIc43Bx+keOqAJBVU2IuEWiWMnma
+eAoSbeukywmgxLftbz+ppTE4YQlyc2OiFLflwoN5QOdV3ZDaLg
+--- XasY9PCRKIsxAK71yBnZvuk9OZ5UUJaYzD3F82LhVM8
+ٞ�6��h�禕�	����e��y�[m��=�X�
��BS�c�mH�y<������Ȃ"Y�Ϻ'#--�=Q�-X�v��	�fp2u~�;�JPD�в��y�W�t*%;������x}b;�6�
\ No newline at end of file
diff --git a/secrets/garage_bertof_freya_key.age b/secrets/garage_bertof_freya_key.age
index 4486dc46a818d8a8a7b47ea3aa90b39accf0d590..f68cb7211f13629d15cb509e982cae2e881502ac 100644
GIT binary patch
delta 592
zcmbQq+R8dXr{2vo#3&*(&DASE-Mlj0q%1WnB%snGEhj3fC@3-{D>Bf#*r3AQAT`4+
znX4+Z$}lT4&EF)w$lKT0NxL*FJkiHLFE}ONB{AEu+#)D2Gb**pCn-7Cl}p!7p}06h
zH#Nn`)YQ;Y!Q9u$$iPv-D5p}pD6*o&(K98;Br+)7$1T)2-Kf;qC^6E&%h$rku-MZh
zF)y{O*uo>7E2-Ei&n>4!-zmV&%Ofp6(ap`+GomWhxi}@G*dW<G%q7C5$SEn(G$+J&
z;z#lNTw~AhYzxN{b8YV`BNIcfyg=i;;IN`#CnIyCY=6Tt|8fh9EH9^2|8Q5X9JBI3
z(?sLsf`Hr%#|*a|_v}i?@HCgKz~ID0^EAisK$DcnGViR!{LEsIPeMx)W9yQ1(~D9Q
zi&GVR6<oQ}D$PTDN^-RQf{h&Wo$}1h9qUV7BMX9awNw4{vqI7g(hbtx3W{A*(<36I
zqVg>QLJKoPJ&P0F3p360w8OL$xtvoBvW$v-&9aL;-9m!2!@Zr;E&WnU!`!r!{gPc1
zb5hKTxpZ}P70Lpf3Qe5CynM{^imSr4Bg~x*J@U%@lQPP(g3=v}or;q~veHvbyz0wc
zUAgw(lDv`dr!ZgZciKsJs|c@5CcWgQyN1%%$4Y#H8F;7Y@M|`&TU47c>r4K$6OE?t
zl}jrxNG)RieSe9Ez<izy!h$as{(Hiiow9V!`-u1R4c_nFDaqy|I^ED$$KcB+fvRV-
g3cQ)io#sT{d$W?~`imEfniY;7m?-;F{r7(_0LsPGd;kCd

delta 613
zcmZo=oyj^ur#{cjFgT~o#n02(AjdE?%Fi?~$=$HT&@;@{#WKAh%{VDEC_gOFJt)`1
zmCH5V-7PtyI4~#G%g8Lx#H^q!OW#G?uPWWl&nwZ<tiUrnBCsMq($C2(nM>DBp}06h
zH#Nn`)YQ;Y!Q9u$$iPv-EiEaz%rG}6tjr=Q(5=!u&8?^)snjsD(74PgyCBRb)73N3
ztT?waImp13D=^gA#U#+F$XDOV$G|(#wLCT4!y~-ZE5O;cEGon&+c_uLt;);LvmmQ@
z;z#lNf($>)&|p)?^nAyh<gg@{BLAvV|9k^Wi|p+5iacM7lCqTa<kTR;kSbTMij34$
zmz<39lJvxUU;XeP*E0Q(iX{KEtRmA)mxx@if;?w8mt6PMkT6G(PhyM={B+ZcQWJ|)
z74mXJ)Y2R@6yiM<eKHly^Ays(b<zXlqw2Yg3?fra-2BSTQi3d_!b}`XD~wW;($h-y
zvqGvu-Cd0%0s}HK%DjB?^>Y#nv<<yHB8vi|O8qm+QX|uhEYm!>%u|iaGfI+5N>Yvd
zEj^=>BC^8sjKX}YD*Zw-jkN>Aywbz7xpZ}P6;jN~!ZMwU^D0dWv=hssqSA~@4eHCY
zEz5&TTs?BV_1(1tJxW7!lZ#EG47ik+Jk2o{WIwh<QX^*X<Y#R@kMAA%e|Yz_1A=l)
z`+Y4K`17tZ<=A<+{9<?iZq&?qTKiC;&FRMvZZCWu-g0k`ith&L-!U>}Uo_2S9~oIP
zy^HBv5*r#O&42!?en#AtiI%qy?-OESb-XN+{Nl;M&wSQXAF>_Wb6cro&W+_I-vM$Q
B+XVms

diff --git a/secrets/garage_bertof_loki_key.age b/secrets/garage_bertof_loki_key.age
index 235fe16665a714e47587ea9837e7365d2ab5b9e0..0af64e6c4273f0dc05f39e5e284a8a60d5eb87a9 100644
GIT binary patch
delta 614
zcmaFEGK+PBPQ8ywL9t<3Ntjtku9tC@Yp!o$n3H#eX{mm0sar^7uz96^QhricV2QqQ
zGFPszi${Q^YkE>(rkit$Ym{l3W07Y;YFS}Gs7p{~sIQ5aPi1jLXjy8c1(&X!LUD11
zZfc5=si~o*g1N7gk%6Ovi-&8Ovw4(RLAaSwR(fQ)xtqSPUr=h1siRAFrlE;vP_kF0
zc2#Onigsosm#0OdZ@8ClMplVeW^rkzaaoRKvSEp#kwJ#1ms@~GS!hYNmsz4yRd7l2
z#E;_jq1h4snVG?c#Sxyyj^1wiu1@a$m7%3Y6#<3@E``Nq8R=<0`S~6tmJyy@hGoIo
zuE8#bjv?kzhT%Ti?nQ2vWf=h(Nhx{${%(0@o=L%}rH<+OMj`1SpX4~FCaCJB7o{c^
zrz(_&=lO?nWm$&%`WmEJri6#(6zAo*WY_0=T6p<679@H2L>A@+`cxGa`&U}#q=sZU
z8fEx67UUW_TR3HE=NJW4WtuvsJ8?OdW)|pI1m{!)c{qlf`xpBb2M0zPnE9AHT4V*6
zm>Q)gXGLU`1Y7tT1e%#vn1^^86=o*~1#;=?>MG=WMwsO~8WvVXx|$o8I(z#CnAe9C
zWETch>U-t7mU;S`7VBq+2OFlCX%};`{6BDC$;n;Y-_%v)M|F$dm%Y7{f6jRDWa^5;
zY%3HNUjO>@jqZh9kvp0`)BoLM>r>9`nk;tW|7{(w(E4bt;$0K8Z11woa5iAzOGuf?
z;;W|Uu|C%I`vSGrD?0m3UwLd;eI{3V?xZcE9LN5hw!GW=$0uTvx!Wb?M|(Mbu6F_e
D;cVMq

delta 567
zcmbQm`i5nKPQ8DnbGnm7YHC)Je?)S4V6Kl_qI+_Vv86$zQMz+fYPL^7T6(dWzkzR_
z0hd`ofpL+$NpNLev7>pKM{&8AdsT#sX;5N{MO0-;VYs)WlTUbLp?79*I+w1ULUD11
zZfc5=si~o*g1N7gk%6N^d68L>fm2{*gqOcpYIuQZrCUX$p?0{FM}CN_SA?TsxSvUA
zdbvSCcA2p!S6*IKkdLuXzDrV;cbH#Pp+}*Gk#~eyhEY{=o_}a?nW3*`o@uFLT3}e@
z#E;_je)*ObsrnYB-bTq`iH_xdiN3{#`l+7T$(2Qp$*BRE=1xWy`kn=$K5iCVK}Ooi
zp(*|)*~w;Rer_2#X-59;LBVBFdC9I-d4=hQk%4*6rJ3a>mi{InpXjA|susoRrWd6q
z7N>G~SOyfPrIaV?=UG%bTIz@8Wk!{xn$@S5X$OS4<hkegq(r)#nj4rJ`vzzG`UPf1
zB;|y=gl2jgrC2ysd1OZxaQSDJrAE4#xkRM}RJfLN>FVk#SZ0?R<~fDsSXAX?g{A1{
zI7X%vW<*3f28I+z8WmZ17=>mer-u3FR`@1!&6Q)RF}|_#wQ8Nf-k>ib_r-k5s`jL*
zsG9b3?Xf@g;>E(~PU#(z>*il>`m}kjM$Hy4{<irwPP6;?X7G46sr|VBs;&3w!CEI)
zv+%Ymttp*X-D-b(PrAUxJ^QWL;e9;?_NH?*v-qAoIr?s^#`F5SW?R=>c|2+6^6-Bg
IF27#^0P*O~r2qf`

diff --git a/secrets/garage_bertof_odin_key.age b/secrets/garage_bertof_odin_key.age
index 774f962..ebcf42e 100644
--- a/secrets/garage_bertof_odin_key.age
+++ b/secrets/garage_bertof_odin_key.age
@@ -1,12 +1,12 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ HUm59qVC9lTDIYYsfTJWjNOTmMWACQTcHP7FKSh1ClE
-7NTTSRRwnz03BE/058KUvGt3MUn7Qsbijc/5iugXPN8
--> ssh-ed25519 7MB20A WdCZELRUd2SvqBv2EfKy+pMGeSlRZyehSzwR6/WfDyw
-HU2DzLP2ULxwFIZwBtPvY+WStTQQGguIJJ1ohZPVeek
--> ssh-ed25519 IvyYug tMdmpOkbf7/wT4XHHO08Zil9UbBJyxvGQ+vY5imqgGg
-BEbZWGHnP0PkPEJKvMA+HnsOdszDCX6ZG19S3z+LjY0
--> tS-grease \#1- ]&%Te8
-h5Lb1J1nkusHPt66wwJLwQwzFxc
---- gvPDP7Pe/Xifc89egw48dJx1v+uQUGWbLMmFFW5BYtg
-����j�I7zsڹ�"C|�n��@�7����snB@���[{�t_���E��ukO�$�0֮����]�<j3�s�t 45L�p&	c.!�?���\�
-T�dS��/�K4�Ԟ��ͭ*�4(��
\ No newline at end of file
+-> ssh-ed25519 13iwjQ cyCv9791Eos58fHGMtryIbZvgAbzgWzt+LZ6xqFAzC4
+uFQ4qK8IzGIZ/SSFIg9b7mNPHBgkn1NkjX+bkZOBu3c
+-> ssh-ed25519 7MB20A E+69W6J5hiXqcHjico0uxQ0rtKhHjCeQGPTNwpCFb0U
+88tD6wGRdygj1DdXji1o8SyjXJQsHED++onY5GJzDfQ
+-> ssh-ed25519 IvyYug XCBD6iaBoQczsO11kjHPKr/jJYH/qyFnz3nzWJLXizI
+yzCHVqipa9pXDSi3vLyAQOZ34Hfk3EYj9xSaA8GhpNI
+-> Lge%;/,R-grease 6W {fv| f]>3
+qjAy+K+VIZIQWc7eZ/SO+XMHB44uMWbTF+7MI4SC3SAGEE194VjUmLZagFUjHW9S
+xU6gPHDtbOgAvJeoVjKj48k8DAy7pcOsz1xqfSVn+1dQnITcGUZMlc6haGo
+--- YsHfC63GHf9JJII4OKKSn4oFlsdnTs121LkpxF1aZn8
+��w]����m)�����#��>E�$�2��q�ƺ�=-�Xo;�m�؛�*DZ���7�I#W5�i�����KK��͑D�Fa7���z��C8X���x&��R�<f����4ad�ނ���nʏ��
\ No newline at end of file
diff --git a/secrets/garage_rpc_secret.age b/secrets/garage_rpc_secret.age
index 4e1f03af8a3aff56bc74b190003894f711f59c30..672b575541da4d8466a2737ea615bdee39c653f0 100644
GIT binary patch
delta 953
zcmZqYn7}bXr@qA1C_F4Pw4xx<#W~2wy(%{&&CSguB-JP-#nmvQ%(bW@&!VI-*Do(3
zn@c;$D5|{J!Z{+ssl+Edyt2|F%f+W4q|)E0+{nNn-P}05*vuof)HFOfkW1H2p}06h
zH#Nn`)YQ;Y!Q9u$$iPv-%g-@a-=`qTF-1E-+qXd9)6La4)6vDiqsr1C)VEMSz0f?w
zt<crkILFnOE6uyYr6klOuhb*V%_ZL`s4BuRBgnF>%-FlQ+`=_aJ1ndsDbTkf$+0+n
z;z#lDl&pLg&s?{FfQr0GOAo`)yhwwb5Es+(P~)(O@DlgbJm)flVBe4k_ndsLG}rR*
z3=_YkOw*#s43FX@!+?Usq)5*U$27O92=l762+PW>k{pZtFjL>j@r>f(;Tcs){uV}N
z`p${2Il)Hx;T{=bp+!-iiAELS`WB_;zV3PMzJ-2XJ`tf@-o_qfrV*B|e%aY!`Ih;m
zo=#bgMTQkV<$0CCMuDD5QF(@C9$`sYiEbv7&oYYFXZw3+XQmfLSb92nI~F-dhD7;=
z`Wv_=yJw`kmiSuw1yqKoW>p&JxaK8unTEJ{C5QO9RA%@Yxte9_2U-SXrbif=_!SlS
zq~{l9<%Opg`i6!2l@vvy$3R57vvGu@LQYv(fthKMk)N4)pify~RbahmgjZN-M!s2o
zif2-QiCL<pewu!1q(_#ACs&HQNs>WjL0OSYVxW&xZdGE5hfiXTbD61Yo~w~tq>pd1
zMQ(bSd#ItlE4p<#=9Z?;jta%z1}5nSrcvQlRVF#1A$jGwCW$UdrKQEr7P*E_dBw%y
z_4%p!MWLA$Ar@TbDOui5<|byofu4nhX8xg-M%nuQ?#3?p<;6j!MuFOqo?b?V=9Y<$
z?w%m)(sk2|QWJ|)6=IeB%ZwsaV-&)<(u+$C-7>YaBSSn3{EH(ZN+Zg1{9RK$%)^5U
ziv0pJ3^KwDi_-%NvRz9H+|804-HYl|6LV6_d^1waGJ;EsQ@E0ni_DAzasy2gUCgxo
z^0{<%brsyBibE_y+zN7wBZ7=QOM?=t+;fvlOhSVy$}G&>BODErLyc2?9ZkZrEx0l*
z_dU6|;L=&=7KXWRzFJ1TJ;^0eB7N~<cI>NVk>6_Onln#-HoL`#Q>&*qG(M(P%Rp;-
zyG7c&jw4V0U%c$7@{83*ICgcPH;0Fzs9WKdNhvMfh2Q=JZ+aZ3H))yOfo5+h0J7*q
AVE_OC

delta 944
zcmbQh(ateJr`{;Q(%sU?EGW$&D%Y<dxGW{iu`<)sBPt}xBqhb%*WXP)JJF>yFvHL&
zkW1Um)2|@0+|bus->@*KvLHF#JJ&11Ki@Q{*u2;|*g4&(INQ=tJIy7$oJ-eEp}06h
zH#Nn`)YQ;Y!Q9u$$iPt{(yPETJxf2&&>%P?$|c!I->tyFL*LxF+&s%Iv(z-TFgGjH
z(#*okCBP$)E892H)y>Gs+bcKIv@*%5!XmvYEh3{l!XimOA~L5iD%IUPxZE=@IlL%v
z;z#jtODDffPwxW#LZ_fWBj5aVM}t(usLX(T4;N!?$He5Uz&xk&D8Evl(41^8_moo8
z@}h_U_X^XpinO%Ka8plrSAXw_bkD3bliV`H+?>Kt$0}zZzr4uF@r>f($>u@1Ip)Qw
zhAD*^6-5PR0a=Er7U87^hR%7;iNR@(o_^)#235w1=7Hs0+NJqsCglai!PzN6uI|BZ
z`YEAli2>e`RTkb}QTdtv?)o|9rutbSK4Gqt&oYYF7bX^Jr}~xpdxUtWXO~-=nkJeX
zh87nmx;v%>Mi>R;Bo`GJCI$q!N8}}Q<vRtY78qHUXE>SVlzMuEIQy47WjQD67dd%3
zdjzDpr#goR6hs9X209y{$3R57vvGu@f_AxCglkE<uTgrMi=}^PMp=DXK~#EFhL>x3
zwzffTm_<sNo2yfPu2WQ)0avPFsc)fqfLUswdsK*JqKCF;L6T8HNO($!qj{lwu|=4Z
zZ;5eMwsF2|I=Xc^=9Z?;jtYjB+M$uoX%#tD5xM#%hK4DnRe2T$g`t_L;fYD^rEc2U
z^%)*vhGv#gIi6fm*~N*DxdyITuEk;D&PEmy`B|31ndM>rVIkRtk%m=e+M#7mp~Y^_
zPRSta6g4X={dCidQWJ|)6^giWy`6$X^K#6iw1b?pBaDh%lFZU_qJnbLvb<fQ0u#%F
zN>d8Go%J*PBQqTXLcMc5oV_eu^8@QM!ovdmgL7TNxgsJfy^Qq3LZhORxpZ}P6+%M;
zqnr|pg3Tgx(vyPIB0a(?0`#jqv@JX=Lfwt^3thwAQ!EoRGc$aWxt2cN)^W0ZomP`y
zXlr+XYkP^&$K!HOPy2`-N{a6B`EW``HI|d*sk>#*)~=G@vOc|`{>=6oo_tjr>Pw=E
q7ucORT)z41lSm_bf9rc6ybkrx3(Sltzgw1LsStcrYU=-uO8x+u@jNvE

diff --git a/secrets/garage_tiziano_baldur_key.age b/secrets/garage_tiziano_baldur_key.age
index 95acb73..8d5172c 100644
--- a/secrets/garage_tiziano_baldur_key.age
+++ b/secrets/garage_tiziano_baldur_key.age
@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ OS0cNZt+0trDUEx+LQyuNyuRRpTlVKHhwsFT0k5uKwM
-FbbGfJTyvNw2d2IP7VzJWYSIfJXf1tvh0iUFouiVA3U
--> ssh-ed25519 7MB20A D/7Cx9iBBke+WB8n73pODNGVIevXMFtEcU+3tYZvySE
-f7lMSG9v51Sj6SE+YtyJ7/mR7uadsxtLpwc+GGENl0Y
--> ssh-ed25519 Wzv8ew 3HkqjxNUmxb03+K0TNYR17ycLFEH6MDd1WuCt5s6Hk4
-yqZ7g2X33tzG50SA/fEVTbUkKStWnJwty4ac7JlqMp8
--> ]d_ZO-grease {n;r}1#@ 0dRl n3bFCrdE
-X7t701CvFJv8
---- qU4twOWvO8/0VepbmqgIM/wBbWiA/YCNfa0g1oNlLro
-�o�����ȃP����L)\���)0���I����X��
&��
-׃5�B�\
Y�T۱��USKY윮�d�T��T�5O�b�z�{��B�ٛT����9-���������p��W�/
\ No newline at end of file
+-> ssh-ed25519 13iwjQ LqqTmN2iGWVn2oD2WU7ObR5OO4dyV3D2FroONRGsHwQ
+31I+PB/K/Jf/71l0F1JA3EaJMNcSgwozim+hxov5T5Y
+-> ssh-ed25519 7MB20A ZhLSkSWzy/M0J31hSKjO50kDDIBLpefDI4LewaeGEyQ
+rqHe01q2Ht25R9pXqJhcAwP7NAI4G0pHb/l5EKzMgMg
+-> ssh-ed25519 Wzv8ew bVYHFPqOdoxSF27yGxpPR+yzdapdntqDsXCcZ3OjYz0
+QPaxhF8OIh20MpPHbedwcSUts8w/tvXfe+TzP8+xbUk
+-> =usKd;>-grease
+Ui0CwUs
+--- w8Hi7+yQ6uXC5kZa7yAm+13aTFFU5PoWr+QHvCBANTg
+�a�Ȕ��Y��]��W�(�C�&m���$f��O>�`.�*�)B�oߥ��*��(��i��
E7���C���~y����uI!����-H��*J�*�C�dQ7��Rfd?��z� !��?�)X�5�
\ No newline at end of file
diff --git a/secrets/garage_tiziano_loki_key.age b/secrets/garage_tiziano_loki_key.age
index 8a0952ddb2132b6fd4ae0cc8d505fdfdef96aa7f..2580e4b8d439a2eb710fee69cace67779f605203 100644
GIT binary patch
delta 524
zcmZ3+a)@PuPJM=xPf=lVxl=((UO<RxT5gnQS!IqvMwD-mQ--mnai~+NyNO3?Qk7$l
z30Js5mA*?-L9vf-eo2mLmA0=}a;0OkXRe2Vr-ezFlSOi#d%A^>pKq~OB$uw8LUD11
zZfc5=si~o*g1N7gk%6Ovi*HV(p^HhHnTcn)xqrS-wyTGMWsqsQWk{lTwnc`1n5CCx
zg==`JOIlDMmwTvLNRew=Ra!<_nQLH@OLmoONTg?mb5)jGfopMyt6Ok!QdWeIzEk4F
z4-)kjuE8Z)9;J@yxz5HZ=}yimL4KCmDc<fmh8g}zfgT~5sU_MeA*Cke5$Rl+<=!QU
z0qN$3X2GE*RV5ag+1fdNspdxRj>)O|Ng)}@$w|(x`rdhNp`IX*xag)Ar6v}qDikT&
zCu%!#6-R2Dqz5Ltrkj}?TDnvkc>0*Q)CWbShXfmyXO|WSRb{0ZaOvvmDpUnK>xY;W
z=Nr2eg(U@B=9Kz4n|TM7dxslnr~2ml=9M}+SGl|Rns|nqaD8t7*pa~8#<|TX`u^U<
zYtFe?JG330qt|!2ud_PYZpoT_x4!oV!ICv6P9MJ5AM)k9`|fmCRbRb-9}Xuso)F}<
znQ??oXTSQDU6!@2Mi!Yi+7`at(Mr)wN9G-#BHpgLQYU9+<$mj8zIvb8b(4J}?A|T0
Pc1oDHal#GXhIl>zQf#>l

delta 496
zcmX@avW#VdPQ9CtV`xZKN<ey)M@D+NOKzs6L0O4*V3t?8uS;rhmT78wfu&2XQ%R;l
zC|60LVM<kDSwVPWcx8rVil0w~pLSk&YDHzJfl)z#qh*q3k#U-HvTu%YB$uw8LUD11
zZfc5=si~o*g1N7gk%6N^X{NbBSz=nSv3GDzW>9Lrxoc`zZoav`r-7%VVOT+0zKf|#
zZj`B6YPypnS7c&-P)LZAcanv(xuK(rnRc3giFs;qNm@!twwZxvxW8ezVX1$3aAo?$
z4-)m+Rpv>l-ueN#0r{aNM$Ycx{%MBkxtZCnIfnkF>50Y8f#p$V{)XXcZYEqVjuwTM
zQTY{N8Qz{znO?yqiB6^ki9XrI+NEKsZhoE>iGE4?dBI6W&iNpZSj5`urWd6q7N;s?
zDO5)2S5!KwarvZk>FVk#WSV$b6qg5@)<=aFN4jNtR5%r82Nhcu7^Vf4Mw$my_!blz
zM(BGxCAoR$bNPk8{!>`dXyvo~&J(Y{XI<?xrtI2MTd`LzOS-pU*UL;dj??jy1|eEp
zQ#M;^r%L`=qkZw$mz+5a+SjZT`lU+Os|26>wc~)^&B6c!&wc&@IpGVh@Vsc*%BQu<
oMPXgr)l#$lOpKy$Hd?KEc<8a#mzS|g-=4;4d=V*|rZ1EL0RPdn!~g&Q

diff --git a/secrets/odin_wg_priv.age b/secrets/odin_wg_priv.age
index 36b7d2c..622a406 100644
--- a/secrets/odin_wg_priv.age
+++ b/secrets/odin_wg_priv.age
@@ -1,21 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ 5/eaXuPnPtmxKle+0sln9LwKULrvM0gfl6BI6EbAbX0
-Jc1SvuisV13xIM6g33IgawoNnmfuQhRJwozk2QGrvSw
--> ssh-ed25519 7MB20A IyjgPwf6gXzUIgadjAMqc2l/ixefRdXLA71V+IdGRkY
-kO6M9yAlJ0Yl1R9DwSgVAYnJuXaVjOeNos177erkgCU
--> ssh-ed25519 IvyYug 6A1n+laWjmyK31wTaizyrBj3vP3Mx55I47TbeLl6lD4
-PJNKBATGlbdFBtevbtTcnT3M3yAi0lbbuhc5biKdeVY
--> ssh-ed25519 v7O/FA A/if8tjgSK3gfoFy/F9j/bs9SRRpGEf4OqjD3c9ENE4
-BGGLe9JX3HEUWz+ahGg6eZD24em6CSICnpnWFKdqKn0
--> ssh-ed25519 Wzv8ew UgDdk7DlrJN0yKf8Y8CeTRawQ+W/j4ulewABoPkqCWo
-+YfB0fBIFL/2/4bhuid2LgtDzerVrY4VnwuBRe0kzF0
--> ssh-ed25519 XgC3XA ehN64Rpd3OA9OayhBNn3RteM9oF+rS3V9iTUodoeTjc
-qNoKqEqvdBehdYRXZdRvrrI2GCYInDQC6ogYsMyi4N8
--> ssh-ed25519 l795CA hvQtpq/u7yOM7gXoP6iJsu5y92HSsGEMCoopUkSASGY
-S+t1tR5HdakBrOQmM93FeRIrUhstR4CggwdBKHkGLlE
--> J-grease BtP1 Y\5oY,nO cFV}5i nv_OF
-lQxN+ckl9x8fvRg+y1ymjak5e0WCHzdw2BmTNThgthGgu726N6m1Zc6SNupSDQPL
-13SuiU+vzGa9DgDW7I8NapKpWL25HET1KRH8SUiopFuHcjSTqAFUQTTN5CO0vw
---- 1mV0nPhPnCK9b6HGNivMOpEiM6061RBGHH6s0rdCGco
-�^�pJ���!��3������u�!��[q"�Ϲ�Pq�Ӱ���J�'�g��$�X
-��-
��\��X](&<s�pG��
\ No newline at end of file
+-> ssh-ed25519 13iwjQ 5MO0JE6hPY/uL4mII+Axp6FFRbIOpd5dL2lEj9T62Xc
+3D8Eu7yiawNbLFRilGrwId4hqI8AvwtnIbHPLfHSakY
+-> ssh-ed25519 7MB20A XDBiNJVWgynVxFF/r044LZBOlAhoJP2soBRdgE3rcGU
+CFFdnSYCrhZnNc1BNSR7MzP8ucm2j+Keg/7fvg1h314
+-> ssh-ed25519 IvyYug ST4+U+uVK3XZdFE4iorbXXW8DI+OHBBk9IIlXLu3l0U
+js++OiBfjgeqo7lO2+doADJqFmYzOt3MsB7O93wGDyg
+-> ssh-ed25519 v7O/FA g9k7IucmawQfeFSDlt1PlNkRqQxq5UVpJM3tUK2fFUQ
+5iiTQP88uRyWy2RY4Kdym+1VMMtvwaLD+ZU1cfSppPM
+-> ssh-ed25519 Wzv8ew iK2jVsKv86cGh5pdzZ4n4Ef8mtWGwVARpcXqVmRtWkM
+sJCv99OCPLjdAdOoyasAutMjnyHB3hbqXSZvR2pjxsk
+-> ssh-ed25519 XgC3XA D5BcgMn2y5DyZrwXivK8D/G2iqs+2cEvqUXxXDAUADM
+tBbVSB0ZuihWKW39lGVRNPWZAUNT/SjUvs/BDwMNxps
+-> ssh-ed25519 l795CA AhH46SsmP1heTaw6yY1HNl01kz0c6UB5hAVlFBTKMlw
+kKECqPPd8NzwPdEGIEl/hhlWl0I8hRtWvLYdO/vcNKI
+-> 5-grease ZUgr00 t"|B Y8jZ
+DzXpmqSe9AZh2oef6s8btPcXfT6JL2kmhA
+--- bx1iC19lCMo2pgpAPp8ESqFtN5fAjuzAylObUWjy9zo
+��x'fv�Ȓ���8� ��M����-7hz�E�<��Ǚ'J�E��J��)�����ef�����;F�������
\ No newline at end of file
diff --git a/secrets/oppo_wg_priv.age b/secrets/oppo_wg_priv.age
index 7a3c69e..98aa204 100644
--- a/secrets/oppo_wg_priv.age
+++ b/secrets/oppo_wg_priv.age
@@ -1,19 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ jqXMizwZ50RgEi6BYizItJcDtc6eSCT8iLnvY9jSu0s
-4/fLtAIUFf2Bl8RHukEKvbFogdgRc8sCI9YsHV38OTQ
--> ssh-ed25519 7MB20A pEP3TvazbBsJpMWpDZv5KImhNhEgM5gyi8E1VeeGMBk
-WTHz8qlLNdtrFN4P8HECo9smTyFOwpkMfPWS6JtmkJw
--> ssh-ed25519 IvyYug nKzXy2IKAD3ZU9riklr3YcWgkyiEvRtn2jOPaBWIjU4
-LXhcnOU1xyaWDnI57waHQcrCh4j7cQHQrqmOtINeOiM
--> ssh-ed25519 v7O/FA kM7V+YAKBXNZhjxC97AXQpvmC3RYThFNO+cba4seglA
-2grknub3XXDfs1kAkBMHJFLbvPPyRD7KJpvtTqwD814
--> ssh-ed25519 Wzv8ew G9/i+M/ZXdF7Or4yRoa2WIx+gL0ZqNSD9CeY0UEhsVk
-YmcQhtWP6DewLpED5CzCuYjcS8HO6VzoVl8BFGGkl/I
--> ssh-ed25519 XgC3XA VSe4z1ZuvgCfMGJ+yEKcs3nMz6teuZcsyWoc3EAQvhQ
-0CHZYU8gQ68JN7K3Dmm2lsUKfay/wqiGJihSyCqtwXk
--> ssh-ed25519 l795CA WQy4KibcRyBB6BBQoHiJM+wEAQ4YgUOeL8y2EvjTMTc
-zXD27aCa5fpeIKstjRGZ8GQSFKNT0MGcr9VsVCbCW8c
--> P-grease ' * )~~$j|* i3U0L[7
-1cwPET/A+MRWOHC5+IBllmM5vHQYhIu9LZ+g84HHMFNlChV90hQthUorq/I
---- 5NssGvuGj/Sy/aCN6IaqWIkmhZs7O7S2VMtHt7BFlvk
-�%�����4BߗE�
��E�6� t�-���cX����bڠ�]o��c��'�=�L�;'h��X҇M�L�B��S<1
\ No newline at end of file
+-> ssh-ed25519 13iwjQ L902+KFxLZfTQyp6KGtc8CmX38878cMmXXKf7d8wbWs
+yCp4sa8Ad7APRyiozlRTgUBuj9ol3tTkhLQZpf88x04
+-> ssh-ed25519 7MB20A bA4H72Ew3gwCrGC+8zuC129l6+pN6tEU5ooBaz0E9Ec
+EaqaBFVi/JFGvOnqW7KXhumfxx8cs41jREjlL/cu2hs
+-> ssh-ed25519 IvyYug 7BStG7x2qgra5HNqiIT44V69YbxOp0y0uN/3UqxGuEk
+B2pFicyZmtS4pKx/usMegVeIyeesAtYaXec2Vvy7/dk
+-> ssh-ed25519 v7O/FA Nd0HLbnJpBNYFoHd0oxxKCXzkhF0lpwD0lgnBGKd6HA
+McJrbQXuFPjkYV8bhw4p4+xWrlAslhnbkJmy4WLkXrI
+-> ssh-ed25519 Wzv8ew DSRTmBZ0gi47OaAL5f4AAMvSx4/5IRO2njEAe7S9KiU
+gTyKispOlVJ4hv1aDmoRo3zkUddwG8YjpAUWZ3ZR5L4
+-> ssh-ed25519 XgC3XA JSb9PhQ4mu8ihqUU9YjfXElyLeLATe3ln9UD0INZBUI
+A+LMuCiX2XLoyelhqcHXWJngXP4kvTPXKcLbTHSGubE
+-> ssh-ed25519 l795CA Cyu6QzedfRgZPX0MUzpiajC3K4lhWyuWeCVQ68uUmi8
++fUmBYVlRjtoHaV3Z3MeJ5dpXYKyLtpCHFNCKuXWTAc
+-> '6J^,}u-grease 1j_b22r/
+q/S44GKfvl6TYESYUI3rZcuqwrUKTrUTO2ycPMSroyj29KmoAYFRtmZKuxA9epYz
+0Qs/FZrz14MP8ofrpqM
+--- XH5EFu5uN5U0BdCC08Ud5eYo1La6VxfQJj9Frsjmm3o
+���ܰ�տW��z+�%�*8i@���	U��J����\�D���:��{N�&�rC�\�
+�T�B{j�6�(����/�G
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 8d0301d..ed7e3b2 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -14,7 +14,7 @@ let
 in
 {
   # "oauth_proxy_client_credentials.age".publicKeys = devUsers ++ systems;
-  "spotify_password.age".publicKeys = devUsers ++ [ odin thor ];
+  "spotify_password.age".publicKeys = devUsers ++ systems;
   "garage_rpc_secret.age".publicKeys = devUsers ++ systems;
   "garage_bertof_baldur_key.age".publicKeys = devUsers ++ [ baldur ];
   "garage_bertof_freya_key.age".publicKeys = devUsers ++ [ freya ];
diff --git a/secrets/spotify_password.age b/secrets/spotify_password.age
index 1125668..a069efe 100644
--- a/secrets/spotify_password.age
+++ b/secrets/spotify_password.age
@@ -1,15 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ Pt3fLaHeHIGm+goWfbGI4N3AUnS8XY/weHURsDAkLlg
-p25GUiURF/L5CkC9e6xqKhFAtpZfiVOVgsNwlUyplQg
--> ssh-ed25519 7MB20A 7G4JkxxhG3CXuP/LEI9wCEs+/U/iLUqa2Aq+zKO5cHU
-dc+xKMGxN9WB26WIbxnGAtuDIiiYlGrmRzOEWrnebjQ
--> ssh-ed25519 IvyYug tI7c5xMooKX3Xh2/MEL5i8BJon6HbPGUb0SvJxJywGw
-gyQCovse/Gv+A+an9SYCZe/mC5GtMiQH7+2cbTA2qaQ
--> ssh-ed25519 v7O/FA IODREMgQc9XwffhNXZ1Jz/mebOTidijJyrhfqMPu/UQ
-W97CXQjE+Jrvh5N7PLfhHODIHjUFW+mPID49eZuoLSk
--> f-grease ~f(u9
-WTuK+TySsehBCUKfQaeuyb+pKEU5cTF7r7OO1CukJy0fahZVFuFAphe1QnLWiocO
-VnZgE78FWCeDIkN3xHPfIHgkC14e
---- UJx1d8EoQ10hKSiN4ZYxL36CeDZajPOeLMhUH4/Kmp8
-��/8�M�?
C�KǓ��U��ǚ.p��
-��d/�"*Q��^��,z�t
\ No newline at end of file
+-> ssh-ed25519 13iwjQ L10Lk7aJ80kfM4Csu0lARIZxf1oqJ2Whfir26AxkKnQ
+YqkFFeMqNgxiMBpHNdDoWp+RQQofSmrAqMCZAbOIBcM
+-> ssh-ed25519 7MB20A AKlhIQuTauFZOklJn+YnnH4FAoJ8V7VrWj2vbCl3EDE
++gVFmxc6rQLGHoCVMgxMPRbD0kjWU7vGbKJipKABfu8
+-> ssh-ed25519 IvyYug yWsOiadiQ+BEBUF/4nqrMJDA8sHBKGh6TF/tXBHoQnU
+kAjgnXHKIAXqGRNMFWWJFF2uKTOoYA3Alxsld7ZpeAA
+-> ssh-ed25519 v7O/FA D0HfLpQqb1l3QEmqWgRn8HyCcvYw9CPRzAIzhEthZm8
+uQ8s5wzo9ThZB3Bw3x90Vz0UQF8qBXY32QTs47vrf4k
+-> ssh-ed25519 Wzv8ew k8r4Q6mlwNWKbV9bXiJZmuSpEPBlCXIEIuPYh9A9Smo
+HY6CMTKuIIAeaykfjxo3nc2Cd+QOrdAkYy87idBgnDk
+-> ssh-ed25519 XgC3XA MM7wy2NIFX/gXWyhmrhHpum9aezV2jD9MmuotSbcWFk
+q8gOv/8yb3M1gqOKT0NSBwkPFNdI5YczE68XA8yAWDA
+-> ssh-ed25519 l795CA k2pE0tfxcO8+4IVU6fIL5jEqg6QXNNiGyYEAOxt5JVA
+7RsBlppD3sInjNBl392uHxnnqJTUK03p4A7OumVMLiQ
+-> 24-grease jVf(* CCoG[Ms 3to)
+ktgWCR+vjMZ15aL0TNROzD6FyZmllsAkhsSvH1+A7nVVb3Y
+--- HPvuYw9mTGwmfxDBuM01HvOCF9pSj/7YxpdZt0YKVo0
+^��#�w�+�3�����b�SǕ�,+v;���G�[�I4��=0��Edl��U
\ No newline at end of file
diff --git a/secrets/thor_wg_priv.age b/secrets/thor_wg_priv.age
index c2b27c4..e7d79ee 100644
--- a/secrets/thor_wg_priv.age
+++ b/secrets/thor_wg_priv.age
@@ -1,20 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 13iwjQ acitCjcKTwbY+hdXurS31ou3RmvWu7cDtOE7fxV4EQ4
-RlpODUwasLVOXern1Ytm3XYEwVH2EYdUoxaJz6gnZus
--> ssh-ed25519 7MB20A awjDnDQVyw+fS6zJXOo/0UH6gga8gSur0Tlkpchx9Sk
-ZN24KSE00xVWDcCS5g68e4a5MtLCENQrSmViIUEfjRw
--> ssh-ed25519 IvyYug PiXguYIcypLOkUeZijg5TbsWaQdvwFYq4QhO9EjGoy8
-LlShI84lC6w67Z/6Fbc/Nzz9wR4Miw8WASsENV04G04
--> ssh-ed25519 v7O/FA I/ytxm56tzXJHlesn10fdxPfVSA54dWdQnq+MfYMwDg
-7PngLe7xkPvh4ppy2HTUrHXi3q8zSo4cw/k2pj6i8c4
--> ssh-ed25519 Wzv8ew dzq5x0caNMwialI0r1zm/ih3GNC0bT3nCnkMGXCVvzk
-dqt0fVfYGsLv9TFm+uU6MxS9R9XM/wng3vl25/IFT4k
--> ssh-ed25519 XgC3XA oVweJyqaV+IgSSRT/ntL52AViOUTgKfQtol4qvEkw0M
-FC+sHP5sFnSK7Kx3nTe1uxcnR2RK7JUpOL7O9DBhUU0
--> ssh-ed25519 l795CA G3tznD5ipEQix2ElTcCXFscBgT1negJ3ipmGEWM2GQo
-4df/3fFZ3GX0XEWNU0y81X1OWzzdFe1MCNdt1zgMMGY
--> d),cs?-grease ]i%I iajelhaH
-Z1/98kAjvVtkP5HE9Bjb8OlIv8CAad07j9fJPr7pM0HYFAiv7QT8++AuTfg4YJbZ
-iJPP
---- Mbkb+7okKmZJqckz6FiJRqY3N2bUGqtx3A7xFVCSn28
-e0�o�"�W�4�4�ͽ�����Hb�*�k?�20�6$��x
v�����o.�����$3�7�����(�F����td
\ No newline at end of file
+-> ssh-ed25519 13iwjQ SsqijZi1Ze932BCFfXrlPMDGhqrc7IrODczqHP6SrDs
+F3nqluy/Yqgm3elan+uYVJtIiysEAJpy051bdMrUu3w
+-> ssh-ed25519 7MB20A 1lehcVyeYUhHnHoaYDxeYVSyJXnuHw6kU+5VSYmICyc
+Waj0cIIp87R86V59k8lsTsGz6Zdq5ey9+8Z2V1o0Dco
+-> ssh-ed25519 IvyYug lkyVVrRhD7RiV9jOAQfoxMPFVp4VLXm3edspWcZiPB8
+rGwFxSt0HgMFjhlLt+DKxo+hbic9IeupHmSuw4RZ02g
+-> ssh-ed25519 v7O/FA ha8NTXdoYC2xjnbyyAc3k8mSTEvOMzS4Qu0a7b6domU
+nN4T93IAXZMqaGgpiEMQztQVtdohrkNwIx0uwGXiqoA
+-> ssh-ed25519 Wzv8ew 9aCs0lMdbsX5kwUXX5AjtI/V18qeTyhKvlKJOGdbIT4
+xFl4FBvVRBpnzHGeL5GcbNCLDwHiacPEPTUQqtjx5n0
+-> ssh-ed25519 XgC3XA Wxqh/uu4stk/p3sABVoYD1T79bjtFdfzi6D6TXjSJgs
+wo/O9Bvpg22st0LmSAQooDrTDn6TKNddUvKkTeEiIcA
+-> ssh-ed25519 l795CA 3wVKZ323lx1CdvH7KZSSW2MII7oKZ4IJWnBNujnPjj8
+2QyIk7y9recKC45IBZkjAK9TAd5mAyB39jZ10x2GqJI
+-> uylRI\2-grease T2
+wIAU/E+AFsyNgPkfj3aRnzjIKcvRONRs+yU34b9ePPQdwaW4JrHArsn6U/eJh/jR
+y1h/hllohEMG36XuwRLhybpE98v62mnc
+--- 3s40j440g3i8MqE/LA6qgaM6KT/7z+MJO6WYozLUzOk
+g�_�{��]
�*M�Ϫ����ibV����GSQ�a~�녰�ߐf�+�C뷢I�W
+�@FS'��X�$�Z5���
\ No newline at end of file
diff --git a/secrets/wg_psk.age b/secrets/wg_psk.age
index 61574144c090d0cf0e133f68ed3c39d341ec4eac..a4a3d8d0bb9f0784a9ac5f3f58b313761de5db64 100644
GIT binary patch
delta 907
zcmaFQ{)l~oPJM<&P`Q7Usf$;XQKYGnlWTUFt7($9MTK!rfMHsMwxw61Z$^}vV_0}z
zC|7P^MtWj|U#MlJpSN+2X;N`;a&|$kMOCJcv9@WZX+=Orp>alGL6WnfFPE;JLUD11
zZfc5=si~o*g1N7gk%6OvVX{x6UvgElfnRaBV}(y@vYT<Zb3logbCjc-e^P;wo3o{M
zSZH!UWVS&%SAJzla*#_&xOT2<VOC*^r%Pg3X}MQ^rKf3HRc1z!lSQ$aS7J!GQBG+7
z#E;_PPI*N^j*ga<L77<ruBo26Mo})w<=ReeW`)jfmiiWz?!kFQd8S2?LE#o$=2?l(
z#g_g-QBhImA(jPRt_7(Prs3Y&VHJ5PCT^Z(iAKr36@JC;uKIzK;~B-nQ-Yj~0@EY)
zO&r7049n9zl1$Sg^Zf&T{ang}GyQYYOp}tmwLOfSE!~Q_ii%u9k^?=w!^2aPOU*-q
zD}0?YJ@V3ms=~^$lEQKW{nE>m^IRiC4MWN&pJf!UuQd0}PphnSHOvV1ND6STG%_u9
z(GSdYGS3RjH3>>Ab@lS{j7;$j2@1^S(k{%`FLDVm$~MnT^)D+-j`9l)D=2m{cP?_w
zcg%K<^v@4*k1#WHDM~I!kAaAEXX6M*g-Wxil;je9ALsJmq|&r}Q}23bS9AT)T%+)S
z4A0O&e_uxn&)_Wm(1@}KPp;%(<1qh-#MDrW0#6H57s~>tf@0$kUw?1Q3`^IH?4smw
z<FF))2uly6P;~2Z%q>lw9Ti-|O42h6vXdO0Euumyipre|lfpexlTAaybG@U=%F7%>
z>NCB3j9iQ@Gm5#gf*r#O3r*Y#Q_adMgY{F3BHUa<ipvc=EAu@QO`R+}y}b(b)AcJe
z(vm^ex!D@ln(3w&r6v}qDuj8e6^8hxSt!`q6k0l^nJZLl*J`B%D(Gq2m2;I_ngp6>
z6(;9<hkBW$<&?V^7A0z@d1Ylsxs}#ydna@0>gp;~6=;{Hm$|#<CPx+;hdbs6<feuD
z<pq~|6o-3Sq&NiyWO#UG<#`pl2PbnePm|z_S~!C%F8Xgg_r-&<)0f5=E>|dYI4l~z
zV|5zC`ipFwS6ib?C(ex&;|QAG|M5fX|GzA|(^dqZIJACKy<!66)!)h51^W9QdHFFF
G-UI+jFD}~v

delta 920
zcmaFF{+@k;PJOOpvAbb%WVvNXu0>(KlfI$9L2*)kT40F3ahhqlVTnn;uZ4%Dn~7_V
z373y$qJg_(rjc1_h)H^=eyDj^Vp&R{sjo+2fTv%seyUTRi@RB>M|Oa}FPE;JLUD11
zZfc5=si~o*g1N7gk%6N^d8lz_lxJCacwwPssjGRYk(+Unsi|d2Mxtx5M|QDuqKido
zX+T)EL1K9*SDB-CQof;Aj*DYyR%U)#ZgIA&qqa$jZ&pd6c7S$jvRR~aNm8j<c%ZMz
z#E;_PUR6HM$yxeEx!zTN0ouvtj=>%-9+sXynHl9pZW+Es#eR<I$@-B=rcU`>k?vWp
z5$1_$UWrv<6^3rkrs;+GQN~5uUe4x*x%$p!-g$wkMu`DNS;_g6;~B-n^>aN+Ey63@
zEQ_kVlPr@W%DpO`Geg3hbJKFQO+5oD-1DN!Ga?+F^uvm|iqne9ol3(!TuMFNOw62%
zlFG{q%(E-qvs@y~f&#p}^s_=N3ex?GvcfzkpJf!U_sEY5NOkk^%gin<_A&_bbx!sU
z3v@O!%}oy|4$HL63eJcq_cbyNHgIy}Dznh8O!O<v4y+9FD9_E*Ps;ZxOA0ryFe<62
z3aK*IPD^vF%8&H*_b$ptkAaAEXX6M*g~Yskvy@^(w<^ydb4M?8kHq?HzbxZSPg9dZ
zgUsN_RMVnFv(RAetg>Pw6Ry%w%fjIBNXJSi19#K>%A~}A;4pt@H}g=(oRmtpDub$m
z0B?(+%)rPnS9I%g%q>lw9Tma~jI~n}OD)1Za&tX$f=W$;!jiJ8Tmy`}lT0hCobyXF
z>P-W}bG+RP+#<Og{nE@mJR^z>T}lkXje{f8BeK%con6XHJ&e4<0}I`v!i=jdl8YmP
z^esTv#ri1frWd6q7N>H#cvN`#nK)MlC!3pCW`=oqx_ji6ngsi37p0V!L<G5JR2e%3
zI;CcndF3V*R+R-gr|W0?lvoBw8fDd&`v*JfbEO&v2m6~CnG~mU>FVk#c!VSxC1?0#
zM^*S{Ci!`qCucb)8@i`^1Xe{9m09>Y8B`UyRg|Q8M|u@=F=y}l5WzU*NJlE`q_dwV
zA1karS;+X-L2LH&9r<^^GPNlezx}0F<RWCvpD(3xId4kp`VF?q`}ilysnvcrf6jlD
Se|bqQr)!S1!c+4to!S5v_A^!h