From e1b9170fda919dbd619f1d74ecdedd7e7090ae79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 5 May 2025 19:36:38 +0200 Subject: [PATCH 1/3] disko: add btrfs configuration for tungsten --- nix/disko/tungsten/btrfs.nix | 92 ++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 nix/disko/tungsten/btrfs.nix diff --git a/nix/disko/tungsten/btrfs.nix b/nix/disko/tungsten/btrfs.nix new file mode 100644 index 00000000..88f5a492 --- /dev/null +++ b/nix/disko/tungsten/btrfs.nix @@ -0,0 +1,92 @@ +{ + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/sda"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "500M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; + }; + + # Use LUKS for disk encryption + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + 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 = "4G"; + 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" = { + mountpoint = "/"; + }; + + "/home" = { + mountOptions = ["compress=zstd"]; + mountpoint = "/home"; + }; + + "/nix" = { + mountOptions = ["compress=zstd" "noatime"]; + mountpoint = "/nix"; + }; + }; + }; + }; + }; + }; + }; + }; +} From 2ccc494368233697e2f6d7c6b408cce735d7d0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 5 May 2025 20:59:20 +0200 Subject: [PATCH 2/3] tungsten: point configuration to btrfs --- nix/configurations/tungsten.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/configurations/tungsten.nix b/nix/configurations/tungsten.nix index 4b554aac..7c992b74 100644 --- a/nix/configurations/tungsten.nix +++ b/nix/configurations/tungsten.nix @@ -74,7 +74,7 @@ in # Extern modules # (sources.disko + "/module.nix") - ../disko/tungsten + ../disko/tungsten/btrfs.nix (sources.agenix + "/modules/age.nix") From 63caf94d4ed1def2aa8fc265097a1e635d7ae005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 5 May 2025 21:13:30 +0200 Subject: [PATCH 3/3] age: rekey --- nix/secrets/four_pwd.age | Bin 590 -> 590 bytes nix/secrets/hoot_token.age | Bin 640 -> 640 bytes nix/secrets/ltex_dict.age | Bin 796 -> 796 bytes nix/secrets/parrot_token.age | Bin 664 -> 664 bytes nix/secrets/restic_backblaze_env.age | Bin 640 -> 640 bytes nix/secrets/restic_backblaze_pwd.age | 20 ++++++++++---------- nix/secrets/restic_backblaze_repo.age | 22 ++++++++++------------ nix/secrets/restic_four_pwd.age | 21 ++++++++++----------- nix/secrets/restic_sgbk_pwd.age | 21 +++++++++++---------- nix/secrets/secrets.nix | 4 ++-- nix/secrets/sgbk_pwd.age | 21 ++++++++++----------- nix/secrets/sshconfig.age | Bin 916 -> 916 bytes nix/secrets/two_pwd.age | Bin 585 -> 585 bytes nix/secrets/typst-bot_token.age | Bin 629 -> 629 bytes nix/secrets/wpa_password.age | 22 ++++++++++------------ 15 files changed, 63 insertions(+), 68 deletions(-) diff --git a/nix/secrets/four_pwd.age b/nix/secrets/four_pwd.age index 3bbbe06189208669608c827b6b1260ce7b43d3ee..da64891068efdf71de1c05367a6f40e91a9e9e7e 100644 GIT binary patch literal 590 zcmZ9_J&%)M003ZJ$;G&P1EUG4<)ajci3zmOQoe*jd&OJ~6#7!2K%qd(aFcbo!NkeI z++Z}(RpV$(E;$#S95ivc-Ne6Obno*A9tZd>KbhydY_m+0dua~Z6$Z5)z(oa2wOxr|hFwi>uO}2!s`4tI@Q~>BIbim{PTNc| z2Je<@KP-4HF&%)BgVN3y2(n@Fl;*+VMtYge>u_ibWFaG-vs1TBZ;UV3`7GKx^R^FM z%L~9vbOk}veS)7udf@3`LV~kanx|1X>k6DsKP&>BuMamM$WjAf z%UvWZ6u~9C@OLOb6NQDr1w}^Dr8mNHzzsd7*-QeGwV<^^57jj4I-Cr=)J!Ba3L`{j z9TTUi{xD-whPSpxjEuy?t;x{dqK1uaQ-q}?)$DQ~#io)!;=#Isa z+A-9s!g>^~0AC?p)51BEQ*6|5tZ^zrR(Sbcdv$i_@tce5M?Zevo_xIjq51dXdT})S z0^j|8^XmOO-uOGX@$&f7`03l_X>Tf{pD%0q_5NHs&7OZfx^)g;?SJjRJ?WoaJPZH) E2U(@Z>;M1& literal 590 zcmZY4JB!nB003}r5zHjW?Qt$OedM2qgOEp)G)Y*Ltagjwt1&{xC^d=E`r{H zv+fQqhYqeP2y%mXg6LNebU#1AkDuweZ8x;jI?nwlyc4A!a_BBTg?SgVEk+i!f%*UEZrk1n*dzT}VJBjg>Q+0Jt3T!J0M%2wV9?)sS$BB5XCB{{4<_B`igM);( zGFwd-0bVdlS&XO}6Tv#y(?$ptEsy9v!>?Cr!e&rsujBKe9`0>j%cTvY>M}uhW}-1& z1Qnq;d0Lf@K3c4+|8EJNb||r^lyN)!-`VG57D~COb!&(Znt3qX{yE_Yjuqzwa3K* zAn{I=fcbcdCxGr1q)ApPh2)3_{n|no_dg%<(FwA1{y2 z&*GDxDJ}l79-cgYcm3k~&5!8w^YFplPcPmuufJU0qF(7=o4?oIU*gh-?2RO-ga{190ZUk-(}jLg^2A~k^nl9hb_Nv063sL!fjS-+ zDJfATSz}H#8+1d@x|Nx3Iqn1)UMWQismKj1H8!gxmt+;!XSQpE>FSIGHE=11m~&BI z?6=yaX2`w+3R#<~$bse1DGy8YWe4|Sl?fBA9MwlPFN+b;Aj3-@OWJJYi``;SjaY%j z+d{;tQKZmFxLvafMIp8zE17ewd`THfWDQrHMw;U!m&s!~u~o?Pb-U9T_%CW zDbg`&4B9EQk~*&XR**5Wsko;|ovJn-F+oNef{@C3|7o#{(CrXvP@u+kaxFzqb-h6! z!?6s4$@;K1)O*yNTt^aGY!md@MuA%`*G+P4EV}JcNd*+2R3lUbLXi;+ zL<|Kxmw;gysw}ltiz_v|o=h~2t?yu9y2c`{MRl(Xki4s=2hqS)+juka_4U&~a5I&003YQG9d>~;zWeyu*(Qp^U*XJgJII9O_MZf)2?mGz@<&{Hfh>qN%PTy z7u`h%4$nL8G8o>52QT7DVTVD{n-?!0L`2v;Da`wxKkyj9LaoUloCQGJ_u9fTLzP4yVja&k(oI zfD#bv7Trr?kJdDmY!6I@Dz{e2`xK6#wI>g?`D#( zlzg4cx{~bE1zZ)K7-`#rD-(&_R&266#|caw{UPfsuSlPi7MzVm`;u5Uu$b}!d%w;u@qzTDeiB%2>kp6t-Ct}cJh z502VrtIwKiN3Yioe(YSIy?paqJVw9opWo$wE$bf94?H_5c6? diff --git a/nix/secrets/ltex_dict.age b/nix/secrets/ltex_dict.age index 0210edefbc86af217cb926fcece1feb88d72f9e5..47896667248d310f06810b9779959eb3d5649686 100644 GIT binary patch delta 764 zcmZ9_S#Qz+003Z(5hGqhjV>B9)af!OQo0tXS1cVJbZi_JC{?$xwv?5&P&%OCfr}dB zF*D;iH+_+4)J>hn<3(SlZ_Z9|7WYI({R(LA)6 zMm-KRK{^3PBE$=gGUeB2d>)M@lw!V>aK_>i>&rka6;fK)hQo@PKy46)S+cC?wb%QT zdXvdyOs69_CLoDes6kcOf?LZuMTet}4#JIb2x+TFF%T};Erp;R(*H8Qt$bavd*PVg z&!^|kZXY}D(LCkP#1|WXo_V}*+_BrK@gw^Qak#~JcT17n*!;uq*f*!++4CoT)8Ee; z{ZxJP+|->@IG`6vj{B3B&91rEeefAoAy*Ba>pOmD#joo#mJIwp0rP{GR~ourm9KMm z9Q}%REpOTN&5#LCy130YI%+iUtp1|jTF`Z}{azK{wq^L`oBpSPHKqQ6(%|-QX!nPo zRYUXtwDgre>*TpVCb<93A5kBjX=)Bk>ply~Pq>?9i|=ec^mpCmJ#%zxm++;^rR4`o do3sbAm2^EVtGIDwYShquo(b=LcWjh<@efc0C|Upj delta 764 zcmZ9{S!>e(003acF}6<8;lLBDqIDsihO%sIb zgW~Zr52oToaG-+di%by|is(cH=bTO$&SM}I1QE|Cr#|}&KEBcB(dOZ8wV)gcA%QFl z;!vuT;GAVC=mUF_po`8Sgrp}p0C#{M-47|CC2tx$jH65mV5w?b2@-| zJ-Cz1pq>bbRRvtJ*t@NombIq^Cj>cQD#uT}h#s_1SN zETx!K&h%$OSlol!R0_3}+)Qu98DA*>iHq9H|v&>F+#C|j??k6ZXaAs{oVEW$iX z8jy)*3{O+fL6^Km&JF>=L! zJG1h6zu_=TEJ_P903Y+C}LJL#aS&_=8kg{y7R{{-nh9T z`n50Ep4;Djt7Y}z(Ba~%r?VsR_OvvfI=u?1U8()qN=R!T*SkAL%48!sF}K|^sl2=Q zsMojm?jkx?f7!V(zv@6@%|P>m9UnK+(vF$Q-S0CS8m+@kAK!P}&7QeuKZhJTAC)d# zT)KWvOTKyXnb=+*pJ<@n&GMqPCx1^}tHc|j)Qz0;$o*S0O=BzTi+#1TN4E?U@7kXo z_*w3Nzb|;I<_G?M{L|OTflbqo`>LB)zq~e;zdA;(`1WM})a9AMF9(s^yVilf9uDgD zw@X@fo)X7LUlYpNJujACGN+qnmz-R9PWD|Lgo(L3#`X4jNll&@`4nw?aisNj3)b1x V-}+(GkI|#ckDY0o?Oaxt{sQkpC1L;o diff --git a/nix/secrets/parrot_token.age b/nix/secrets/parrot_token.age index 566e42b396842017bc3ed5d5830887606fd5bfa2..90529822a0e8fb9746fd6d56b8574dfe7e973cda 100644 GIT binary patch literal 664 zcmZ9_OKZ~r003YQf>6YH@Zc`e$xuhE&2vdSY^IN;k7RArc6sQ*Bu&#cO`7J>G+~|; zbf@7#7zh*fAWYc74U~DAUPOl|)592eaC#Yd(~AQi_kDlhlXWejS*jD-Ub|;q>N$FH z0L2nhao24nv<8e}5E;jNf#Fx;rmO;nIRKD+S1fozu0#z~)K4Kg$A&qvUd>n;qU7=l z-yvdiE!M4IVXvZ#lcuFlqG7=HMX$rFy;Rz>McR;Yr0e^#5FFmHhAm|)aiwawyihBN z6rk49JV%ohTp8qGi*#%YM$4emCaq9W=oT8oF;eJK3Ng#{$#Brj)LZt9$rB!3jyTl^ z9kyJf`YM+ky7j}GKEo6vJ&uV=O=SCJsw%N0NCy#PQ*I`ZS+8IYg;JyJ5GrgUN+Fkx zFWRXCKZYs202|c_;HkfV(@fr;@m;i_6ScD9sdLdN%i}wzKRo@oaLP)&1P@LK v%g_dWoluwazx+0E?81xngW`{s?WxH87mnSV{(9x{!p7CtkHBj;p78$xP(Scs literal 664 zcmZ9_OKa0`003|hA1ruqf)^F62M=0fvvhe03Td0PO_rriANjXIDuhX7i>>Y zgkunVIp+IqxTT^PHb%t=J2HF4SUoLIbcmETa09RB`^|`D$&SUfrO+6NNl**R991nb za!}4giT~)h+OH(DgsA`-8Q8QiK{_HY0TUCc2<4m!vk@S8p4_`(s#9l*F)m1CjXuw1 zhBY}`V0(H_F#ACDhk2O5n_xivBNZ8;h547UCHyk*E8)XKKyv?x*Lh5pEUX&SV zNNOd9Bd``C(>@)6P^^*!8fv{9rWoZeFOJulpk0vM(A>LWF5w|`ENJL*w=5}YR}*kL zL>tqn(k<#0x{3*tC9<1$GwFP`mg+GABt))lw%uG(Z&N@DibEr)>&X@l7^f*lHA@4$ zA`48>EEFLahGS8JvZAKy;#QzG#!4k_kSp^HVyP9ps%kcHSd?{BsX{^_p>GGCYU1lN zUykj5UER0R{6o>n<-?Vg`z!0{hzWnNcP5vf>z%)!SLL_+ug=WfRKU@-spO@TeS^LJ z;JE)VDgHjxAN{%UXv#FUKHc6u_v7&s>c-sKrna=r8Ta7H7Y9Giy|Hf1kIXE>>0h(! tM|P@rw>r7`?;B*?UOaUX__NPSuNJOF%O}on*A_-!UOD}4^UhiP{XcMc^e_Mb diff --git a/nix/secrets/restic_backblaze_env.age b/nix/secrets/restic_backblaze_env.age index 0aca72ca021c2f73a228db64e685371d2428df3e..65b10b9374ba137eb39a14c5536a6d4362eb4f64 100644 GIT binary patch literal 640 zcmZ9|O>5Ht0D$3xA{x*Qb`TFr22PMs)1*n-2oBmNZIgz!Nt322yQKMQ(=l6;n^>jyjCJpzAuf+@T4D zFpyXReZP~?H3Y+80!+K3-Uv@Yi+)2mF>FdhS9i%WinYuB-?D+ zXqo^|E8Yk#&@SWo~SD__S_USDcc{RNNr8i84cE>C+mfc`b?qaoJ{!h6It0 zC8$P{6f$T`47*~vqHtN1qY8W_YRVL5z$lQ0S#?l{OAv2|`G!Zuu;&mcUazHvrY0oq zvdi^{ClR^aJFS@owmddLR^$CX-lxJ;vQ*27l?ZatzA2!VBG+`yBAgT*V{Yc;2o1nl z-H}4xu=y&7hy@6@7wb*A?XtP3Z&JmK;Whc*VvC8};%RN{CG*AzOxbZ~WEYVRt3tK9 zGGJRVN(W>$^dyGl19IrFT@9&0kwpV7X~hXSmNw;K*l1va>LYf+wtT%GmbxB}P$|T3 z6sb&8RSKuEqSD$WCsm{D^{aW3Y1RZ7P_|7uP}Ku7gp*ba8*!OAM6}% zZ4ocOO?pQMyPuCgEl(bcv(nOg?8B2^2WR&ert`);v2%O#i~Ch>?QU4wQ=Uhxw)m(^!eKPj`9Y=!@2vjf7s!Z@2zotpsyxLTd zc~OSo0}r02!q9^kcM=rl&5H*Q;$?@46R)C(GQ2qN`~HD%)v+>`zaFH62=x66{lGz! zERze$_Nf0sXP@D6k)_hgf%hS$a-PbJ-!h`GQen<%b}vlmWHk!)E{mB!;jNjyBkovIp_aU UE-$|RO``Lg=e{A2uY4x|14c>RasU7T diff --git a/nix/secrets/restic_backblaze_pwd.age b/nix/secrets/restic_backblaze_pwd.age index 572f71e2..8b0f98ab 100644 --- a/nix/secrets/restic_backblaze_pwd.age +++ b/nix/secrets/restic_backblaze_pwd.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ 3IZ8Pl8OOFOPVdRPlP3vgiGHEpM5ZReIWYoK7YzN9xw -0iGWjX1bVYLSyDljWV0SaaQP96mDT8p0tQ6NZ0hKxqQ --> ssh-ed25519 5dpZEQ EJ2NiC+az55qO2Klc0XnkyHx4FrwZFkcwXNVhASz+Es -+/95dR3c1qPTUeW4lltMiwtO/Ypa/bno3yyLu4GbEX4 --> ssh-ed25519 RijO+g VEREDiFYxzSJcM36HnO6muEj8TsNkjCOi9WbJL9yC0E -nOfyrrCOlCJI1k3005ifIs+d3+lv9CfvDuH8UFoAJ3c --> ssh-ed25519 5q7r0A r4K/X3z2EUZEr4GTHHvTEsyAd8Pjkx45ghZzaFVe9HI -M/FvN8EMmCnKPJA6xaVe8Tk4PiYaouve+IJy/D6d0Xw ---- X5SP01Ug0LAjr/m7GiSfyvhqFRO/l8Gzogqo6UDlak0 -Z8zfeBٹ>SL#WgOЗVYy ccQMÅ UQ\e.^v\ \ No newline at end of file +-> ssh-ed25519 7owkuQ iEJtE3z0nGG2hCkxoYRUi9I0adksFDHABg2qUfqJTw8 +siubhJoVhnEQgeX9HIGNELezKMC9BXfLm5FmorVSvzc +-> ssh-ed25519 5dpZEQ BaH0AcJwiuL8L29OfOPIhFUKvfX0yYP0VbqUX1b1RW0 +8bwuCBIE8fn8dNDtsk9H2PyyqD+WwSj1zZYUxfKv7P8 +-> ssh-ed25519 gFLKzg xOtk08hOGTcz2Wy+xLoAwGtjDmXsr2y1S8ip0cN54Sg +hSEkbjTABJdf0PVC0Uwx6MONixdGzzNuO7ttRm0GLDo +-> ssh-ed25519 zp0Cfw ucFZS7YOVx2qNl+hOXYxSQwKC8oLW4KM+KKaNFbR/Ac +h6OF7M8dTs6OeKjFVh2hV17YjGezBVGSeIQ7yLfDoJ8 +--- i+nAXKPWhe61AaNj+vSGQ0yXaBsM7ObUE3Xwafg+lr4 +Z8gpBLs<r,59Re\sI{҉OFDSۿ+ O[ \ No newline at end of file diff --git a/nix/secrets/restic_backblaze_repo.age b/nix/secrets/restic_backblaze_repo.age index 9a72db0d..b0b3a360 100644 --- a/nix/secrets/restic_backblaze_repo.age +++ b/nix/secrets/restic_backblaze_repo.age @@ -1,13 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ ZKlQfVDmBnL3eRL+uHAWWuhBmxj4Rr9iNg2o4TdackM -6UcEQIAZMhiO4vHdjgsQUvXs86KspOKIEvL+/VxQz/w --> ssh-ed25519 5dpZEQ AtHxx6Qv73b8Ga0FZ17uDKsa+vI0bxPXsGG2GjdixGI -byg6HzPerJjbNhsVCHcYeOain9JTN+kJksXm5od3Bu0 --> ssh-ed25519 RijO+g nNsNoBt6rM/BohMlQSNAdaBUHrnfaHG2BlV9dPja6F8 -bgJ03WpW1H7KGonOsC9YKWu6/yb8RHkvF/Z708uak3Y --> ssh-ed25519 5q7r0A QNd6GpL74Qgu59D2fZXXGyLUINmq1N5ylpjv1eiZ9R4 -CXwgjrAxETgBlfe9OD+yfIyeWB07TJlQErt/CTQ9FcQ ---- PyUyRJZOptFpR3YcTzFdU0eiSbL7hzPzQmVrxAH/hJY -Ii;1 -8 ϸ*uAKM67r 2BwЛ )7r-EZfA-[q̊` -`v媰C(8 \ No newline at end of file +-> ssh-ed25519 7owkuQ 7xYeY51Eo1FMmanLvwDhbLRLHfFCfu6T37VaAwAMcCA +idjwxWgm3MVon2XUwKhC1ZS9k2sCaEk5/Syisy5A9Kg +-> ssh-ed25519 5dpZEQ Df3kq0CxZoZCfeP5P0kJiv/t18toHjevPUxDpKG1GyQ +aUXrq0vHSXPOx3k1vZR7SyJELNEsKNa3fugMVG5n2Bk +-> ssh-ed25519 gFLKzg eAcqNJUr7RpzPJmKzNSgrvaYEusjbbT5gqJUYgURUE4 +JKJ0zoRbNzh2cGxgynEb6cRJTQ9DELIX12oNcBqJIGU +-> ssh-ed25519 zp0Cfw KIQuFRbsQ51xyNmeiKnJsDQerNl1G+QsGH8XGOkbuXE +tMFsLXcNv8QEwrbEBMwc+fU4FNlsqDZPm+g8XsmRwzc +--- 132mcjb5oUsywuv9jJuH5BdTFuMsJGdV1/IztoyV/r4 +CÓ?۝ ! &Z|WDeXNY/OA) {p?<#(%;+_W!-5$)&T-FD7oX /ka!r9 \ No newline at end of file diff --git a/nix/secrets/restic_four_pwd.age b/nix/secrets/restic_four_pwd.age index eb1cd9e0..12906019 100644 --- a/nix/secrets/restic_four_pwd.age +++ b/nix/secrets/restic_four_pwd.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ D+2JgOUTD/jUlvA+STsuWUbs1k/88WqtaH2XcuEHQxs -UEYk1dbJ7Mr2WO/qq2yoQu7TL2nniH5miIznwvj2ffc --> ssh-ed25519 5dpZEQ e9wNl24ruPkGl/MJxUfmorkN1/aS2H6AfjI0g1yOoRw -i7+A3qxr1J/lFP7xQJod7Mw/wTULat6sN7uYcLWjWvQ --> ssh-ed25519 RijO+g JCOb13fHKxtdSx492K+JZMGFliVZLhTyAZqY26g6Ij0 -jw/bhfOqp3OwtoRVT5jdqu1dcDPN/3iCTR7CpIBtqHU --> ssh-ed25519 5q7r0A DIBLUu+NPxlZi20jpFMoa/CvRpUGWKUatvZ798mxTFI -rNUvprC5DASYxcZdib5ie9M4eQax+sZoWbThNCQXkWg ---- gQeryuxiMl59tPk7wiqHlakpk4IYFJ1gTjQy+P0ufgU -1ݳŮh@׾)l/ ^2\6@#Z_O -Ov% \ No newline at end of file +-> ssh-ed25519 7owkuQ JmcIImKWc73PYFj3mtckN6YE/ZGqmWw3/pfGJnL2hmk +uLkl4Hma4mFHMeGldD1AKZPUz9OaAMaEF1icFtzzLpU +-> ssh-ed25519 5dpZEQ 8cUoY+KBb08rv85d/PaGAA3RcT/PijGWoLWj53JJESM +/jS5n0CZ2KKp9d97Ety9nmWuBp2155tfA0fw9FH4s6k +-> ssh-ed25519 gFLKzg SoABIosMZTVfJDc/UX/BrTwOR2auXEfMdR+GlVpbWHE +7OxRs7recbO/SS3MMa9ZQM5TK0NoI7piQ6ErxZPRWqc +-> ssh-ed25519 zp0Cfw xLL6WiM0KeYWV5eCkQ5dAQxty0O2Jv+37/8ovgb3DFA +Es02nivP5uRm1/UiVBPZjHegmPcYTKnmWL/2dbIV81g +--- q/0wLvbKVsCKDI7FlP2u6LA11SzX6ViDCDQFxbcXpaA ++UFWs/5_`oE7&>M|Xdzc'iGqr. \ No newline at end of file diff --git a/nix/secrets/restic_sgbk_pwd.age b/nix/secrets/restic_sgbk_pwd.age index 3fd941e6..53a77e85 100644 --- a/nix/secrets/restic_sgbk_pwd.age +++ b/nix/secrets/restic_sgbk_pwd.age @@ -1,11 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ 5lpERo6g65LULUbzT57B5PIScT41nCmIrWYidsGHkQ8 -TqHEUev6Z3btn5XNCLOU4cfqLZIdgr3l+RVj0B/Cihs --> ssh-ed25519 5dpZEQ cCZQifqsmbiJWa1SdhZsUlVa9qqipoIJC6ar9L56kSM -niJ9kf0QAGHliz5fU+cCeHYeLFoxEmLwCqgTXIncqww --> ssh-ed25519 RijO+g XjQvEy7UXkgfthRwIXoyeIOsb8e4aZZLRoQManwVtCE -p7RPPb9AxTPSbMJ88kODh2/5elv6Gx1/m2hU0z+jJHE --> ssh-ed25519 5q7r0A bwdUX9WuLELK+PLfXcoXkjejLFyBHMadmHxcmi5uBwg -7k2dqilitAPLDTikdD0+4GXWKshlC1z7Kdc14RPmp7U ---- pWCkAVZywKKAaxJ32d9NEShnbvK3kPv3QpLnoXEqClo -ty vFXjqѓ ʟ˗~T49l`P9U \ No newline at end of file +-> ssh-ed25519 7owkuQ EfQT1yelq5hGWJZPfTnPe37XkHK3QWQGbgikAWgHfzA +EL5PU9cOtM5k/qqlSX3qvRiXePQaK1LPMWpdLJjRrtE +-> ssh-ed25519 5dpZEQ vp12U8UgGlg5tPaGTOX7iV/b8RlDm+xghtKPRLL7O0U +CtwTletRUklN5uFmP8Tbj2jh6n2MqMRRn7fAzLbwQxk +-> ssh-ed25519 gFLKzg ovHOZXxgPZbNjlNLE/AbMKZ83p/sUuTbNUm1tnmelTk +bBVUeW2TvLT9/qu9h+TiPIgh/YOFMGDmY7QVFgwAeXg +-> ssh-ed25519 zp0Cfw ZWtsg42NwwuoAblnNBAwFdfSxnh8+RQGs9LdlphY5k4 +87WANVnbHAobOx8fMKyoufxwJZwbNvVkjLqt6mFpYPU +--- 0z1pPXT+1ToLe4BfKCTGMycPKVJRZ13DMpHJb7gM0O8 +Uj*s'MP#httw rcJpg +'81"J*H \ No newline at end of file diff --git a/nix/secrets/secrets.nix b/nix/secrets/secrets.nix index 1f02bfa5..57c72bfb 100644 --- a/nix/secrets/secrets.nix +++ b/nix/secrets/secrets.nix @@ -5,8 +5,8 @@ let ]; tungsten = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEl6jmLz1dA39faUCJKWxORd/yU1vJ5WItbneXHpYUHq leana@tungsten" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF4J27Og7tNLTC3+YnOny8v2tI+Ga63TqmHsj7iXozZP root@tungsten" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKTWVdXIZZuxw1FbBBaskExFmYfUWR1MboP/GnC1eCo leana@tungsten" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBkeH6KvULmx4XxgdbUoL8ZC0rAGTAOlYRWQRP0pKrzx root@tungsten" ]; all = diff --git a/nix/secrets/sgbk_pwd.age b/nix/secrets/sgbk_pwd.age index dacd0ece..009e93ab 100644 --- a/nix/secrets/sgbk_pwd.age +++ b/nix/secrets/sgbk_pwd.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ nSWkK8XN7AOyA3cfphrwOxO9QemoxBMqAM3UB3Fc5Es -TR/6DlWvpiSCOXxj6UM1mk3j5oW2y2hypMVE8qwDhUw --> ssh-ed25519 5dpZEQ vzMk3zQSMwHPyw+aGtm7n917AeqPj206rUm5aTN3Hiw -Wwowx2ofjUkV5cr3nnY/Vi6bN0fu7gNZYiZZbt04LBM --> ssh-ed25519 RijO+g z2aW6tg6SR3qJXGOaH6Qh6Yhbjgpdkd4wdMj9IC/BSI -ne4ijY0NZSOyKIZAnwzGqzCdz0WJQ9NZzZ8dXzCxnb4 --> ssh-ed25519 5q7r0A xNek3qM9DNUX0J8jbhwNAzHeATrVJqR7V7uwyM2dIRg -8dvpFDO86Acqi4YDijY65/VA5rFnqkRuUdqzboNpzxM ---- sx9ZBhU0NGqKjrXThkFml5IwZo1mLqPsFbKXTM0aKHI - kC+ 9~ -ʖ42sBP6#4*9>HJ^]* \ No newline at end of file +-> ssh-ed25519 7owkuQ MVzZvxcL29ripa3xJN1i+99KfR1Y+eME5Ec0XssG0mU +HYaaqHne8D46RPz46Y4BP7clSea/i0cwRNqEDM5nf38 +-> ssh-ed25519 5dpZEQ WEQ9Eln/C/n1FX7dzwzLEU9STcTxfFJ4SjQbJevH5i4 +tOJ0vc9yEJfmrSrI/wKryzLWQmeyTJcs7N4vwHg58DY +-> ssh-ed25519 gFLKzg FFemREWoTrmz4q2ikdv6ncsqGdQE6Xgm8J4JyzxtK0c +aJsOa2Fhoo8JEuP2oOQ5MOKIigDDXzpFK6WpDhz/yLw +-> ssh-ed25519 zp0Cfw 8/FOJ3lzjbUxM+wWjvuJoaPy7bTbX+jh2CnW2VxG2Uw ++DbH6UQzQ87cwnQPpYZ+jg5tIAF1e6Sdo+zERbJPb9U +--- UylIHe7jjfuTbrTFl7gA3NTryboK4MDEbeMjIy03UmQ +\B'G|`{כ> SC,4I7w6G\-gF: \ No newline at end of file diff --git a/nix/secrets/sshconfig.age b/nix/secrets/sshconfig.age index 384631d02982dd79a307cd494cb1ece65376fffb..5df966b9e782a764a12a5b5fcc1db4d527a801c8 100644 GIT binary patch delta 885 zcmbQjK81aPPQ68%UwLYYUr}yarAb9lcyg$3K#qTbr*A-UNo9^@SWbbdt7nK$sjEq4 zIhS8SW|^;BX-1KSx0hi^xP^JHU%Ej>K}ndUxtX)Rai~dNd6{>pr?-(|AeXM4LUD11 zZfc5=si~o*f@w-Ylxv_uzJ;$#W@f%ec9KVBagtw=VSPcCtDiw(k*is;Uyhf5Qii^n zM|NtVrBQY{m!-B(q^psKsgI{?m4CXntBa+ncS)gswwt$hM5MNUWU_%-N}*#=zJGxu zx^?MpKHgR73Q?Ahu2uRb1^Px=X+e>GCdnb%x#ilqUf~&`0U@P^0a0%CC3%&``o*d4 z*<5}R0cj}_rA|@a0cJ@Ro@MU2UJ<5IhWQpbVV)u3<|QVHmR0_x-cCWGzUbCf6&N_D zl`G`Ac?4vngyaW1xf$eyRQeYrXBiq67>8#1xOx|b7Zv6O2SlbBSEabRyKgpWn~3f?5R&rKJ?MaX!gmLb5dA8XVqKI<-ZwsM$F$=65Y!r z;kSkVR(s4*2G?1ol_q!oZ@uhw&UQst;@`o(H@AV?(fb7dNl+RBM4esf8pQICY(bKSAG;{&;*St*u_vbe~t3N9m;dpQL zB$J;vE2f=$_~h|{|Jab^hBB9Jw@`d)DR+4v+d)JM8?Stt3=+(eO{f|gjG3VU|teShMl)(h8dKeqKRglBHppK|xA} zFPDF5Wmc+bU~#cUP?V=dWmsBaaG*(1RzZ@7XGM0YYh-Dpc1fj|yN7R7AeXM4LUD11 zZfc5=si~o*f@w-Ylxv`Zvw2WxSW%gWvsYD!iD7s_R()t?k+VT^x^tP4t3_$LX_%!) zVR))npmsicseG!270(fRQOtYmL^5`gp;aC7KtP`BX&a zXXkron-}T3NPW{WC~pRc%Z z;)G|bZ82t9qcZo@=GARxo1#~5H=MP- zeerBbAFl4U`CXrrwzOSs*s#AuqVN;T`xBGTyegQwX-&O}7t^a^-j7}G$(^nxCYfOy z&72;WgqiaGZfh3|%%1#iuZtKfv6kXGPC#B=8w!Kh$6ZZa2?7}sR zdsCageBr+~=g0atbJnh3adC@(h1bbQYyS&>%9Vrnu%)?Qxp>s1Qt4Z1{q#-8-}+9~ z-m6(LXa&u-3`IYkdb5T@O@kbc;^9 literal 585 zcmZY4JB!l*0KjnsIW)5$AmDVwTwYC^fCy>Rv}u~=acSBVm%NjvNt))>#^GE=oCHA~ zZV(PP2SJ1zJO@E=aB^{QI5)?e;-}GJBP3+BXU4&_JkZydW!T|UInCAiP zIygyUG}uY&s8m2bRyr=XrI9dM;4Q=8#)h}BX0qfddakv1Wjdb>Ik~WEACR-oXk51r zCyK*(t z3|hMiRq;k`l+kQR1ZctloE)bEFP#~fVxkc52oc3|#nz@OBGG9|_dHieEOn6eqU)L( zE+xnZbAO0s<-l*8w(kW7WYoI27TY~WtsEJz!^t=ky*eVgjR;^E%Y@}NoHod)EAVA0 zExYM1-i8ZjjjxuQ+_c#qP1c(H|6A7CpbXfGO=zXEK4erwWwEloplBF02?wTPXj8;C zC_22ZfCk}UmP6d$)l<2AGX;ts|RyLzSy#)#^Z<^Cc@N`0@CB|x!f##CU zQVYvTDrJlLk_YeSrAh2gu zt0tGoxts;@m_WOZuenSTITMRFeX^6njb6iZN}bpP))%*Q_430DhtKD}`UfW$AN`qY z9G>{`0etcM{m#+!=H7<-_no*lSGj%Bw>B5fVFypuwawk-;gxT%v8}gzAFrORX7|rT zOq_vYuVjonw>Wc}2QZAZ5M1FqKI ArvLx| literal 629 zcmZ9_yNlCs003YrE(YWrL^m&odP}KIA9Y#|C z4k8FQICt{}E((W(!a3b`i?<6mij&@;`+fhw=eUEyVA@}#v!w^8H{il8MkSy1D(qo6A4(oJWM&=Gz7yRXA&dvCPStnUBSXuA|?dpF^I1WC~V17 zu2S0JN$4d40mYH0G#V}!a+vG{mP4l_cI3sUHyq4tMnTg`o7k?})_k~7s$5{S>zM|c zExPJwG96V2V&UpTwO9m+fi&6ejz@JRLJB)w+o60`asZe}v>bFNf*(#|MQHWXXc^W{ zZ>qN==Ur5;$&D=FL5CU7TG%p*q)|yW^_Z#-EKsop8z?4O5$!n>BY?vPJzI4kp65&< zza4t994V=XC8E-{lu*+uOHj7TYDAsh@Hx4_YA6?N33S=_7d)dCN$l^~)RItlxVN&c7@_&Q4~+(XXc)xwV7mE8^O}hqul?g0J?@8Qi5qPfzJHZ^74h y)9de7t&N*9zpK9%+2h=oyPGFM{O9oF=Ka+^_aS$5N6W44|AZHj_WJI<&;J36J=*mE diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age index 5d66dc69..b48c6185 100644 --- a/nix/secrets/wpa_password.age +++ b/nix/secrets/wpa_password.age @@ -1,13 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 7owkuQ SxYcsQ9ofIJPI+NegpUPRP9Fp/FsumYJvdH4AupD3QE -Lr9LzcVVizgAQFLjk4GubIdGlfkPSz4VVL4Xc8MlLyE --> ssh-ed25519 5dpZEQ UdmEfeNZynlQqCKEJH+ah5ktFZnXt32TNavYQHKz4U0 -CmFW11cmtwor8P0IE1f8H99IZIzTH/7ZCvk9CxBbbK8 --> ssh-ed25519 RijO+g mGlskggvFD32VhTv/fEbQp3FLe+8lyMckLDQqqKi0n0 -I24m1rWyKDIZCO7UFbQbYIxUg+avtBCL2VMJ7js7EQY --> ssh-ed25519 5q7r0A +HPW7Po4ETQsmiU68IdD/jHjr+//5ZpxhC+C9TNA2yY -WiUjQmD/dBNfkBquyHUzgO1gEKrnbB3/Wc01VWRmZU0 ---- bglYiFBEogi481lhCyec0UlQqLCNJ+/76emlT9Kh22w - -Q;r&:<=7 ssh-ed25519 7owkuQ BzumCTV2qAMv8WuCZOEsV/LoDHkai/3qUlgAcCyo8DY +KP1mwaAEDkAZmsR0bsrHZEqm1VodUWw+RvGSsYNF4lc +-> ssh-ed25519 5dpZEQ Nl0g/lcPFg+yr2glYmi+LAP2usLHNtCz+kJkUB8f8Sg +BM19SfXeagbsVZtyfCWKisMp/wV0XvihjAimbrhkkaU +-> ssh-ed25519 gFLKzg 6Dhz8r2OWsFv3PHCXCInu6+FiJCo4epC1bEZX3HpRV0 +0NhLjYJuJ+iG41HdriSUI+lTGk4jpi+VyojjVQtoPk8 +-> ssh-ed25519 zp0Cfw pZKYOx2n6K6MnSZ5jNAWff8tssUejUAsGW3JMXD64kg +eZgZaXqkFCIqUnBgWCj+aHiUSykKg+XrzUXXq+fGWvE +--- 7l6Pr9G+Ke+ic5l1T3nmNufFaL1opY9BAMf73B4DEYw +!͋܁\qb2>luϣ*Ǟ3P$֎$xlVV[/-2жDJ(yԸaPF E6{陙\:5 L1r \ No newline at end of file