From caadc265e49618d7d05109d589d9dc9081982a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 24 Nov 2025 05:00:45 +0100 Subject: [PATCH] Remove lvm under btrfs (#24) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://codeberg.org/leana8959/.files/pulls/24 Co-authored-by: Léana 江 Co-committed-by: Léana 江 --- nix/configurations/vanadium/nixos/battery.nix | 8 +- nix/disko/vanadium/btrfs.nix | 94 ++++++------------ nix/homeModules/common/btop/btop.conf | 3 +- nix/identities.nix | 2 +- nix/overlays/nil.nix | 2 +- nix/secrets/four_pwd.age | Bin 714 -> 662 bytes nix/secrets/hoot_token.age | Bin 749 -> 693 bytes nix/secrets/iambconfig.age | Bin 1017 -> 1058 bytes nix/secrets/parrot_token.age | Bin 813 -> 745 bytes nix/secrets/restic_backblaze_env.age | Bin 695 -> 678 bytes nix/secrets/restic_backblaze_pwd.age | Bin 683 -> 704 bytes nix/secrets/restic_backblaze_repo.age | 26 ++--- nix/secrets/restic_four_pwd.age | 26 ++--- nix/secrets/restic_sgbk_pwd.age | 26 ++--- nix/secrets/sgbk_pwd.age | 26 ++--- nix/secrets/sshconfig.age | Bin 923 -> 1018 bytes nix/secrets/two_pwd.age | 27 ++--- nix/secrets/typst-bot_token.age | Bin 776 -> 692 bytes nix/secrets/wpa_password.age | Bin 867 -> 894 bytes 19 files changed, 104 insertions(+), 136 deletions(-) diff --git a/nix/configurations/vanadium/nixos/battery.nix b/nix/configurations/vanadium/nixos/battery.nix index 57ca236a..95eda6f8 100644 --- a/nix/configurations/vanadium/nixos/battery.nix +++ b/nix/configurations/vanadium/nixos/battery.nix @@ -1,11 +1,7 @@ { - systemd.sleep.extraConfig = '' - HibernateDelaySec=1d - ''; - services.logind = { - powerKey = "hibernate"; - lidSwitch = "suspend-then-hibernate"; + # Note: vanadium's btrfs disk layout has been changed and the swap has been reduced. It will not work with hibernate anymore. + lidSwitch = "suspend"; lidSwitchDocked = "ignore"; }; } diff --git a/nix/disko/vanadium/btrfs.nix b/nix/disko/vanadium/btrfs.nix index 11ae7b66..439c16a8 100644 --- a/nix/disko/vanadium/btrfs.nix +++ b/nix/disko/vanadium/btrfs.nix @@ -8,7 +8,7 @@ type = "gpt"; partitions = { ESP = { - size = "500M"; + size = "512M"; type = "EF00"; content = { type = "filesystem"; @@ -27,67 +27,37 @@ extraOpenArgs = [ ]; settings.allowDiscards = true; content = { - type = "lvm_pv"; - vg = "pool"; - }; - }; - }; - }; - }; - }; - }; - - # Use LVM to create a partition for swap - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - # Set swap device as resume device - swap = { - size = "48G"; # > 32G for hibernation - content = { - type = "swap"; - discardPolicy = "both"; - resumeDevice = true; - }; - }; - - # Use btrfs over ext4 for: - # - compression - # nix store can be shrinked using this feature - # - more transparent partitions (subvolumes) - # no more "I need more space here and not there" - btrfs = { - size = "100%"; - content = { - type = "btrfs"; - - mountpoint = "/btrfs-root"; - - # # DANGER: - # # Override existing partition at partition creation - # extraArgs = ["-f"]; - - subvolumes = { - "/root" = { - mountOptions = [ "noatime" ]; - mountpoint = "/"; - }; - - "/home" = { - mountOptions = [ - "compress=zstd" - "noatime" - ]; - mountpoint = "/home"; - }; - - "/nix" = { - mountOptions = [ - "compress=zstd" - "noatime" - ]; - mountpoint = "/nix"; + type = "btrfs"; + # # DANGER: + # # Override existing partition at partition creation + # extraArgs = ["-f"]; + subvolumes = { + "/root" = { + mountOptions = [ + "compress=zstd" + "noatime" + ]; + mountpoint = "/"; + }; + "/home" = { + mountOptions = [ + "compress=zstd" + "noatime" + ]; + mountpoint = "/home"; + }; + "/nix" = { + mountOptions = [ + "compress=zstd" + "noatime" + ]; + mountpoint = "/nix"; + }; + "/swap" = { + mountpoint = "/.swapvol"; + swap.swapfile.size = "1G"; + }; + }; }; }; }; diff --git a/nix/homeModules/common/btop/btop.conf b/nix/homeModules/common/btop/btop.conf index 26e23814..c1973464 100644 --- a/nix/homeModules/common/btop/btop.conf +++ b/nix/homeModules/common/btop/btop.conf @@ -145,9 +145,10 @@ background_update = True #* Custom cpu model name, empty string to disable. custom_cpu_name = "" +# TODO: maybe move this to vanadium because it's host based #* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ". #* Begin line with "exclude=" to change to exclude filter, otherwise defaults to "most include" filter. Example: disks_filter="exclude=/boot /home/user". -disks_filter = "exclude=/btrfs-root /nix /home /boot" +disks_filter = "exclude=/nix /home /boot /.swapvol" #* Show graphs instead of meters for memory values. mem_graphs = True diff --git a/nix/identities.nix b/nix/identities.nix index 8d491a18..1859f241 100644 --- a/nix/identities.nix +++ b/nix/identities.nix @@ -1,6 +1,6 @@ [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGPq2o9pbmLRGrOpAP76eYCAscmfakDC7wPm9fmsCCQM leana@vanadium" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDc55vENX+13c4s2w7zjTb8T/AnBnTi96yRC5+fy7Z2A root@vanadium" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF5OgvihLpGaenFmZpbflF+UFsyYTZDwBZqTmSYdquC3 root@vanadium" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEXzNdCA0zZ+WmeKZnhQSQtUcxnQhhDl59E3BPQfLj7Q leana@hydrogen" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIMVDmEt/12u9U4QGDZBx/Sx8itzqfQ4zWJvcC3pRZqP root@hydrogen" diff --git a/nix/overlays/nil.nix b/nix/overlays/nil.nix index 4ada807b..c409f3c7 100644 --- a/nix/overlays/nil.nix +++ b/nix/overlays/nil.nix @@ -12,7 +12,7 @@ final: _: { (final.fetchpatch { name = "fix-handling-inherit-and-patfield-in-inline-assist"; url = "https://github.com/oxalica/nil/pull/178.patch"; - hash = "sha256-4f7DeWJtt63IyOjqlwzz0f05rv1NBYZO4JWEkFeDimk="; + hash = "sha256-YeVshmMadgYnFWA8S+nA+MwWKjVrzn71fqhfn6oL8Uk="; }) ]; }); diff --git a/nix/secrets/four_pwd.age b/nix/secrets/four_pwd.age index cb33568c5d89d9189bae2eefb8d374b4ebc176b8..f1a634e66a44f8fad34fde5a0e980d00c562c557 100644 GIT binary patch literal 662 zcmZY2J&%)M007`yj0uBrbt5^K3-$^vA8n$ir9cbiqm(aUxj;+bwzQ@2mKHF%xSg7K zgSlMdXyRgY@)zjlqJxvmB__I@o6a{lxSh`*czh66!sRe6R_kfJ+>cXG-4ICS0EKW; z2}d=GBAO@@Z=*~{8=eA1igwrDShIcEbyzzu=G(Elm|81KYLhkB2Ms!C&RfXVuqQzR z3Rsk4&S723PsCnT#g!hJP1+PThhk|KBa_s{t6K!|2ydZThe`n*1lGJyGQ@xdLQRx{ zve$k%_QItQ1q3&zQ!q2Q7NR?(-wAzMini2fSPEh|%Icl2Dm44igaH0TQn1Wl5Ih-Q z-Edj1_jR;h>fA6Au$5tH-b@Vj89(rN6;6d&6xEgzt1+(ZHz}@cAbq>ATNEY3BBpgE zujRyQHBP4v&3AA-bBcisg-P9#L#OfIHj-!spxmt8PVnK{rlnaiRD8BC!UYDMjj6c? zsik6L=>xAJ7~KZqvlaurKwN{eCrv>j^+n3lRkk#rKUU?`+gsi0n0 z^|H~Rx-n&?8W;_507)?_WH>vGeKAt<%TxwP6G<-+aA){ADM6b@6QTa{GWgx!X$54te$6 Ox7{a4r^m#j>wf|5SK>kd literal 714 zcmZY3JB!l*003Z|#E5^uDTkm)={1igX&jWaP15GkB+cWRz#SybqeIqF=Zm)I zA{YjfAS4K=tbnOiN_yBNOc&}&avT+QE?6r^u>=*H7E`V=in)+#9#SiS6bOf*5NMt5 z(1+0_vP1@MZYH8`sVjeh*4Cbb#tKOnr-&xbW1B?wF|(g5?ABGV#Ee+#@XJ~ z(tW9sjny3Scnr^qexMI~OTJ~(|7zO+!yF1EL$90lL(Z=8$gFrYp6z5$!hF)ljP9CT&iZGHB#&+s4Cl` zJaJ66P?JVeo4HI!dS7FyA|^To5s( zDy76jQ6EM}VYoJ=5!+DJpRh+HYv983_g5bi&n}+0zmClhZ=c*?kAhF;$61UO>~ayiJ~SFbTgB-vtD2~^=irX>PywI)$}nFtKtfk&aqIw z%9>2Wpwt+!L%*lky)H&^?ScZBQnKu{8YC8R5mPb;wXK`u0|#W_l#C!QR+DKj)FTF& z28t>VXu?J~J&S}r3Ghfn(X6OC5tN-MX+e_hCvEzIF`bsK6+kXzYpOQHBic@ao{{HioP{)=@vI?M zl8qdXAO+hJl*zc;Z|lJ2hcwnVaGsyWBb*hr|29*k@-`ecg)r6=q!f3{YHZ~QjEKc# zn)Hjn=LXY3DN*B^*<`1tMNq1OVQfYLQj@3)m5G`TSfKkA3S+Z{sXrc$BvVS6l}2p% z|F-i)(N|D=WHo#X1`xreziRtj|?5eAEHsoOT7W4|6M{Ldrs^S$4%3_guNu5X-~ZBEI# z+3kx5it8KSG8dk$?ZLl(xOwvWu+AWb()<8Zxi&|pG%(~ zy_};&)_iRp)e`sk-B0@uc0Jy)o#s}5Y+E^e_qRX4(32P5tHGfcGw;hC^x*vR=DR05 HH#PNLvrmv`N}DX_};MnjYrC z9Rxkd4l)E`c+ugUAm|Q?ZU@gkKxGOl?BYa46cIcO@jAah@HI?5ruUkD)E{)*-YM5N z;SmbN&VWJCj_Iv9j-wQa@O+{mgGAs#Y?9JZs7pvj0C|3DVpJ1#Kc|W|#uI8{5Mr3h zIvE#WEpF72Ej5{8@G%uJt{S%d09EbMSnCOGA@6yiO!p@VM)+@Q<&%O53R>tRsrbnB zjVw$Tl3mq>39Re4Ne{_WiX#`9E*OpV3IJ7 zghtTi5^U5gV!JoO4ZA}bL@b)mky){vX=0F2VF}8$yDTRvj_rA5u99{wSdefOvoWAc zbkLfSPS#Y!MmRC)OO)34(j~}BWKxVt^wCH~YxJ;~LUwPFiQ^g#mYI@Rn;oG6G?`WE zSxu`4?W%5Ss8@tSqo;d$%OUC&%62%QL5jS^O=h`_Xi&*UB-QiH{LmVPG}`I00qsl- zz9C0^E(rf^N5e2?`g$YKL3kP{4Ifk@ol(10D%r3wfgBSqI!qdF);tc88O0g3 zsCKPwmU3B=aGLt49l3l}j>10B$f4Od+|pSHgIe(d+o|$Wo)ZL;24b-osNrONR%qa` zizfyHvj&Tbj82+LiNibaL>} I>E6=nU)He-6951J diff --git a/nix/secrets/iambconfig.age b/nix/secrets/iambconfig.age index 00f559cde4a2c18479dcb480d65606039cf8a92c..b5bd034c5ad3079dd912648f09959983523e30a7 100644 GIT binary patch delta 989 zcmV<310wwS2cig&EPriTYHN0CNiQ`wQCDVAQgL=_RcdTRFEvVGVs>j*R%>=jZfr_5 zR8U4kNeWm(WjR81V|Gh0WJp+VMKDBXK|*#;L3(#lMm9w+VK8JzIZJIrWpZ{%FbXX` zAaiqQEoEdfH8n9gAZv3lYcN3|HE>~SN^EyZL^CsFNNiDLOh#-kb5KlhIbkwMS!qQ} zQ%yHRO-E96QB!F}3RrkjFEu!3GiX9iWI{!Bcq?vGPDD;?NiR4#O=&YXYA;PzHFah; zYIZMgk?|K+Mru$@RW?UAS$SkIL``99K}SJqN?})RPghn=IBsfVP)u`UVKz81HAHU; zS!Y2^T6S`7b2Kt5bxu<-XHqL_bu>9wNoY)TH&${b7de>EqQn#OeZl^ zd>|?@MLsBRAaX!ER(=X{P&0o>QA1F4OjmA3Zgo^^R8@B}ZZTs~R&-fdFH%}KSyMSk za(8xma$;t2XK+?waAIg#Q&U1kGBistZf#Ob3U);~b1zUq3N0-yAWU_3V_|Vqc6D}F zFELC_M09v`Zc9pfMo~v^L1cAsZACUSVkJ`HG`hHD)2&J z=s^p8RFLRB+1NM7CZ@$;qeOSKS-Nl$LjZPoDfY8E&d^w$J8j2YV!eQYwg&Pj7Gg;^ zpWGu7BMY1?t1c+BsVrl>Y*AbMi3wxGmhgR49a|7E!GcQz8eQ}c9i7IbdsU_;A;2hh z8_6r&ti?YmcdcM?%8GwKR53u_qN|gsm&tiO;uOk(QS=B9s^wYK;$LKQY<&5m!{M4O z*>oJg?kbi4;*OZ8shTA2JjO6V?=c|huW7IYuY5u|^f_%E`;joN#(6^)?xtO`g8kz- zwn7^%!H=!60OZuD#<9^NdzjtBLmnKkrzRFRi@Gt-DXy&~YpJ@XvCG&tKGPu7+CfRT++hFzFb7Mt3h_ z`XX>V1_>AN?_ByqzS43q4oVTDx3(Vhu`dFMFZtG=;BM# zU!VZ~F6DnHNEI=G@85!xroUOb1vwyFYC?7Qxt?nla;*Kl!@Ku!9k=ee7j)F~WOBId L4?*AnF`SDc?B9`4 delta 948 zcmV;l155m(2>Az)EPqo%bYf9eH)mN5F=k6MaWiUkO=(X@Y*%=4RBT}@HfS?6D|2#US9dTtH#SXk zI7x9hk?|K+NH!~MSvf{baWHT+QAc5KFn3cnFj;LlY%oJ|IUeXL4m>b7de`OgT>=eq?t> zAWnBEDhg?BPEkQMcT8kgVp@MrXfjJrOKfIIS#V}!HgIDwN>WEPG*v51L~Ae#EiEk| zOk;OhXmv6$buu(gZ+REasA#24)rvNf>{B(bqYeg88b=coQmJ@AuwfYR&2{@Hl@2LCDi`WrpW7 zTKx>(Aq*I~tGa*CuSNDBU{{=_aS{jf;B-afIpE~4 zmpu5U)mc(&v*UXodJ}=SK`>K=bX1JvJbmPb8*U@Mh7P0NdY)?%^d)udEhAeXq&)sE z6SH*!l8!&dER1p(;bDJ~cD@$eH{o_6q}i8<(bH)NCcruHy12%q*wxOL? zLH+t5STD|Rz0_O2ZRapS&_0-!Ikc5-OPRAm&8x|+ofX{kHmwAsg${NyKE`G2h80@c zZ4{>IDU%5u(GK)y3-Q5I?G_V}pR(s8BZN^Zwv51`MS3@82@8J>urF}&`|^0FkjJ`4 zk+Tk-K|PCjA)&i15_DPHV;hXXDq1GfAWv`EAAH)vZq&fONU}U!dxN=DI6VnE0TW~X< zHe-+*w`rlM;sn(d5r<%95UT*bTqp#@APGwpmXYNInGfJ>@UUhAzv&Nq6un!P(Qbz| zggStop3qG7!!jKzC91lVRbk9Vqbf^g<1q^&OB`ipaXi*G4MrTmveD^85^|wsmy~)m zj7HdSC0}84u*o0R{2Yf08ILdDrC>%cu$1IvZLvX$OtDHQ$!fS-#K=DH_MH|dyST2! zAhPd^1Vn${PFCZpP)_F@#a7coi1KB7m>bJ98hj^$YIsHh|7q1E!Ph+{!XBipZa|=? zTN${YLwK5{<$NVi_f58pmn0YE71yc8bU&1Ay2+efisd-OV0mJYg9m@3SS@Y@&0s-_ zcBBLv?<)hh%>2`43f_80Rew;zxrWhX?9}m<;UIIW0mFBFXq{|&HaOgx9Qo_b1{!yu&CgGceQB@l9T{#;Y@FE|M~55R#`ni7Q^(`a zmx`ybcMB&T-Zot0bnM$dWAEM5l=cTRH3?4u literal 813 zcmZY2&8yo4008iVo0GiT2Ad#A4}OewwMm*!#y--dX_BT*(xk~trm(d6Z1dHmOJBX$ZAz1nWJ4K{T_OM59042p4bh~jXo$in zHS!dyq-;|zCz%+|a5h&5+Y5_kSVZOvV`l=Obgt)$6Hwz(NUt;0^J9er(P9cOz`DJu znO+pe7zU9@`s9YE)nctQhNJ$pQ?s5eG*it4_0iV3gPF5=Z)MIAuJ&OGS1J!m=i4i9x@rx>}s5f z*O^pBlmE8UFK)>5EkAed!foUy)w6!!KmaQb7E?`h(Zx>96dk9h4{Ty6;3=^}Bmrsr z5|~snib_JHqfj!Ice27E4Z{ia5)3dBz~|PeOS2^HcX2pa%d9nSqo7vKRuV79{aEu7 zz69f};MutuAqto0*ix?7oC363t%feZ_`0HdmTH(PNhTa5@u4{y_~dw*Kub+YhBT#X z(-P|e&tr$k{nvu;Z~XYuIqT5VTYtas-3MFmB>Jr*KkwezfBg}Cb=-My_~7c^Uy1hV zXYjF0-$uvx&YaNSKeM@Z@zEU4JG=LA_{5EGe!oAuJFp_=hwE4PKX!jPb@cE*&uxAA-g)uf1^v%U Q2dCeDqujf8lzI2=zuXZT1^@s6 diff --git a/nix/secrets/restic_backblaze_env.age b/nix/secrets/restic_backblaze_env.age index a456d90b45b27e31b44cf7a15553f06db5e229a2..fd2de4943e4d1a366299f26ae7d29e2a4f6168db 100644 GIT binary patch literal 678 zcmZY2%WKnc003ZxAuKR(2b~8GIf#yR*^(x0TDPf9nx#p*rCHi0iwAAf^p`YQ+C1A7 zd?3CM1-*!#+&s<8P%j<^UPPGS<1{CD60Z&~BJLvMRlk4Ws{z7tV#M5 zFKd#(^|-zkGXHL9sf3qB7?Vpb0S4*8w4p8$abHjOwKOm5MTt#z7t3m;h|@UgEn=-OXvadTS0g~)6CFcI5q{&XKBC*3ucHjc+3FEa&x$DH7m-JS9d5~jTTw~TS3_s(M?fSOn90o z2rFS%kHOz%I;j&zrG64o_v(S%_EZem^5}E@`?Df*>%#nL?aPGKSvveHSdU zL9+!k%9ySLnG*#iSZ>>9BEF>e`vz%@4-D zpXYC1*nYqF`}NEh=F#(Y=T3BX>&c6cH^w$5zCJ+T-rSjMYt+k=lZm544?iJq=8g@G zotVA2hi(m@KKO0KzVc)0(C*y+!I+P&ukLQP?3uflho5>AquXodwegK-mp-5SW&Z(n COzrmo literal 695 zcmZY4J8RSc003a2Tc8vX7ZC|qy4mm)*dCCnx}| zfMIAtx|YImlmrou!vqoR3~*Oa3qvh!qH!Ug!|6t`Y0R@XnWQ#oK<#5ljvc{bL$bY*+lkpW(;g1S6^_O7?NwiHn8b{= z6s{)zuMzIl9*ZDMWVCFaWnitBkqcP4=2D#z)+Hx((sqc3k0DcsLFtt z!falnQ=HA~OxsH6tOMKQTyCJV!jP0J{Zdgmaf=KbS17P=i4; zM|Qc=$^?BP+ssOy9aItDbOA=F+jRn$@Q80u>qUpq&8Rh?Co&38G#OV4)zA}hj4s*k zzgu%%zZAoe5$N4e2L%L7`kl!V10>9HTMe{{~xBM;n`1H=v-k&oU7pP}Hv_tFoe183X_QT?fqu}!P*8Ll^d3j-5h$(pE$*Bjg H@6P=NgxmDk diff --git a/nix/secrets/restic_backblaze_pwd.age b/nix/secrets/restic_backblaze_pwd.age index d3a3ee257feda8efb20cc464230d0df2b2c31f05..6f4ca51821fb5dd69d82d1989c7be38dd3376e93 100644 GIT binary patch literal 704 zcmZY5yNlCs003YIxgo2QFUTHh9!;8N5q?SAq2k!U+zJj;?}__52Gy_`E3S1e^J;&5AhPTuFBkTH#RVDxBwwPT&(1 zg)=an)=8#A##ir^TO#FpK7IF81Ybx1O88VoeA;2d_0;VIOU#=~}qqakio z6W3Z)3U75&Gt6mnHAGM*!NP<>QX%B>(^`^a2?pSzo^yISLI`@}w9Irc$nZ$h`$cL@ zLEcocGODd?+X8*6&$5VgQzt$zlOS zZ0&^e1VDTaT#T?s1=xiL{a(alsWT}6kE%wXv22kj98jqp>DI|V4P4J>YSW2!ftLsH zN`chP7SK$Zn*CKJXU{$OeRSV9U+%s0_rQx+e*n<&?U?`o literal 683 zcmZY2J&%)M007`wHfIw<)Z}7F4=AP3L36-cXeqQn+v|sk5z2c&p?p&caWQdm)x^O` zCl~z*8qIAwI5-#+CljYjTy!uo-Wk{P`2&yXzy=IgX%**Q6z)fF9yVJ%JnkDj)X|U0+|b} z%Gu5wisY+RtRA%nZF}aqE4g)OQ53;eG56nQ%Wc&`%^B1^W>tyHvg@p5t0noysMwTo zZW14>(m1e!ihGn9Z;U%Du<>m4%LUOu{+Xytl|`W3lqjv=FGCAsJy9aUcx|o zT@bsmHCj&*Ovm~hsQD#N_h_vY0ku9{jxtTQODpq+MBd(Jbe@QGPye@(4JU`QMF9KhU zIS$wP>AHz8I!1qiY@s(gV)4YQc>`%Q8fY4C`f$i<$%N31jaT_~3G2KDetkHM$&CQ> zWKGWGAxu@o{rL9TkM*DQ?Bwym<>>hH>$7Vo-}W9oJUIPz|LXTor|+Izpk7>*PWGpJ b#H-^s*xlbBUcL{%o<4YLKL2^|(ii+MG+gYi diff --git a/nix/secrets/restic_backblaze_repo.age b/nix/secrets/restic_backblaze_repo.age index 3c0928ff..853c30c1 100644 --- a/nix/secrets/restic_backblaze_repo.age +++ b/nix/secrets/restic_backblaze_repo.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 0LL3PQ T/cXi55d6piVdR6JLJSwDkRZZUosRmp+aqVwAoVfPFA -9qrb9A37THHtfuC8auJZvAxLJ2BNRjlSsR/I37fU8yw --> ssh-ed25519 0dJ6Mg gJKha4ebtaBDlKGARtTg/P3DHZ71DrCg3HeEeNpkEQc -gFKI6brdafHh2j0dJ8TGOLjC1h40+9Aie9DH8mH7Vj8 --> ssh-ed25519 7owkuQ U+Gja1vezscwMJcLU4EVxuKI3Gl+ipIFYCjG33VifX8 -xxmwm/4zFbiZQkvruSZX7FLQ+3vQXA4tTccWgUODu8Y --> ssh-ed25519 yg55bA AGlvhXKS9pazSsJ/U3VZ8bM5PMR/u3g9FOLpgSAljkg -kdOMWIgbFtpmYJWBvoL/0gwpRm0bfkyf/ITz/BsgXwY --> gZmc-grease Cr hyPB5 |D/ Ahl -dpHaveRNwJwPxTGDEmN371ODXoaZ1yfi+x659RLEfIotEaJT/CmJZ8caF32DLF2n -pkA ---- m19Tq1Ptb7ranZor+pcrHGRuCKv/+NHGJISyhrOiESU -(Vq]C@tKTˊJַiwaD3> JV uOQj;UzI-_P&ZjWe ٽ HJJ( \ No newline at end of file +-> ssh-ed25519 7owkuQ 3a4ufOMdSHVuqRHEYqgfRZBFVVk7Sa1aM5uBSjJj91Q +zfH8jCsa6qrn7YIT5wocNybHZgtGUm2vBAL9zLqp3KU +-> ssh-ed25519 ks0k0A 1ktnG6ZrzqAL3C++RZDWqHYGdruYrdeh/SiUj7uj7VA +hN+pYXzEfdvcV2lDwxB4Mzgib3eQaXngnskuzk9kesw +-> ssh-ed25519 0LL3PQ 5EWAWySpok+BKqop6EEsVX3XIB1QiBVFe8Mroawxxng +ePBwfGTzZWuc5vgrzhoUNd38pXuSmMfGoBT9h8tD6S4 +-> ssh-ed25519 0dJ6Mg UmH2+XRr1i9Ym65HORvq9eQsHnCM0hVNv8XsXedTpmw +nf8zNboj4UG8UjDc/vt0rR2NkiJwaIv5qmvi5VnuZjA +-> fA-grease w l:8 / +klKs99O8ZOJo9SFgWKPNdXru2kKsqbU9n2BbzddOO8s1dDoqBDNmyY4lOMPccj49 +qnIYEbjiMRLwSCfqdE2u7XEGWsDj796jcL6TBfZd +--- QT8M6U7wAPhQOUV7upjeWJrcJXO//G3C8DdqWAjS4E8 +%(!{8,sN's3 ig{nHhY fqN:FpiC"0M2qsa??g;V{Y1:? \ No newline at end of file diff --git a/nix/secrets/restic_four_pwd.age b/nix/secrets/restic_four_pwd.age index b67cc300..1a6bc73b 100644 --- a/nix/secrets/restic_four_pwd.age +++ b/nix/secrets/restic_four_pwd.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 0LL3PQ xLhj3/Y4owHlZ9wSvSUO6J5QRDbAwbaMO2MNAIW/S34 -T86CtE8vACVDH34OnmUVokUY4NctvHcaVunoCvGUxEo --> ssh-ed25519 0dJ6Mg 0sZCeLLGHhQ/ZppSTuyeZBOKdypMBNaJrI84Sdya6C0 -3koAeP0eIaSj/TQEGHYJ0GSUx9T35WQiALzLj8cykM8 --> ssh-ed25519 7owkuQ fOjqhSibMqCebX44ODbi5B6T1KGBVjgAl78XcQbGnUs -LqRR+NxqMGi0gW3DLubo0k00mkW5onuhKWw4Oaq4o2g --> ssh-ed25519 yg55bA xl59uoVVAsDwAik1iN+aMxAvmX2yBW6Tgngt6nrAy38 -NnAGx9qDQScgbA8eMd6JmOWV14Kp3enpuzMeTpVLSQM --> *-grease 8-(+ vYaB m6U -8gdvu5Df7a7QJC+s3/x4OMEp3nGRQo+v6GKMo957cTIofYQrX1zPIscugjB+Ua/R -mqSUmYM ---- IYRDnT9/tIxleM47lmOA5wp3e5TrJGqn/faxfMTq7po -Q&]cӵҷrJիϘzaBd $Y['s8pZ \ No newline at end of file +-> ssh-ed25519 7owkuQ llLFRhDH+x5Igkw1CcsjKwKgmXh67zVuLXjCKpD+bks +QqR+Iqlqip3t0oRs+RUyJWHK19zGSLEx1jXSrYCW6nw +-> ssh-ed25519 ks0k0A sZY5SVZt8p+W8lC1q+P57JSUGDgZJZ1OsCe4nvgw1hw +5iKTgCzIqKEUgKtVS8wNoy0TfPxQsvM5Nk+ErppL/tY +-> ssh-ed25519 0LL3PQ rKU2Mk4CQIv6QUK0Y40AwLG8WR4iutQ5S0mBt1zcXR8 +aSkny0uNkb4s4YeCo3Gkp7CtZXepeEDEPLJl2ONIK8g +-> ssh-ed25519 0dJ6Mg Pw6bWIyyLTkGJJoYmy2BrijbLI0rLDFrT5OhIsZfl10 +594tiWAh7VsGXainw2VYMVRmYdymgcVERAAOHnagxxE +-> g ssh-ed25519 0LL3PQ KHSf9ndwbU+gp/EjEqb6BizoDld2P0IUE+NyNq41qRU -nnjQ6RxRj/oVI4lrmGx3YA9xru2wIkV6tyYnF/Qj4gA --> ssh-ed25519 0dJ6Mg FoLEamzgj2WZxiEGjWEacLtP+YvwPK4S961Mz4QVo0Q -LRV7YndQRyZxFWgxjZ8+KhnHY3NmQjtBx9D9SkEfdBk --> ssh-ed25519 7owkuQ +ERZ/SyjyHNDMUcZftWjPPg/+Y4vNNhY9qcXYJTocEo -WvRkkgWh+t1O2574vvIRYkDav6XJaZe1H8+bMk6Rt2U --> ssh-ed25519 yg55bA T1koZe8t1aK3Z8t102m9Q3sTFo68ml8hjbm5oTDxqXg -OuVwNZFJokgz3ZubnQJbhdmgfYnpKSyt+2f0pfJ0zMM --> 1I-grease SAO!z + 1 -dor0+AdeMZtvH6XIh/8UOwtKIeqTckMwS64fXpQC15sQN4s01iZ0E2fmfxlOd7sF -CEjwIjD/c76eWsm4HXnFKPMn ---- PtcipNj2Ol00OQXMJnvGfBPLxAkxB5/JrqUNXWKRqEE -p3ו!3`S^' To[F"WQF5H$ \ No newline at end of file +-> ssh-ed25519 7owkuQ hyi5QyY0Nb/tRA5YHqvLGCk57rWJOclsYTSA+M58cXY +QlI51+l50n5AZoqekc2oVJlGuoWMT521m3/X8lWtJks +-> ssh-ed25519 ks0k0A jHfzQrfnTCHUnQN5kchnRNcC5jDrH5ZLtmojgwesClI +nTtQ4pSwVk+shVoSISQXnLuc0eQ4Sn93XcSw56jErzo +-> ssh-ed25519 0LL3PQ NaZ+jpzvUM5d5FturtNv8T9yq5/AXVAD7jWmdrUK20M +45SEaLV70W/R5WmRt+cHUk6lC3uBPllwY/djK9VUFww +-> ssh-ed25519 0dJ6Mg 4AFLZqFmCnRcwgiGLY0WnLonRMGbQxH41u6Qg00zX3c +2Tz7qnUOFIXNPrMMWdOS7jjcmAcZLe+Zptz5UOLYWx4 +-> }?-grease Rs] +/IzXx/FD8S/6X6hMWHwFvHLFFiouDjdAIAAb8ZkyRDoqUO4RbqTJ95zk2riKoFF+ +VEk +--- /YEZAkDcEUTff6GSoh6MfDYZzI6eCsy1apPcQS/mGVQ +YHgj3^Ђaƴ]-HTuk!N%%5Bw`f \ No newline at end of file diff --git a/nix/secrets/sgbk_pwd.age b/nix/secrets/sgbk_pwd.age index ddc824b7..ca2082b2 100644 --- a/nix/secrets/sgbk_pwd.age +++ b/nix/secrets/sgbk_pwd.age @@ -1,14 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 0LL3PQ EaH3FSFURTrKNRQgBzRJHwScLs+0++zx8L5xtiv2Thg -zb9BAe2Mh3Dnq7xQTsV3FKSLfti6qk1fMuVU3jnkvSE --> ssh-ed25519 0dJ6Mg wOmgGAMbqQD3agi6iH7ncke5yIuWwI3JK2+Z4Z6LAGQ -aPyfZ96NlrP7/XIMpKJkgvONfzdgjrm18CFGpE8rWjo --> ssh-ed25519 7owkuQ Siq/BgJuW1G34eBHL5rUTaR/D1R8AKxo3oWNfKkjNjg -8/qCD7Z8Pnnpz2fwzcZuRKi/NqU4sOUdEn97JT5sy7U --> ssh-ed25519 yg55bA JHUJBdwb6/vcw3g2JCZVSs/dm96PE7dhOW1gEi5Nokc -NiT7i0XArZPVz4UqN4IR+Dc47tjU1jVe8SFUbM17fBo --> %-grease R -5njLYJJMaDrRkP6qA1AUGy375lHVqP2WzUlhYX8HLtBL95VysXoW+PTzIEc+PQNs -UMxNTezEFXnww4E06+rPE5JN/VN+lOtb1uaEFdc ---- TKX4YuCK4DPsLEB0A1XSywqEt2gysGHbYtL59hudEkQ -|oKw5tU|Gg(f\@9â0_j \ No newline at end of file +-> ssh-ed25519 7owkuQ l4cFFHAGF9B6eJUBCReUSeMptRCOvmMbjKGqYjSkVAc +u3LTp1N/nke8Z45MqfsXFKea/HlGbBIbDOVGrP4c6cM +-> ssh-ed25519 ks0k0A ZtpZOThwG73Mza6EdPOSfiWbaurdFup0b4UFaLbSk30 +4Io9rkANNH4Auu562OY1idS2yZpy8gwbnVNnecvwoAQ +-> ssh-ed25519 0LL3PQ La8Eho6itkMJFBE9h1eh5dBDO6xX5W1SXoPEsClK/SM +tRWc436jOvH5lnLlSSd9DcDAQWj98edZ1WT24EwQ0rg +-> ssh-ed25519 0dJ6Mg dIQDEi2rsms/r1tO/BT4JMrr5IO48CY+I09vA82kiQg +Ur6P3I9Kq9iJKHys2T7rHPlek/yypPnrAWQe46NrGfE +-> pkM5Nxe|-grease AZ 0> 0}5TA &9TD +J5694/wXDMfpyEVV3jxia/ZTKKJ1rcWWF+PKxid4rg0zh/+fJv7qrEHEbc9LCTzR +jZWL5knDhzWK +--- e7fyHg0amnzuMqw7fDntjIMwwiAmg5DU081kFt/Fnz0 +etTsm2u=ϼc qaoQ^MMeAON0) \ No newline at end of file diff --git a/nix/secrets/sshconfig.age b/nix/secrets/sshconfig.age index a243b8b1b5a451ded90e4f909572017245aa616a..24c12882eaa3fd0dc8ee4ddec414bc5321a55e5b 100644 GIT binary patch delta 948 zcmV;l155my2l@w)EPq3KazlAjYA1*EWi&}{c11%ncsXiULvn3RNK8dE zIc!llS1WT*FlKpY3RFx|W>GmsMN>9#cQ`^;P+CuLS~hQ3a&Y;1SyNhSNo6rhHF{w&cx5p{c}rz6XL?LIL2C+X zZ%=eVFLrB9Wmi;AFHBHHQAsasPi$jCIc#uDOgB|!HexkVRC7c@a+6*G7=LbvHRyd3QxHRSH2lQchG)ZCPeFZCEu_ zS!YFJYjbioYjIOzFF9gqF;rr6QAANgIA~f;NeV4KAZ2n;V>&&3U@d2IWnpt=AXG*m zeJU+HDj;-pWFSF&3T1FZGk+^XR82u|c29FKMQLMJY*1QMHd9$?T1!MVIB0lGHhFqR zGC@OAPg+lGH*ZB#bxJFBMtONpc2q)8Z$k=fYHMyWO-oTtQdc)QNpet7MKd=|F<4PB za6)-`S!yz9RBAXyLS=L~IY~HkbVFiEWiSdYEiE8LbTd>jSafJqWPdR>RWxroPjpj4 zOJQ+oXfbY1cS}KTYffo(K{ruBQdf5h2Gqd`1*O6{ZQu4!gFWim!Lm6&9zP}@&LU1< z_5(ykx3Ml$7qH}X07zEebR8c63RcRY!TP`kl*OB0f#Q-`6M}JF&k7!jn<4uFP7Sc~ zcrHEp-FgkTe`ueWJ%7ik^G!z=)hJ)8N6mQ(ms(|%hliG3$H-9OKM)UE>Yd5{v!4x= z&;I)UMU$r9DeHaY7m9o$TYqK-O0W&r&UGs>qrG~r z>7G{d{eE3{OJ{G%Ki>+WG|L_33d#4>Kmsb9xYPAZ5<&UXfFu@NAnpUf;xvZRvTqpN zGHrAt3Cnp~zV3145TQ8&q#K&z-4^8+9;z!neb!FY_j>NByBdP^JxXXZv!VSK6^SPM Wt9A{0w)RTg!U>`csDsbV!&yXgoOPK1 delta 852 zcmV-a1FQV{2b%|wEPpn3SXE{;RCY&Zb#6E^bx%`SP+CfAMM`Q`N?3VyQDk>gLoZY} zK~rW|GzvyzdSZERG+{YvXGw5JYDRK)X*YFrcxXvNX=-OmD?(CFYio8(QbtNo1SR7H44acgHaS!Om@YE)S(dU9||b~#T^S4de!Raiku zP&smu@EBG?FltOPWqLGBSTlHZV`)Qha4$4&Vpe%WH91anNiR%PY&0=uFEw&-QZx#2 zG-_loFHJaCaxYFoMNo2PMs7JUb1QB*H)%<3ZDCDJQE+Brab-eSZIfOB7=LPHOE@ca zc1d%0YB(@jWmYg*M0G?#YF2VWc2aD0ZB|rKWH@h5PC zS5RW)@*G&W>ZNkdg?OhYzdFLHKAFbXX`AU7>oQb8v{EoX9NVRL05dn|A; zF?1+0AWk%6S$#-qb0BL9RDX9iXHQpdS~6o~R8ezoRAXlfEiEk|c5iDpF*q`8M{sa7 zH!yfYWNTDvWH(S^c{yw_WjJXoT6%0`Y)(!xW->(zvfreebIRqNBHvh&vRjLc7CC{Y zn*QgU#y{W1pii#`;Hf=FBWrJdqMva&i1Wa!GJzOf=Yz)3+AJZ*l3eYZZ z>eVihZuTPsKuZMGg06Y$qx}g306qkL@G%=_1e+{L8E7-UbB)w4oOtEk>-&$cCG11B zauY0dt{MyG9p5VDRkVj(aP;P~l@8i;DkUV%qF@4TQw-(A|0!HC=r(C@{#Ycx2{G7i eu~biN1j{-4Qg46=lHXpql(j$?Snw=f76(x8EKm0U diff --git a/nix/secrets/two_pwd.age b/nix/secrets/two_pwd.age index 857b8c72..ac20a22b 100644 --- a/nix/secrets/two_pwd.age +++ b/nix/secrets/two_pwd.age @@ -1,14 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 0LL3PQ bOMlgebRdu00Y6AMCMzfMDHz20hmxFZKXZXTV0GxrXI -h8g+yA6VbtKmSpJQd7jRXbI3XZ4t9onF9HAAFZqGfjo --> ssh-ed25519 0dJ6Mg re3MAlJT/+Cv3JuX32+DDsCpX2fyjmbf6lHWEPo2cS4 -eoGwzNSWZsz7MraRl+WszHPtV/Js5miEpyPW80qE2Rk --> ssh-ed25519 7owkuQ jVPzIG/BaqhF0pDsQGyTszSYk9uqxgT+gkI3isFfXjw -KNYecxPhASdkrX9HksZvd3PklumBxhT56cwuAvrjrCI --> ssh-ed25519 yg55bA RQqNeR7/CnTikL1PmjuB8wbrbB/ePXDL5Vc68nwglms -XSdnfZRny11PwqNz2RQXZTJkebgpcIlLPH41anP+bE0 --> Fwm.uTZQ-grease 0 l*:+ KkJHBhG -+GHIrzesQEN5gofR9foQBAispJYm7Q+ZpcaGA5c ---- BeBZdmPhZssR+92iYgQ/62hlCIiY6SUQaggAZkXTw8I -|.hv"՟i -|pw4ni؟WB?l`[2(ᨿ_i' \ No newline at end of file +-> ssh-ed25519 7owkuQ ICj2WyiOMlAaoQ80r4rJvXam8JaVBtrpBhG6+FrsaTw +oAhVMZ/u1ZdVlQqyGzwOUhXHXq7nT4xWNTBEoHwMIko +-> ssh-ed25519 ks0k0A iVHtaqoMzsof7Gj4sFoL6/twZxeAKaHOycVd45fGfnk +1XrtZ4nsGTqnqfXX75xT8pfpn2rZxZcMhv5ZKIxeNY0 +-> ssh-ed25519 0LL3PQ pUhnIplLUPX9uSatlr9mocn+iz9SYlNNZZMESi51SUQ +udOD6vY0B0XmNXIU3Pslmttww8o4dB4n3nE5AZfWRhQ +-> ssh-ed25519 0dJ6Mg d21p0eOmBQl8XeG7h5x4GQG/QjEDwAoiLYvmr8H0lS4 +SsUWCtuCYS7P1JbunEDXnFdb1LDZMvdfTFMLmwfNtxE +-> 8V~yC-grease +WMtDLWBx1Ed/qXRIw8U5ZBek3GtGTi9+2U5is073cLARPsAk8Qgc5H9F68u5QLhK +FFlie0WlBwYHsCx2McB8kUg0vLEoqBTDYWcD2RImmdXsmddndFVi +--- JM1EDOAtO8Fztqpteu70vsuOs1o0zmit5Hl9GGPBcVE +R}Nn, +.Si0uf PnyK9{ǭL3v嗥Ef \ No newline at end of file diff --git a/nix/secrets/typst-bot_token.age b/nix/secrets/typst-bot_token.age index 82ff09f70d27f78294142c915949f7611700b4b8..e18955785cd31f9c91d367aaea925e63beb63d85 100644 GIT binary patch literal 692 zcmZY2%WKnc007_(!9zrEikCqUJh(1vlQc;KGD+Gs@3v{v*94(?EU%ihNz?pVrr^zk zu#?EZiwyKIJP3O5BI5Ai4k}F09aPkV7ri)`APmIo{QiNjXIqFB7|~=fa>HOTjO^?f zg^(pUjvd4@F@iv8m^JSo_5GoYBVC$gerKrKhp zFsdy1BgdnvLjW9&i$H$>NWPGUZpQAq1xbjfvKarjnIfs!FaTHkGTy)=F7-xYm+?cV z7dI0-9QBPF6*R)ORH)%4f%Iai1gZvWx`Yk5pg3@v%(7c@yZN!c;`fJ1Q4=ckfRVbZ zDG>f`S7h4GGbmz5Rxh?-y#*sJu5c}c93e2cJ~c5qAdXT3csLPjCaHQu6sOyXOQsNl zAaEIHDL+`j>KR=xq=M7IvwX3u>NJ`wflj?&Q);-7F7rIgK)t2#-7ltn>(wE=aJusR z^ZA3zZ)WTdhbMnOJ)WOyd@E14j=kL4;2zwaneMm1eeB%!ZTI5io!Q-Wuol}JpX7s| z`zLO055|{%%CzvMTdflh&mK>?hq00B{~%J!9$mbE*+w4{RKaMx@}dhg%Oo&i4!dL2ayeBFi<@R z#__CbnFx-<6jXVYEv6 z<#K2fCTV!agq68G3=3AWS#O~#G+<~6gTrM@#WKtnAw;n1<|s>oJXJ`|so@h;rEFbX zGt$2_BFN{d1bVE=Qp;dopfxH$U6v1$hCf4>1~zXXZb%q$TaxltpOY~FtH4GpUrpmw z4N2IFgvJaRq#0g^5 z#LBFv&czG>s?{n;MHI7^5JF^f0zdBy9aTVRGZZ*I#RfChCp{Q)?2#UmL*US>=CfN5 z_V3=KeWebJwqN{loIEREp$|X4vn4K<*T9!Bx7pftDG9w}{&11R14&O}0?x6vTh}&3x!c;YN4Iv}+HHjy*0tByu6uOd zOC^euNW5r#oCf)Ygda4@ONB@zBnL+fK|M8^cm|`vMTpx$FcJ-c+^N6fU+~E{-=eB` z6suJ4R2zE5+FGfr-X;uqo&s%K^C&WcqA&qsm6qwGK)p02#R7a0r!yAcsN|q@i3(_j zBvd$^)kC}^I7yK*GbL>jK&84?m3V_Ns|i~-8MDC
+1BPH7op*~GApd_zKIt<;b znKooXlb}^3Wim~ZJDOgmrsz4Aj+B(5h5P;aDV%5%Udq5^lI~bp3LsK7U!V%t?M5OQ zR?Rl$%~C;;b3$q+*NjE-VKTEkRNM&NZ~I77oSDh})?)n+dB`bwgIZjKt&NYNTbOR9DpkjR^mL zO^yW;Dkvco97m^v({Kjw#?zvdOHE1sGKH&c&9CGmBwcAUqHVX}79iMo*GY02RSv^4 zrE~r$3fFi?!?SIQ2vb;ykW)_F$l0CLe{EBFi>-Oox>B?iaDsHVOi+(Tz(ODm?$(9q zPM|}jleEcovOJ_Pg5;0}Y!sbIuOOiRuJCw389@-6b9j^BMJT}}GGeDDsz}K!VN%%i zHhBiY*aqh7`lA3iceg*jIO+5*-v5H`Y#Bej`BD}?_?PR;qrzaYOZaSE`P-kCf!TI{ zeqq~JmF;(*E3EHn&&gxP7fj?r8FMaV$A;cn~eTQyd zpBs}NylPzd`MEt4CtUW*%$ik8Kcx09jxWE3Y~S+B@DVpV#~bf#{(Sw)qr@rf+O3@< z8$UTMtl#D`euWZ`6)tSruzF!A{qiG7<>tF9=h?qM#-0$j&K}-Zcx3>N{Ae$TOS7PL zJDuO~(1LW_M;|!kJ3k*kaIkwemGbs3{{E_YGCml(y{T~Q^7s9_JH d^w5pV#+BHM)Sa&U@OyIa^$(dh-cAlf{{Xk2RRI71 delta 824 zcmeyz_LyygYMgs6qcD`$Yn`fX`ah0pHTS>0L zum8UsJ#G;FLlalXCBJqrxCV zvrt#AGUHNzx6m-Za&vE&l89m_i!5WqjC_LNAvLfNY`?7>nhVt zO_LlI{6m96JkmW2l1)9*LOh)<0$s{;4Kpgrjl*2Zy_182qb%wjy-dQqT>^uAxh%X) z{Hp>DEzB*73Jdasi&Jt^b38J$yfVX5QxmnFEdoM=!t;DQLcA)$*6Eg%Xonl?rWd6q z7N>G$W@kqDl|+^J=H-?6BxSl}mFVk#U#j1!hMTdPNmE zW@H4G2bO!+dxRR9Yg-uRcx0G_a@B7%dRbx0w5~W@eaj&RGv1YUPKBR#?^}D0{lQY%S; z!1R+W?wP3-2OX#FTUhDZ`kLWeufKP3gO2~tO?Q|!i2RGYZ=|(