From de67622f45fd7e16ad5e2c1c7f6e15f77b61f88f Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Tue, 19 Nov 2024 22:06:38 +0000 Subject: [PATCH] rekey and other stuff --- flake.nix | 6 +- modules/services/adguard.nix | 2 +- pkgs/ente-frontend/default.nix | 6 +- secrets/adminarea.age | 13 ++- secrets/coturn-secret.age | Bin 607 -> 607 bytes secrets/duckdns.age | 23 ++--- secrets/fileshelter-conf.age | Bin 2879 -> 2879 bytes secrets/github-runner-pw.age | Bin 616 -> 616 bytes secrets/github-runner-token.age | 21 +++-- secrets/grafana-contact-points.age | Bin 914 -> 914 bytes secrets/kavita.age | Bin 631 -> 631 bytes secrets/matrix-registration.age | Bin 699 -> 699 bytes secrets/nextcloud-admin.age | Bin 595 -> 595 bytes secrets/nextcloud-cert.age | Bin 1840 -> 1840 bytes secrets/nextcloud-key.age | Bin 2246 -> 2246 bytes secrets/paperless.age | 20 ++--- secrets/plausible-admin.age | Bin 384 -> 384 bytes secrets/plausible-keybase.age | 14 +-- secrets/radicale.age | Bin 500 -> 500 bytes secrets/restic-gdrive.age | Bin 1030 -> 1030 bytes secrets/restic-pw.age | Bin 591 -> 591 bytes secrets/restic-s3.age | Bin 640 -> 640 bytes secrets/secrets.nix | 2 +- secrets/stash-auth.age | 22 ++--- secrets/step-ca-key.age | Bin 856 -> 856 bytes secrets/step-ca-pw.age | Bin 575 -> 575 bytes secrets/webhook.age | Bin 675 -> 675 bytes secrets/wireguard-client.age | Bin 367 -> 367 bytes secrets/wireguard-private.age | 20 ++--- .../configuration.nix | 82 ++++++++++-------- systems/amd-server/configuration.nix | 38 +++++--- systems/amd-server/hardware-configuration.nix | 11 --- 32 files changed, 148 insertions(+), 132 deletions(-) rename systems/{server-vm => amd-server-vm}/configuration.nix (64%) diff --git a/flake.nix b/flake.nix index e544e47..fcef56b 100644 --- a/flake.nix +++ b/flake.nix @@ -191,9 +191,9 @@ # build vm -> nixos-rebuild build-vm --flake .#vm "vm" = mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; }; - + # nixos-rebuild switch --flake .#server-vm --target-host root@192.168.0.21 "server-vm" = - mkHost { modules = [ ./users/anon ./systems/server-vm/configuration.nix ]; }; + mkHost { modules = [ ./users/anon ./systems/amd-server-vm/configuration.nix ]; }; }; packages.x86_64-linux = { @@ -205,7 +205,7 @@ pkgsVersion = nixpkgs-unstable; } // {inherit inputs outputs; }; lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib; - modules = defaultModules ++ [ home-manager-unstable.nixosModules.home-manager ./users/anon ./systems/server-vm/configuration.nix { + modules = defaultModules ++ [ home-manager-unstable.nixosModules.home-manager ./users/anon ./systems/amd-server-vm/configuration.nix { # 100G disk; virtualisation.diskSize = 100 * 1024; } diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix index 4f8865e..ff352e3 100644 --- a/modules/services/adguard.nix +++ b/modules/services/adguard.nix @@ -54,7 +54,7 @@ in { "$2y$15$iPzjmUJPTwWUOsDp46GOPO/LYor/jDJjndwy2QlPddaKSD4QXvq9W"; }]; dns = { - bind_hosts = [ "127.0.0.1" ip wireguardIp ]; + bind_hosts = [ "127.0.0.1" ip ] ++ lib.lists.optionals config.custom.services.wireguard.enable [ wireguardIp ]; port = 53; protection_enabled = true; filtering_enabled = true; diff --git a/pkgs/ente-frontend/default.nix b/pkgs/ente-frontend/default.nix index 9f673b9..33e8f7a 100644 --- a/pkgs/ente-frontend/default.nix +++ b/pkgs/ente-frontend/default.nix @@ -7,13 +7,13 @@ buildNpmPackage rec { src = "${(fetchGit { url = "git@github.com:oberprofis/ente.git"; ref = "master"; - rev = "1b6219ee1d9c7be207cc8a2e8282704fb577356c"; + rev = "42ccf9f7427d8007fce65526e9b9d0443115e476"; })}/website/tracker-site"; npmDepsHash = "sha256-fYTRhIU+8pdIm3wC5wJRcDUhgN3d+mmvfmVzuu0pjLQ="; # The prepack script runs the build script, which we'd rather do in the build phase. - npmPackFlags = [ "--ignore-scripts" ]; - npmFlags = [ "--legacy-peer-deps" ]; + #npmPackFlags = [ "--ignore-scripts" ]; + #npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' mkdir -p $out diff --git a/secrets/adminarea.age b/secrets/adminarea.age index 2c9c8d5..58bdf3f 100644 --- a/secrets/adminarea.age +++ b/secrets/adminarea.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 bqM3xA Y42xefWKGT6S7hVhvXEVOygSFfJj2N+Hgq5C4w+YGgQ -DNOblrNet6mE+cYe6bCehdJB++t/yXn6i6PU9oMg8Y8 --> ssh-ed25519 DCzi1A jkOZ2PwpkqFpQwtEwIPU1N5jeUySAMVNc56a06CM+w0 -LApR3u9D3+v5F6NHLVr8MSAM8aYSYMwOBlY8UXnyYfw ---- o3Gzah0R4s3bKF77NH2HbuePX6odQ4Tt1xXh4FM5lh8 -{乑D0/s&iCMȮ~X -Zh+g1YЏ6 kiPm ᅦJV(]9;+%QDϦ*37 \ No newline at end of file +-> ssh-ed25519 bqM3xA myivNex19fF3ZRHmnoxewa4kW5YvX7hxvSlhJm6SsRw +kknnuW/w+ku4ZuqPkW6d+XLdaMS83AH1d9555DD3wbY +-> ssh-ed25519 DCzi1A df+C5KNtrYLTOIBsCKNuzF9ePjh4mm2YtYPzoxZNQ18 +S54lzYFdLgEP0LaOUa7U5RvyVKeUs3Hw/oNVUZwRVb4 +--- KPaLIgkd4T3K9OYTiqDJsiQ5hTefahEFv7h+ndxCMC8 +nc$ *hZL?2qo#sfk;jkC?iE, $6D$[sAqi; A{b\rTT9lp \ No newline at end of file diff --git a/secrets/coturn-secret.age b/secrets/coturn-secret.age index 654051464f6ecdf9f93de199bb1a0f55e6708b66..3f2ffba1d1f7afc3b284f8ef942e3e0ef8635e37 100644 GIT binary patch delta 542 zcmcc5a-U^_YJEy}n7*l_LWE(Zzi*XESZHQ)c}iJnS&DI?Wod+ezFTRShnI<2TChb_ zl~+=}XIex#m!)%2u3=HAMX`%>d9Y(?RJmcQk%vK;VMVTMexRvoQe=9Hv88^dQI>Nu zm#&>cadC!jYKoDmsiCDpMOsmKa-f2-uSKY3afDZ8j<2JCWn@69xpsPizhzZqNr|Pl zqq|R8WSF~4T6v&lm4_!+Rj^@ZTDo6;RgghsRHUVmp}V`grF(Hzo_lG9OJrJ7zEhN& ztE;&|xP|M)kK*A4-iAKGl^I2$9;U`A`AKd*9+9TOk%2xQE=k2kB}Jx|-Y!lNhS?FO z&Y@i1#!ePxr4?Bv?uHd^X%%Dw`t@ghr#rg; zt(QHzY8S)NnosNgFYQ?nV8)lWLCE-MArI4>Et17-+j5Uq3Z89cI}>@a&_eaox#uOj jD<7XeGDl#+x{?p}?$fufIWKU`<7w$s&0Bptt=wb)H)zAX delta 542 zcmcc5a-U^_YJG93foo;Cg0W$RlaskynUPbLyLLoUNrta?n7?<9yJtpeN=|ZGKzfk7 zPh?b3u1jzzmrIaEa8a&Fa%x7Zb4IzRPhzEcXt|%Kage`dx_73fv75hNibtxMUqOy9 zm#&>cadC!jYKoDmsiCDpMOsmKa-f1mMyPL+o1u?qs;`MlN4|1xUO{fTZt0Wb8O7^U z3nTs03ew#T{31%6A~Q@ZGdxQ|3f;UivMsWzd=g7copYQEvqDmHt6aH~JxyK0+%m&W z&7CTID++>LGhL#*0`n@u3-gjZJxjb?0$j4P3N4eRkhQh(#o@L_Zu!+7Yjo9G z8x+|N@mr6^_+V=m3Z~J1R?e?5IxtL4% ik^T9fXFjWbcrUck)L*gMP`=3AKx%Tqm*%#aDoOw+M8jkN diff --git a/secrets/duckdns.age b/secrets/duckdns.age index a562980..ea78094 100644 --- a/secrets/duckdns.age +++ b/secrets/duckdns.age @@ -1,12 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw cZ2LcxtHVTS0C6UtosikfFdj383T+CqORj2OzvWkYCI -2mEybfmdlP0+MD2F4If/vZ1CEOC62I9wz2PGPIvsk6E --> ssh-ed25519 xfrWcQ AigoFpYG/JShNhp/00vRkJAjAfww9yDDDAfi66TrtgI -0fiThEgz8SibuSkgr06wwuKATYaIsLgaSVlTKyOft6I --> ssh-ed25519 IV3DkQ bhsNlU2erEJP/aJsycYslfJUJSHibYPLH7vXKpuobFU -sLPF6S/FHIQm80dxHSUkY8+/6mhsY4Npii8cXgCyVfU --> ssh-ed25519 DCzi1A XN9ZzLYfLJ5g2604Q3zh+GU9WEYWnWFTEj/NKhGx/no -Qo18RZB/urMS1sI/HaBexiwvIoouGJNHgDoISMWfp5U ---- ypjgJk/XWMXN49ydjElxn3DRVYXHOdTtjJsFMoVz/L8 - -o|;}ih۸,DgP_Nt3#>=KI<rwdê'n \Y+ \ No newline at end of file +-> ssh-ed25519 dkV/5A NszBp6tthzJKoeujJ0k1AbIWvK0Vii3yK3iHCZC8yFk +3Uxxeb8RijQb63WOVcYXL53C5cl3vTGG/s2t8pJavL4 +-> ssh-ed25519 xfrWcQ I8RgQBkcI+eGYLuJRiadQSMm7VlL7PIvCLv9P3nQ5WE +tmfz9k8r2V9urFjIU+JDtHpCxQlAioTY90EqjXCVKvk +-> ssh-ed25519 IV3DkQ eOiXgjJi7XrNULS+4rTY61Nw8YqUUDmW+r29q5vQFAc +V2C6EHeXDseNKd4Vus0mcI808FySxQQ1DJUdpLwFqaQ +-> ssh-ed25519 DCzi1A E/zVOLiv2O66rwbK++3YDGr/h+FZmk5f5WTo9W/3VQE +VW7yJONqcOqcHE9CK9iRNPFDBFpf0+/oISyIYmuoiJs +--- pcApz4sq0MZALDTE7lvbXHUyBP2CctsVZX7bsR5Lry0 + iE)fy"|z +RSAKN<}-,87O\rW%eyٯ<a + C \ No newline at end of file diff --git a/secrets/fileshelter-conf.age b/secrets/fileshelter-conf.age index e0379ff17a94a21481f787bea14bb0d4dc57ad25..4f2abc0d17070b5d745aae8a0d6dcd5b7efd128d 100644 GIT binary patch delta 2831 zcmdllwqI<5YJEy}n7*l_LUO4|P>!p4abccEfJKg_n{%N@hF5xUXoRsrL9t1gL2_w! zM4(x4qGd=iS5Q`vcbI8TQF>}(K|rBLN<^Z2vWrE5Szel3exzk+V4-tZM37mQS$IG) zm#&>cadC!jYKoDmsiCDpMOsmKa-c$xtA2Szp`UkhhL3-kk$9&R0=WXCiV6b?a&z+w z!%8x8(i6)aJrlk14Lq|`(~Ao;z1>QUN}O|&N+XK2%ei!Qbrm8qg1wS`%sumsjV!}b zbMp(l4Lpj%y;B2>gG0>2je;yw%Ib|gT+GaqLmjy;ZT;N6$Y4Xtfw{l8U0Jh)abx=8 zPkS%>E>c$O^IOAs@TX##5IKBt-V)Se^m zdx~H0S~o+$R$TJaX^Dy>x|>zB9p_!Nn6`NF#REe7pG;ABXMbrn`(z1ao9Zi~YiId> z6kvHYTmRu(McWK-zV$O7Udg|xzI2|Mxv)NSU-{!rPs;eUS(HKWo@s z`eBjW$#i6&wOPB_Lt?S;yUWEbgQTQ0e;{+jwpp)U2-fiq65nwwwUxSiqi;nJt$ zanHrMGFP72^WW#fw|diT^QhK-m)A=wuTIeAPMFfPdrQOaxBPMjwH?<*+u4s5`HGRL`5$wBgF#6(*62^ErL3ZUG%eg-Ot#q7o&|>f8do|ZotXE#EuS!3eWVK^W z=-Jiw$76+;@19^g=eSrQ!`7J9F?8P&$ZpW$Q1T31a zeWX6RwJ(vQatFWVzbX3eX_2bxl0k|eKPgnQ1g9Q|n_6c(CpzZMhY;J8rYpUlmtQ$t zy1u{c3gG$3?`PC1*@|zTN2k|yLYmC zP<+pk2|Kl21NxP(3E%SOHaV{&xkJV5)J2)-aNFzkc8BHo%&yM8{QJkLdz^DkO-!ss zr?iFLs0_5sa*9{pl>0B_j{1^`JDx~5$~0MsZVH+(=dbruu2OmPTd6ZTrF`^EgC~7@ z{(?KhJ#LwM2anfsS%oc2w{2*NoRXV-C?hJD{dqUHyi(|5h1dQT8Z* zW98Ie3wYRq>+1h}lDW4nW3i0jDL2Mcj{~1ir`*q4_Ww2K#LYR^dDS}v7VKk|pRIoQ z`EI`28#5*dFXB-z&OgbizxL~gH^D;26}wU+8?W!z4b)bw|B`-j!NmfH9W&#XubI7Q zmd3PP)#ZMlt(V+2kh-<(Q-5(Izhr!}O~IqHDeD_=gfjp zeB_uVD&aRZb@>H5hV>rvvoCi|GZky<-+X)f(}|8Y*(MgN@YyHC(t4|Ud1I36w6=}P{K3}+d7m7XTeo=2>9?%Cm;7*9@)OK+hO(`^}_Y_ zwjv&e!BdR)s=Vmi%jtLj^7>nQ%B4)M+}aiBAU1Z~C zy~#bt)cHB`R=h5$UN_s|+pm|Q*?MNBj4xQU>m81J);&4*g0X1tNAAt`Kc;Kl@VL!V zF#owC&#mx4rP`8j`Q}pX1|==*^VC+VwuQ1Dd->(w>N@tOyRj4AemElWTwgF>G?#0d z{tTtHA)ZQ2r)(>@6)GGKMJ@fJ{dYp2y}%BQKh3l2I6bRPj+8F9Z=W)4yLP(rpK#6a zB+Dmr&wi+%xoF+T=BZ{O7R4Tal|!r9K3u5DRrkLYowOz4(f+pC8Q(UlSSA`Bz1*Vr z?_`m1dH<)f1F!9`Y`q|K?AD+AI~sMQ!e3vQo}f|w-|Vx__vJ5F9}zmtdi@I1OnJpq zZbBcII3xi02NPXA@~DOcDcA{1G~)YQf92)cdRxzR?KK*5`Wz-e5#Mq=S3+trZSp};KuIQV^N80qgV=+sv34h;xZMjlb_SFBSBD_-{ z9~2i>EH7Yqy4Sp-_Ry8IkcdYyTYFo@SI(-O&s$fybwU2uV?8c)3xZ1=h3ltr3RK*> z-#>wScmM9SIy&*Gf}C#JSJ=LrI(@GBcuoJL0jtTrlk>Z0y*}-~!DL~~>G0VP)0CIa zDhxa@r(81CGW*jac<)>BwHqHkDYN$~Gv)4X_L_0t?`H1I%a>Xw>#s0S`V=-_x)lKN Cl_g>T delta 2831 zcmdllwqI<5YJG93foo;CLV>?wx<^QgMR=}Rfr~*cadC!jYKoDmsiCDpMOsmKa-c$HNNH|KVW?+rfRABnQmB4KR%&s6VVRkqL4`$t ziDh7+TadYjc4T;{pIbRskXx3wx07pnd1-#Sr%A4bd1ZQvVR2}Mwri9}YFI%=npv=i zOIC1Vy79yh65;;(sgcEDAx@QE6{QxTUICHmrMd2gxfLmneo?tq-u{)5?qz}DiJlpG z23-Cbr77h(X%Q8nUPgY|p-y2gmHy5Km4=DgiJ1kKDWQ30!JbJ*6&B^ik(1*Y#p{i; zGM)9c!wg(=JtEChy$Z4eOoP3>QasI^N<93FeS#{As=Sg^Z8^&}VHx+*OX|Iue^<}6ev|UrXFKwvY{kr(D)$#0a{ayS>AQbF zU$XiOBp+>Q%Uv>`t;xMtGSlhc=`(2stT_scI=Oh~&b@OZF39AW>+7|}MIKKgcPI*& zCYqhuWLN&_y09k4l>^h?oG#iRCw=Wy@f_!@clTeiZjAD9xwhoX(gX6ZBaX1Shsa#N zVJH~%%d95gsMfD~zd6$R{_AG^yxsO*;J_sJ!}De^gsh9&q|p_#BwBn`K(joPuXU4^ zUd{X!Yj|7Y;uzyjoUk_Yb3ZkG;vAy_X_ePcqED;~-1mLz*Li^l_OP6AbvN3Rvyoru zI;++7zcmxv#7{+D+3LS#`}{xqYXfhx&d=|(e|up07bZ6SirL{Bo7UII{(4vTsM?yR zRa5x6b7$A2m(MHGH7zwhi5{tm`ceO3$94{rBoWp*;+Zw))K}4=Zy)}1M?FKg=<#0ujC`lFtTH|^vnw-`51Ztjx%4`+%h7n6 z$6i~*XRTpxlI-u7?>*97U~#P>MB3G8wf=;wnYB{;O1sW1KKn*n_EKzhsL%0i`$Z4p zGFKbsyH1OJ$?X3A@`g7Xuk2V;eTlzh9lLXoPgUJ1k4FnLCUMToJ((t}xFA;Ih3vWd zCrboRzB_Rta`LAeFYlMG{nCB^Z9U`MYYt-n=au`vj{jby(eSTGQ;*;D))WhUSB+(C z&bMEk+JBcPOx@?*AJcgsQf8g+GFD?+HffR0&cMqj6Spr66x=h5BRz5R_d{)``b63K zY*|)+eYL=wOchyUY91!ST&u?ukh5o$8}p6 zTDI?*e9~a+2CnV)Iq_^xH~))%74O}$aq$n0b;8Y)OU_1H@V8zxw&_-vPIBJOq*`=B zUuvH#o9XR88?yI&y7YbW%vWr4YmHwPe|S}Dv$*Trt0#(|c_+N?2?^bHI@b8&!Pl+z zRX? z@h2{qaZ%}y*WP0986LecsDeXEsfB$v?a(Wlqi{C;lc4i9cS~D)wnk$?u}yk^sujRu>}alhtrIP3+eU(<2sf>?{-uqoe# zpYp9&atNRK_;k&_>1!5ShO8~ze=6;B@SC{y+tW^5pLEmN`g)q{mOa(0yS~fYhceH3 zk`bE{cKpxRO|>o4em_i0^t`;Y<=e`sQY6t~V~wQn2Vzfwty zvsSYBr}yPu-7N1Zp%?o6n9e?FkDM1P-{L6kQVT|M}k+ z;Xegtzl7aN_pGULS?+aTZoT8wwLisf@3xzGmba|1ymnG;?u9O{sc*jD+08vUP)s$B zZ}Yj+$GW(~`L(Yx*3YP|TGg^YX4-^@jB{E#&fnfXF=*kBRJ&?bzgzLE-mVs&?D%hT zs-9@rMW?rGdbMZu=4xWXU3&b=~w?uUOnPbQ@-@vo2KvShBW+1Yev#VZBzpbvt3k9}fp{IR^FUNu7_FIBvS zYp?LD8BsCC882$fBXrfy+>5-bGPN$iPCI z$%`C6?mqRq%PM!gxIjfkM^k%#KaJHjLke(uZbHf=q=Rz#ok=BdB)G*_h=99a9y z_mf_7VdZ@5SqF63i%kQYzI+z-VXQwqq4B?#=r>iP|E^B%>#ZIb$*8s+dBGB%yQ?TR zV@LNynJWh-MtqJuu_dLZ+MwNV--^uIlNxhAwOISF{rqfg*TZblU_S0uk6vrORP5h% z+Wz+9)S`<_9|Vm;ZW{gnsuz>#UwB6sh z>Pt^e;NZ=rDEG;FQA0E4TVdKqW?I${yr#ee^nw*-Zombyvaw_3P#|6I!H`<$>l6%FC&)oBU zw(@palHS#9moHmYR04Q<_tax5d|!U0$*@mt-&h>jbXH@fai_ES zjPOwF6K}elV`iHry?-WA({}FQxh<;~9Eey`P_p2C#nf^!~ diff --git a/secrets/github-runner-pw.age b/secrets/github-runner-pw.age index 1d0f1b1e8076d40c7414be88b1ce10863417a0f2..13076fddad23d680a5f96f9c24bde02060ffc941 100644 GIT binary patch delta 551 zcmaFC@`7c8YJEy}n7*l_LO_7APi2L9Vr96oVX$wmNuEnum3y(jVL+Zwv7@7JvU6ol zNQ#G9RzRjNmrq!_tA$6tXF*C&nUjf=Nr|Ipa#^BhUP+KA zm#&>cadC!jYKoDmsiCDpMOsmKa-c$TxvQyA3c02P1Z--gETjbk*zHa6V_X*_aw>$h*FYV0b6UJ#w s8xw3E-pOA)Y0|@=0b9aXSu!*;dUW4sNn+%wIn1dY&>+Pg*~rle0Cd;Jwg3PC delta 551 zcmaFC@`7c8YJG93foo;Cf@MHZh>?DYMP9ypRC#JaSy^I+zH4D}ZjrM^UZ7EMNR*R) zo=cadC!jYKoDmsiCDpMOsmKa-c$mldHeBrwc)FuyQc%)Qd{i%UX1 z4BXva3f=t+oFdW^D_wH^@{L?0^HYkQTwSY-g9`JxTtv>fPvE+t6Pt5WBj&{h?R$&| zH!Z(;a%K4R+_d%;^;NHJcSzO5UOg@)Wu?YF<7@njANRsTKje#;Ow4{1FOr!uVZ~F~ sfN7?JJfA~-m32dj3qr)q1(KCJLWo>%AN|wI?0K-7U-2eap diff --git a/secrets/github-runner-token.age b/secrets/github-runner-token.age index be69641..678369e 100644 --- a/secrets/github-runner-token.age +++ b/secrets/github-runner-token.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw tsRQwOuzuo1myyOmMvzxYDHA4zlK7EyTGrNpsq0t9go -ki9GV4V/SJPMlL6iMDBgWR5bNPGvrR3CsDnhdvFba/k --> ssh-ed25519 xfrWcQ 6CfTJmuCMghUL1yiJROIWRzgiMhs6VsFXofByAxqflo -iJ+nA4HzCVjNCGWfLAnFMpZU2/hefoWjqDZVt7tjSUI --> ssh-ed25519 IV3DkQ MXXlf/hEZAla6p/RwBTFPCntO3ITxTQMghLvT260Hgo -007T3jGbgoLM4xseJ8CEGqFH9waxm+U0N8BwNVBhLYk --> ssh-ed25519 DCzi1A LMrXbICNNDoowdi0E7Y8/2jKmaQJUhje7fMc8nS9Vxg -sc7G1TDDVEMohVJKm/bKi5E+UysMlzaEFbbUsq6Icvk ---- 4KneAxtY+GSh+aPdcliazRLvh8H9/9pc6CGsbMb6r/o -Ә$`we4q*mҽp1ݷ~\ -qJ ssh-ed25519 dkV/5A rWzRyAbe/agyiwmtBOI/lRHWYxB18Ag3TqDs6WQaBhM +heDqzOOBC+k80bfwZWX7Snq7Yh9BzEf/lpza8bs8f28 +-> ssh-ed25519 xfrWcQ bGntPjfBzp5o09BovuG8odcZ40MLJyEXDmv2PkypehQ +J5FJ7+u4afdnVAC7Y8yoAQOYPe+UnOGU620dtNt787g +-> ssh-ed25519 IV3DkQ Y3HuEQ+pxsx4Zen2ChZDAzABKQQf654GDsv3u2cG6j4 +moeEQxNMsZxd9ILeoAQoMcmE6b6SN6tRF6YRGgoysvQ +-> ssh-ed25519 DCzi1A 723bVp7bkm0RvPusFz1ZONVG4/+fXW35sVLqFZTOxHM +JnsF2C0mfRrNsskJgz7Am5JqABrOc7utXMZ83AfwjF0 +--- 5UIyWetLujNh36YyeeYMGoBFn4F/nJz9HNT1glkp7QA +]}G|nٻT}~ֹ= ߥ &> m!ڕw՗YJ]5ԛڸ3][G+2#F_;Yȭ(dv]Gd§ y \ No newline at end of file diff --git a/secrets/grafana-contact-points.age b/secrets/grafana-contact-points.age index 3c204240308b5d97d7e6d69bff413c5dd1e2af03..3a0af336750ac8d0ecc812313b6a83a0479babd0 100644 GIT binary patch delta 852 zcmbQlK8byTYJEy}n7*l_La4W^Te(kFYK6O{nMG)Bu2EIGYekNmeokSEpRap>M~+Xn zzOPfJw|1xrmw8#PNnVv_p0`P`UxYzPeo#PEv1@3SiGFFBXQDxJwy|-tMTxPifs0=# zm#&>cadC!jYKoDmsiCDpMOsmKa-c$JRav2MOmVscS@0^zlS52MR8V1T2`caiF1L0k9k3XQHGysW?o=HMWCapQ)Hr>d4a1( zMWAnDakAsYkK*C(UhWxTzWU)Fk>O!RiEfU5-g%ZKS%!|8X&xm;*+I#M0s6tgQN|V? z8IfEC7FiVqULINg7U^Y{iJ@N3WnPg+_Mn***7R8g}8O7_< zB20@tqx4fl9E%G5{nIR6BBLUcv{U>Yox+Tb4aO{K7oBE?Rj@u1nF4NVMjf?CNUzrvLr7 z%%3fMfB8F)G4qDHIyWutce{A9I45%U+l7H$jBi?gcL#bFO%9p%fO}iE<-P0QBr9Ye= zy}BJL=XPc8tFoP2yY%f}eOeXv(l5p9iP^)zi?1H3Kg-~nxh?77I^iPkKiPAfv-Yn} z|2A*Sl#qaB-s~HjBEG~wJibs zY5tnKAMX-q=v}|f+hgf{_OymVQOVSEfqP?^Sibl9lzb~%d;C+_r89@Ou+-f9*>_vu z$gSw&_=&scP0f3MZ2QWX`H`)Mw)>WpXEe=T6ZT-z4ztB;^Oh7|+Vn~(j%~HN!|_SY yGtOK3Fg)wcTsT|dM4$lQ&#skM%ieb7dS4C7raDHS~MR=gGcCf#{hq*~+nuklig->R(zIjPid9tCWn?<>EiBDKL zm#&>cadC!jYKoDmsiCDpMOsmKa-c%0N49^MsYg{}fv;CsMtEUSrN3EWXlAa3xl@`+ zShA6sS-6*WNLpo~p@9LHMMbu6xnod@S4gI7W{GoElDk)kr%RZ5kZYoGW}08PPf}iy zvr&|LQF{KwkK*Cl$q{+_ekPF-Vcs4tCBA04Sx)XgCPA4_L78EdS^kbGsR0?DNkIh} z#^qe4X$Hk^sZRP4p-FBL9#uKneukD+1qC^29w}K#J_Y94PX4Y1mOd2$#uk&~8O7_( zyh~EuGMpnKEF#PbjM6eQv-Lg83%q?R%gh2w3(VaMJk0&ef+PKs(@nV2i%fhXT*AuT zGt3ObbG%E;qe{$8O7(ps6N4*#%1iaVDxHhmO)X5^QbM_Ob#)a2U3}d=odcXqi&890 zQnE5DbBjtH&5HF?eRHdfQuN&{EcNS+ol^tcy!<@545x1oI~vlwZ|j}QV$UD@-wM3# za$!;Z#AnC1Pn#pEKgVT-7elc8$FAVG@D*F`JN%Z6vHp1{konw{i_Io;k92QeUM?Z= zZjE4HD{H0n!_}H69lGwYxvZ;w8$aiXTJwaRno2DKIZ3CX=Os)m-Z!!SxqN@pzUo8g++MN%l2iD<#(j3-u45BdZ!uQd{?vSB za${W%t4*yglgaVo`SmRhyOUp9MEcs=ZhbFo=p!jvpAe(}-BHrENTBUrXQTIpy7+aw zmp!*HovBeZ`}{iXJe$|88Cl||ifoN8ux<4eu}fMknx}c?`Ipe&o3fQ=S}6-&GS^yn zZ<3{kZ71*bIgXoqs#fQo6rZ9bCVkTS-{P&4R*SA=u2G(GglTb-+bve#vTFv5FKpOs ycBt-4{POGTj;&NMo|bBCI(_l9MFERkyB-|95OzCx3eS3`-~;*RUfewUF#-TEvR7UJ diff --git a/secrets/kavita.age b/secrets/kavita.age index 664de94ea2d97e49d8d5e8c73150b75ad963c4c0..28c8903d58a8fe0be2d17b45c804e97dc350ef3c 100644 GIT binary patch delta 567 zcmey)@||UZYJEy}n7*l_LPkYYhHFNZp`n{ePP%_pwu@<)Nv3ahj(?hKvP*`Oxqe=* zxqEJ?Q@Cp+mr1&#zGs0;o~yQ_v1z(@c$IsQL3&ntdWflhl7U;0YgA%Mp?7#$Wk|XK zm#&>cadC!jYKoDmsiCDpMOsmKa-f2brICf1kDIxBuCGOMs<%;bl#^eOWksHGMQNsM zR#ljOVvey>rJrf4W4I%ipJ9l3MQXZxPH0qklu1%bRDP(rX<%_`fLDrtm1lu(U}CO! zifeLqUSR&jkK*A`9zg~b`BkM+nR#aZi5a>2&e^#h5tS~b<&IHqg@&owNjYwrN$&n( zM%i30K?bR1j%ALn;eKYmnW@gj`YEP`$=>OKoP+yav;h##pmPVawaovC_xcadC!jYKoDmsiCDpMOsmKa-c$4X`q*WVo+X^zi(BRpQ}@)VRC+2qECr=VyI8K zr(#UW0HW*L^op@B|erA6A>1(E44 zF2!6G>7{0+!M=G_`Jw)SriIR~sYZszu1-Gsr6rZ#<>985Ii7)`+4^}^DS?yY8O7@> zox^fU-7JgrGow5+O?@J?om0#bT}w+V^D`{GOgxH099_zcBYaYWG99^+QgQ>T3f=RJ zG9tsX1DuP?4E#OHeJZt694*45EZsA+T(c{kl9PhMQnR^qb#)bzlg)f8d_pq{(tRsJ z{5;c>^?iff3&TPK9Nmmk&9Y320y66>^#fePz1_;WraS9BI+f$_lXbrT6t3z$E9W-K z-YDPNHhE%ma?q-j74z;+EED~I%(XUr;oZ9`wyD3wsu|t8_qLqRef6DH_3Nt7+!F6U z`)oBxywd)0mSyCd9cjNZ>f=lo>b~r>XbN1B)V*=l+5VM#JZDzDq^3(7ONt diff --git a/secrets/matrix-registration.age b/secrets/matrix-registration.age index 202a3c29a2ca46886734f9891d2459f9595ccd8b..9ab6ac6cb216b7c6a48c656d167160ba5f429c6d 100644 GIT binary patch delta 635 zcmdnZx|?-^YJEy}n7*l_f`3wOh;xCfaY=r*X{KS3XO(w$aI#Z=vA$=jw|P~Rwtk9! zzQ3_$a-^#-m!X$gg`-!XVU|fsR%LEgpoK?qxvQ_Kg;!d6s&;vyeo$U{l(uJcadC!jYKoDmsiCDpMOsmKa-f1yfu~4D7o?hOb#$^?zVM&pm?*8t@+M%9?UT%50enn+z!G&cZM(LB|8O7^e zEW8Ze!gGziLvoCaDg%-u4ZPDLjr=W>oP11-4IK+o@{*i#vWv2EvJJRAGfWJ!OAAbr zoFXmKouZryf{Y8w(vq}2y(%h_11$1N+>G6mE1VpYLW;R`b#)aSy#lh#LbBbxvyB1@ zlOrrL&Hat^eN6)r%Sw%l!hBq_^8M;P-Eu4pJk7JYLOxpYJBP~bR`rxV^tUi#W6jc; zch468b?3aUG4Wj=OT&)N89)A*R|hD0JxjlNQ1!n*LvO>c8$ztf$HG>zFMn=k!qxWp z0N*3`Gus3%vD;)UwOQnC^nYIL?9~?^3HaM>QVwajbKFy^nC+(86YKA7<%dF^>b8vxNY?q~o2 delta 635 zcmdnZx|?-^YJG93foo;Cf_s`}c~+Q(XQFvZL55FKXoj{?xmR##N?u~Qd8li8fupBI zPF8uTL4mOeSAeHUrbSg$c(6~3XOOd_enpk1Pgp>ZUuJn_NpV3{aI$%Jo{4!cadC!jYKoDmsiCDpMOsmKa-f2FNtCf?Xt}9}g|CNSs$WD%a-?rbp|^Ijr>k~e zxpz>ycTiGbQBg>?Q+6m@S{l(sQlds>qHF+q|deHh318 zb+Q?kS`->idfoYu?ap?il$iv->Gi~!>E8TiRqJ%I dBtq%qbI~;_znabmHb?bHH3m-=T(RkY7y$h1^)LVc diff --git a/secrets/nextcloud-admin.age b/secrets/nextcloud-admin.age index ba4564ae0b8633623dd0699cc3623ae11fd1f46c..5d3971dd0d4313845a69034a14a57aa0fe7c7fa3 100644 GIT binary patch delta 530 zcmcc2a+zg0sdi9mX^~%|fnSt?VRk`Su~Sky zm#&>cadC!jYKoDmsiCDpMOsmKa-c%GZ)sX;woh4MmTzK6V4|amyGckzsbjWZVsS>1 zS#frDu5-C%X?{eauX89@o_1icwzsRFe!g)|NMKp9V`y$(sh7F0ds>lSSW&o_Nm)Qz zxvyopk9*|AkK*Ab0miPChHmbb`sqf&dFJ^g1qI<=IXS5wp+0#j-a#&|S)OU>;T8Vg z2CiI=hS?PX`rgLQo(5?tCdP#ozK(ez!6lWUE)^C7lMcZsn8X8O7^M z1NA+Mf|3f06H~Nv480;PgR4T5s`OKQ!h*8>gR{-@%JRI+^YcACvje%xioKEo(?ZRC zOe%AYijqU~opO@BJ&W^m6Eh9m1H)Y_OcQhUvwU6BEz7xdb#)bdLJF(O+=`P6-ExY; zlS~YZDwEwpL!FJv^SnzeN=kCfQUcKSk7rYXr3@iaLl)t6` delta 530 zcmcc2a+zgcadC!jYKoDmsiCDpMOsmKa-f1oa;|?xfMu4Kzi*&Vva@+Xazwg$USe3Vw@Ren^F%n@b>9RgQmDNNRbmV}*NQNr0=niF1{+N0m!(qHk$VP)cq_YN2aJ zK(b>+c~#)VkK*CU9u*~(RfUzwUU}((d6DkrnT6pMCKX=!!4;;SkyZI7MM+Ucm1Rbi z#=cxp242Ayp<&vY+1V+1&d$ZY#rc(f*`-BU`hJGxg(1nFc_HrZNm-sjIq8$*8O7_J ze7qA4OY$Sb)3PdD16|79s!VcSqf84kD=pl8b8~(D%DhVw%U#@k9Rs=CEiH^oz4FTo z(kwH>%RMX-({e0Ji%T3cGYkXD4Bd(YjrH@*l9PhdlN`Bpb#)a2(+kss+(L>xgPn{c z3cbP$ORF-<%!)FLlf7I#$}PhUO5Ed8ijDnpfRy;w}ixSf;>w&*s2Q@i`GE^J6@D@~(@{Uo$&C@pMSv-a|`f W-p};3k4z7;yv}eU^4+5}TX_HywZL%z diff --git a/secrets/nextcloud-cert.age b/secrets/nextcloud-cert.age index 16ba40591d84c1dac347f3192584d88ebc4ce77c..df79310fdca34255bf8cfbed34adf76a08bb325f 100644 GIT binary patch delta 1785 zcmdnMw}EehYJEy}n7*l_LYjGHN^)eStA&qcWMPG6UWImvL2-zuWmdXbL{O5MOM!8y zM|iG9iEoYtmv?Yzu1Q6id19J@Ntvagu|;rLWJE|(pqr_YpHo)4S#Gjfj%9L6j!&)$ zm#&>cadC!jYKoDmsiCDpMOsmKa-c%0OR;ltc2Ia&g>R*Mo?)eaq^onjex;A6qpw$$ znZCBUlT%`Dgnm>?eugiXkE6a*dZ4GaySATySY%{?zOT2ZajKbfra^F|SDs0UqghU# zNvXNMM_}m0kK*A)fd-~N+2N*@7RKRexhZAYi2+6?!TydRdD*$CX5k?wk%1<`p04Rp zj-gzpB_)YLDMjIqg~qwbsjiiUZU&iNDTThSdD@X#&YodaKDkjo6}kGB=Eala8O7_( z1H<)GBFjR9%QK@aeDb}`OFi6OU5iVT%8d#tyegftLbHwiOv{a<0)4rP^UA!k{30wu zyu1QZ-7?+$EAvAOO)N6Z^If6>EG#0*l1oDUy#=GmYwf9n(XTk}F)fzD<1VJwsFT3!`>yHRqvyCq9_G zPW(RSb-8cKkk8{eo zi_r@2^`2!Bc z=iOiVEZVvBWKuxF8sk|Rcf20!bm~UT{KdWFuGuz*q?r>J?9VtL^3bGL_~^R}n~oor zTeCw~yMMx3(WG}e2MRVX*LACTNZ6+e^gz+wE0o`yFOXTUz^Om}&n! z%p%^f?&FmGKh8b=ez^Tv)Jnc@t)<2UP*iHSGL6`gpGIr0AXE!>d?2bpKBh!s2k{mg@+8_jW> zC;FV5Bf0*Dc+X+ysV0&SWB#pA`1+V5X~E@ZF&o?VZseK%YqCmvk&@Den2P%9cC9%5 z%u9J}PQ_hzPg;0aYfkget`zO9;AFRr@YMRAbLl`(`~$J?IX-us&R+JsdHjmrH050> z2jdI(sjrp_^v(Uhzu)yr>U9-=#+W&qx0r7$UvT+P&ovE3r=aBNHad)ZyC;0rj&8S^ z(5mpJBIWXV5l+Rgc|#3Jq8CuNn>E?-+Lj~sk&qBE=G-V~9|O_>*vN9VRN6XHSlarIqMCQKNKPc6cSHqF3W&Y;-<8;QaM;f$@8Fe&gO+WW|LVCj5 z!1~w{t?NDd7fw81@1)amP0b+L`}xxd-DBMQlALy5|8=rAN7t`abmqbj-t#gqUlqI* z;t}e@@=7`BtpfY>)Xlp~JKe4Xu9)A_BB1K#&MW_LUVV|JOYX<{!WC}Y_E_I5UvuVk z0+aiUBxfgY&e;d&+k_T8y=$ei-0IKs2`@E^?w&03;B*Y}O|D7v-kx&yO%$g=-?S^q zg3k@Muk*E;+tMOepTW1X^%-C3-Gkj`YRVUm#caK_N3zXdFSF%j`;TQ7T}GWfWo-RX z(_-fuZ(GvKdU0}n?{%9S2hSKRx5-`*5Om>x>m4S&qc;xeH?Up1cDrKp|A?1Qdb*zc zpQ7mHTpXgeGg{5*ip#l$Gc^d)9S<{qBh; zSmW86p4;U&F+MwT_WQ?0-eGCw+qbwf*&lVCeRJ-Pqo2NdtetqMftj^;Qc~Q-JlO~TpGYk) xefHW^n1A)WO94fGMe9r7*6grbc!l@)Nmjq!JwJS{j+~y&r(d6ZWxuhBH~_IVI>!J2 delta 1785 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 GeFOj_{Pmmw delta 2194 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 ssh-ed25519 su0Eyw SMreMP94QyAiyvhz+WA/s8ZIiSvr7EXTt7jVOEqn3yc -3srDjvhsTRLJpKj+mMw41SgNiP1a8o9MIbtpn/llYWc --> ssh-ed25519 xfrWcQ DBXUORSHA1ncTGxR1DXniHE30FiJtxM5h6Vm4AR0eSQ -F+5QgUnFcBOh3ogJfqyYrORigid9qxVsaxpcOeQH1Hw --> ssh-ed25519 IV3DkQ KPGXb3+MUvsNE22F787u1diONSWdnxSmmBQAgAE3yRs -xQPgMee8nKR1pbYXPDCrPamVz7rxsp6T7VGVqHYRPV0 --> ssh-ed25519 DCzi1A +jUwmDeIX4QCfGtVESMi9BNYBwsH+ntdx7LtXhX5BFE -fpPZFMomCAoyIniCtKbMfiUnlu3Js6vHv9MgVHR3XJw ---- VMOK7LJR3QvQ65+Ei6OxDbqHpOwJmCRb7OBSZM9bKLs ->H\B2DҞa"Cn_W_PHiߩ\%yoUs˿Z9"MX7]reT_$KO( \ No newline at end of file +-> ssh-ed25519 dkV/5A 6v3LNRJ6Lr/Ae0hPiN7OdW+OUFMWC8I4z81g2FFsGWc +sxh+9UUCnsKvttqsW6923mztw+xyvNWhmbfCnfts92g +-> ssh-ed25519 xfrWcQ 9fTveDQemfAdZJz/Gy+y+VWeTPpi0rAKqhgaG4UWhT8 +HcAL+mG/iarpSODGwSUTqE9BLsH2b/J+9W/1ltHoAls +-> ssh-ed25519 IV3DkQ IHC/AKhklAjr7snFg6mX5gTL4WqyKU6ZJlurLAHsHzE +AwTcys0aZQy8eK6son1/rOQr+3UgpGMVvviF+MjlhXo +-> ssh-ed25519 DCzi1A 5sW3obtVcuGeuQaaaD2xWdpVhHoxQlyC8fO6RreE+hY +f/uGVNZHQfD0oi/bmdlIILPrMZqE2cLLDwlAS2Lvjx4 +--- dcmGgM7+4AWkXbwLOyEVpfl2hpvbKoFFIfeHKFJkqcY +78vMp"Xۊ] PN(ɶ2,[֌֫c$\'"|JN=KmCVx&>ij` \ No newline at end of file diff --git a/secrets/plausible-admin.age b/secrets/plausible-admin.age index 891333907f9b3ac54735662865408b1e13e8ae36..11f56e68db0ca4fa413dde57f1c4f78b7a365609 100644 GIT binary patch delta 349 zcmZo*ZeX6EQ}3OrUsYff6jT-z=$Pnj8lGkvm0@Azg?p58em-Du5D406cys($)#(jP+Xj$ zo0?)|YHDby;No1BY3QhsqMwnQm+Bwn;%8BwZfsgrTyKyP85wC|o^Dz08<^=Gl3rC{ zWa(S(?`ssvl^N`moRR9|>f=@zRFD_q9qyKIb(Y?v?Fp;aHUA8t!Zv8J^|JRkzNi zaN$1VUtzmjxN`6OUZy*5gA~L3!lj9MnMuapRoiGA#t x*w1NK)gZBM)u#oF8p~rJi=I6Ay!+$2dZTqRn<^)LvNn%=YG%iHt8{C@BLK-Zf9?PP delta 349 zcmZo*ZeX6EQ(tZz5bBc?oEsGqobQrr4P?2Ji?5rK6pXi#BTA82j<6U4`;ALu1V(Q~okm8bU}|n0>XVk2nx7e(mg(qHP#5&xbo~<1bT$EXqA5dIW>1yT^6dqDqm~D_5>=CY?ogW;^ zrK_u}P~zuRlx~z-7-k;n=N;jdky91sXIK@IX=#w=8J-&+91-Z0nI4sw?cq_*<+wc5 z`)|jL>aZL0UrfE5`R(0)&57cHqGe2S_j|rdW?h+of8Pg*m%1`vPDJgRzie5(-{H7g xhUzzNpEUA2FMkNM^M1NM;-9EOd~+y&%=F$%7T@*S3sUc8PpPg9J??eG9{?;TggpQN diff --git a/secrets/plausible-keybase.age b/secrets/plausible-keybase.age index b93dcc9..7777954 100644 --- a/secrets/plausible-keybase.age +++ b/secrets/plausible-keybase.age @@ -1,8 +1,8 @@ age-encryption.org/v1 --> ssh-ed25519 bqM3xA pYt0CoyfIkCGgoWQrIEqpoVXz/8YgN3mOcl+GJNgu2s -K5HaUKQb/oJ/BIqPEWwfwP89qdlbStI7EDZcy7u3C2s --> ssh-ed25519 DCzi1A X5unppDtHIfPkYyt53pyWt0D+TYKO/8vOSZCmLeS9UA -pmWOrT3kB89a+rxoe37uRR+EPESYKlwlTITqDXB/SuU ---- eKLEbWNmQOwYObYWmp3TsplYv4yEeJms+c8Ny0bclTs -foCPVK]zu# 7J8V֮IE7u0v&_gD/ZQޑ+Z;G<k٩rRbBCL -jXC:S \ No newline at end of file +-> ssh-ed25519 bqM3xA /51wbxBqMFtCXGpoiDTf7tekNOhT1z7BS8O1RQpssw4 +gU08DxPsS1sLfIm3z9sSlC8OAxIrXRsllYHr+p3Nhtg +-> ssh-ed25519 DCzi1A cX1K/YwnW1sKbmCYSDWQQUPEZ8PvHQ7oRk6dQ2WMYCw +W0KvV/7NQ4fLETiTy52uo+dr0DOr3RSt+FiW5ETp4jc +--- J42z35mU+Wql9jKlGEiea9EiqjcV+nWhc/rucZwUNyA +Vui63\ Ru<"@#)l ѫ +U4Ajϙܻp'7`J(죽sYEzEH:$5[)tWDНbUXF \ No newline at end of file diff --git a/secrets/radicale.age b/secrets/radicale.age index 4247e745fd1230ff5abcbececf810393bda56cc3..4ceaf00a622a5226b02990e989ce15808db8966c 100644 GIT binary patch delta 453 zcmeyu{DpafYJEy}n7*l_f_6%BZgNhPv!Q#cesM&RNr`E=w}F9&Z=Q*_yQx8FMox%P zuCaEMMS*cPSCFY?ppi?qseYxCx2KPXi%DUTvqwg-f4GTvxk+Y~MN)d2Q(&2KfOl0S zm#&>cadC!jYKoDmsiCDpMOsmKa-c$KMW|6!Wm0iKk#C8%cVV)zMXqUNYEF7Vg<*wn zQc0$lXR3a9xLJx}p`k06dw5tuu8~PqPG(t^b6H49lB;u-yL+-xXl9y0gpspJVy;U> zrDd8=u9@$|kK*-iIU%{ONyP?HDSqL;$>k-XE+ysKg@)RZSrN{u#vawrP>8<`lX&+dOT6Tjvp2H zbFVX;_xq=Xa)&oEtw_!nPMplKhu~VVGuc3!=R9IwUzJZ%Xwn>gpVv2hp zm#&>cadC!jYKoDmsiCDpMOsmKa-f1qWJX3+WU6OXm2Y;MxwnalpIcH?u1{)4X@+m0 zPflKyNo1*;Td|pYM7k?ia#c`SS#qUmWww)rK}cvtg=@KmzPp!Kinn7*PIysJlz)|W zc7dlwPI>agkK*;EPL8hSCjJ#gE=fieA(2Hv`R>`;h9#w@E?!}VQToBf5gx_Pk>$ZD zmHAv27Gci*VR>1B7TNlqrTIao0p-Qo;r`Cf$))BYr6vZMnFb+Yxyi-e-i}tKZeHbHhQ@*EY1z4!QBh%rPALXlO-UrA-w+SwKlJ4K{`n?L-&N)5 yhZXKv_rq^{u@Qg5g{9BdD_-y`{K!5>qV`A6zkd^7>HR<1W4G9)(7SFm??nJYkE$2| diff --git a/secrets/restic-gdrive.age b/secrets/restic-gdrive.age index 25cad6d362b8f57646f5fe23e94d3c29f59c0b8d..0101253dd3a96c3de930781878ea1256b656aab6 100644 GIT binary patch delta 969 zcmZqUXycfmTAz{~rf=$~kXKQzomu7WmYC_35#X1jUsxQLo9^dn7LZa}S!LvtSYn!+ zWNx0AXi}cdm6a1|5f$ZM>Jn6LoD!LqR#5I2mS5&o`US*jYRhCg|9Fflz<)&R0?ol4Z=94B;8I|k z7h>V&@8~%3qj;;KrEO0&?ABqP7vQqw{&XQRrZ(tyI0a#ya5DE+dCKu6zl z<8-(3i1MV&%qsmdKhu<8!y@xA$Go5bp9&*Ov)~X97hf)2U0sEua6==%aR1_f)cjJf zvJA^ik3{ccN0$)o6t8rT#Jqw;+%FuElI}`*qH}8VbStW%Q10o%;4` zvccpe+3SkkpZ_sUV>>y0{w@jgV3SoVGu+O|ILj@)Ei+R>RpP}SwO(7Z7mW|ow(zIz zthe;O{%uRg>V;;LPQF?6`C6{E^R*ufPdT?uKVzQ}UNc$yt`zq?Bf(3oKa4I`Chkhw zV9yagQDv&0a>6sCnw3fq4Me;$FMTVEin_QU^qtAp?>a^IyElG&9_nlBB7VUC&32a~ z#};;-404%gkdk`tw^nE4x3U)1??((&&WM&3U1OS1fA{0!fS+w&q+WC>GPenQo~mkc z_3Qf|vOQc!xR1)4eBH8S0eAX~l(R?N{{wp5zEzi4~zdhmhCFbWBzW8}Exgs{s$cWFFo+5W64LEinq!NU?PX14?X|EN5~H`&1SZ$zPj($|K7`+rkT-i=)S z!{3M_;nMxnshd96vmSNfUl)I@F?zBqlhhpMU3-4;TzgW_`X%<|{vTrVZ68^M#dxvg zv$^r}?Uj0R_k&8{pU6PpZ+k;JlcmmEJm5U7;(598tNpV*Q&;x%q%y9(T2pdGmMye% z{wDtPlB>5uBmP R>tZlFan2p)*A?zr7XU+!n%V#W delta 969 zcmZqUXycfmT3=jh;96O(P?(x*mR%a@5$WyYm}#78k(*NCWEtv}YEV|;l$)U)7+UTV znI2`7YV1+YRauyl>t^Yf?UR|RpKem+RT^OwY~bY-krLvP=I==UZ5uol;)R zrE8~9T%4hsnqp*XYG|oYkyaF*9H?Mglv1Lf6BLyi?CYcNk&#kX?ryG~u5ajN>6@+} zk?$Ik6&Pmfk!$K2?B>dqYvNPr@1L4m;Ts%cp6%%Bm1dsrWm#65S#B6%Xi^v!P+pl@ z8JrZXZx%Z7qj zTQ*lpfper+si{w9zNK@fc420CR+?Luk5NQggqM?HXtt$(c&=e!xo?$eZt>)JM)7(d zch|J!a7)*u;Jm^dr(*rQBF|)tG7BGz$jYM1(jZgsQWtL%H^kgnwU0nt9D3jEzVw3Vh3%3Fz zzY;e`XAjF1-_oM8;tbPbi)7>M;_Uk55MK+Y46{hCHwCXwseY<;=Q^c)%>4VaU(Evl zI%nEFn)xPN(P!xd59zYS=c3OYJa^#x`BNtxrD}+qdd^q4q)L57oJcJ>r+OS#7O+D{ojd?_Vun@SHQ} z*4Ia6Os*)@O`BWc{YCM82T$J9gV%C1D|4GiZwvCjhN}Dy zS{?VF-)ru(Zf)DrV(ZW6Y*L!PCu;h>;|Z|5)4M{nTVv9B!^+2#OJ}~=l5n_DBS`qQ z;`8)7g7sTxvcKJRYKi#*^G|zJnRFkNJ1^x(6K6hMFR{9LO_JnHh9A#&No}(=YkkrB zG2*S@w)JX3FZL}mRJRNddnRfYoqr{DMxVgb6-Q?+?94r*B3tCn7s7c|%J{~V8CG)M zTYW^g`AY6T`Z3pB;yZg`#Lo4{J=pDQT&p&_U8}H(b6G3DII=N2e)F;r>7*&z4Zia> z``$UfXVuNUX|eUef;VoSbx7*}?IE?nVab_ji8`m9|JSi6^DzZWb86)5-nV~8oaj}) zuZMr}%Lv_knctar@AA3HH`ZOhBCb$6<%Povu1;?@2N~r_amz{;tZCnCP#kzg^XWgG zgs(C_POe9E!!JZ~i`m|pvT5#neocXIkID-zrH^w6P5qjdso^w1QnY9LoiUjP6A diff --git a/secrets/restic-pw.age b/secrets/restic-pw.age index e384f73c1483d55770d45c5757aa8566d4a22047..b59e13226f78e6892ed72358cf4ae13ae4fc3362 100644 GIT binary patch delta 526 zcmX@la-L;^YJEy}n7*l_La4i=iAS1WacWRywx@e(o~f}xuu-6kp=+{hq@|g@pKFDI zad>#5nMsu+SD2r(xn-4iVWC$+NV=tuOJt?7zpqPGo@JK4MY@NlM}e0|ah|!Oe@R*~ zm#&>cadC!jYKoDmsiCDpMOsmKa-f2Hrb}|NYq5o6ps!n4MyX?}mse7OMNo*ppG9d# zScF%myI*ESVQ79>L`FJSX?9MresHjPa~y~RN`3~zQmsQFP<23Lo}v?eY*XX z%df4DPBX}zx70_#{CeSO1*d?MhnIWkh-~lr@%E1I;n2ljj(UstR|=iZd()q4d?>l? RSVC?3w+x4J>+jwl{Q=C-yEXs- delta 526 zcmX@la-L;^YJG93foo;CLVA(6dtsh$iiv@vYgM^xo^N(>S!I&1cUo1LL5^>ge`!i~ zl3}@PWod9ESAK+BdPKRKyLpPYuceQxOGQRiSXe+>O1N=(rm=~qxq)`6PjRuozq@uM zm#&>cadC!jYKoDmsiCDpMOsmKa-f2vQB`h1iJzC7tFK>~L3w0GV!n5gx2bl7V`jLC zmw8cGX?cW^flEeZQkDrV?lmlmWNAvnQxhsce%4)fSG@y zhjylCfLG+ikK*A)Dc(83hC#uJ7Wo;zrX||JPL)aisfFG~sgAh@?v{D_<{mDk*(K&7 znI>Fm78OqVCXVKjPGO0ONd-QR0s7fa7A4MAPGzB%WiDBU$?27z-e&%O;hvM@8O7@( zbE8W2D>FTVs`3mo%!+af-TbnR(+V@vqAEgM&BICzLQH)M+)8u&(;c}C3X(DkiVV{& zO^wpb49y}9Q_J&%vb>!my^Jz^leEJMeF7rNlG7aX%v`y2b#)aA(gT7$3KDZXlTsqW zBZCV3%skVyBMn0XlD)kH0@BJnT}`7L(+YfYeWN0|-Z4IL4CcElbHQ)lq5}r{x8G~0 zgxLM=Jo54_lX0rG%0A!g?>9~Suidf^Lm8~IL28k8=4f6@0%AG8WoirT##>JURi4CW9jCW zWKtR$9u{Vl8Jgr$9$L=j;${$%W$EN?R-s>JQ04BK>YEboW*Jsi>6_{7Yo_fIRvu~@ zP*R-Y?-Dxkqj-33Wk!~1L}GwtYDjKTl7E`HQIUCOZc0S5g?@#jVWe3|QGTFHlykB{ zwkMZIdX%@fQ%PF7Te4YjL|J)ck&m}Yc}PKKq`6ygaHVTdQ^(6Y>2V@C^%%&MH=sL14yQ17JB#AIU^cYSkz_du?4Bae~-LziO9 zG6N$^U&j<9!~Dp^;^K6Rtf1ujFEX&)Bmz{pDkZ6MA;1 zc5yKJNu)0P{L}hW$=|6O)(5U+Zo79XZu_;z_FlD@b2SdkV0rVo+_*lKho$&b)l8>0gZ(Qb^=9ZTm5@?c<9cXBp?G+W^q95i_Vwvbx znP=>lob8m%5-D1mRsQD>Jn)YW)_?mmRISS8X6dsZRDR}=Ia$6YFXjR zrE8~9T%4hsnqp*XYG|oYkyaF*9H?O7nQ4(?9O#yv5-XTVdUkTR$k1Nnr-Ih=w;zjY++=cV_cD5Xy|C+R;-=vt(_eaVd{}v;+C4E zZ{QuCnPo8Xqj-2}Zfdbpa7m$?t9DefzEgT>NL6N)Ux0IZv8PF;qkmPNsikRDntMoa zc{*2~SEff+MrLtksjpF3TDX&=p{u)RRHcVcu0e!rS*l~1X^5*wmU~82e(2JLR{hTPj&}0iUPxDgk!0;`FMhY|o6!!ZdBi^b&pJlA?Np?7ZB76b}xOd$D*hO;2UOpR3gif6dQQh@_ z!i|rtQ`*=2v6NrV%sHZ&p29I><2&Ub5#HG`*8hbwzHK*^^?WEkL*0166Xy%Q8{Zw* T<9W3-YW3zBIlpH=e-!}$84%L5 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 3729efc..8b89f25 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,7 +2,7 @@ let kop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas@Kopatz-PC2"; server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUA7uVKXAF2UcwaIDSJP2Te8Fi++2zkKzSPoRx1vQrI root@server"; laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqcphdDEJhnSBkAZzQXZJDCzsyb/Tqpcf0pUADFpbd1 root@nix-laptop"; - mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKla9+Gj2i9Ax7cIdnTM6zsmze3g1N/qCPqhga0P+toU root@mini-pc"; + mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/hwMtI0Xj4eRLjITV/Q2BQGG11NCHZRTLuecE/ZPM5 root@server-vm"; mini-pc-proxmox = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP0kX32LfIOv8FDVvdp7lWesVvMGh5tj84nv7TkIR1cs root@mini-pc"; adam-site = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfaIaKoNStnbfjB9cSJ9+PW0BVO3Uhh1uIbZA2CszDE root@nixos"; users = [ kop ]; diff --git a/secrets/stash-auth.age b/secrets/stash-auth.age index 98aee43..b55df1e 100644 --- a/secrets/stash-auth.age +++ b/secrets/stash-auth.age @@ -1,11 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 su0Eyw ubrXjjXR/NWzbnYk8/x9A64iQDmxXsHHyxHyHvFouAE -ot9ZNCyG0OGVALdtrHwg+6jQiNznDicBu74yyFernKU --> ssh-ed25519 xfrWcQ kFeLZt8cxhBhe54M1FQTAw5B/zOzaXBM8uDJMrKPwAY -lzEzl/ZcKSZ3xmxdKE2qSJWSrJl9vS5uFpACOgTITfg --> ssh-ed25519 IV3DkQ 2Gobyktl920WUhBp7ukIcDcdyRem3Y359C7BUIX2Q0Q -n/+a2XRZghCC/Ufaix50eoQJMr2ThM+xz6MimINxZE4 --> ssh-ed25519 DCzi1A 1WGot8qzyx1OZ4oeOG1rGjhgUcjfyEd9G4GAwWG2MX0 -ky/XJR/qcmISfgwkC+ColVTjQJQWkg48whKo1glg7oQ ---- ISzwjQcQ3rt/fcVDESFhiv+k6gPvpckjlkFZ7aWyxXA -qGS g/yT$ø֩ ssh-ed25519 dkV/5A H45UCnfk0L30LTAIJQ21zWMfvYurNxsC7wZJbCZRr1U +pexJiRj9wUy5S8jzMDWUZpKTCQIpGKDH3o/BPGDIrXc +-> ssh-ed25519 xfrWcQ PnFaA7dYMhvwECptLvjkZPY5exA7QQU9J3yuzfFHU0M +tf7pmM2cNqanKNINYkSmn5XMl4VaHpGTIM/3yJydnV4 +-> ssh-ed25519 IV3DkQ NByh1UlLrvvrALcRr25S/Q3TKxbJupknfPxT0BcfbHA +RMAV0OJ70qcce0hVZ49HgMLqTjmhEnyHunnSPs6PDt0 +-> ssh-ed25519 DCzi1A AK2WRW6/SwNkv8ZC2RafnpuODniO0hi44hr6j6zmsB0 +keejUQyYNd3mKqf0bBIaxGWuVncge7bWnnPwFAwuY7A +--- 1S9P2L4/3qA01SRlO/GOZfSg2Y5ckO58iYMe6rfl3es +j>;gcE@su +ߖ6PIdz*#}itbÈ +5䀉oǼleB{wal/0JO \ No newline at end of file diff --git a/secrets/step-ca-key.age b/secrets/step-ca-key.age index d0a25595203d2ccbabc028a3229be4e932b66a46..437daaaa97ccead9c513558eeafa4bfc6c44a620 100644 GIT binary patch delta 793 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 C4&lQ9 diff --git a/secrets/wireguard-client.age b/secrets/wireguard-client.age index b9a4e4fa692861db6697cdf3740fa2c5448981ab..2c6a5a4c72f3ee482bc89972c4deac9930c293fa 100644 GIT binary patch delta 332 zcmaFQ^qy&gPQ9O#esa2xzjIZkNl~&_c79lqsY#?;wrhDraIsf-N|32Akdvt^m(fa# zC+knYIp{hq#AxTPGxuyujco#jcmrzxa!!{Mn=`#vi+{&{x4U&3vu1{yKe~|L1$=p7+r|-*(Ib0L8a@0ssI2 delta 332 zcmaFQ^qy&gPJNlac2a40h<8PRpQVLsh-r3?iFQU(aiOJGVUD4%SF%~2zL#-oRhC(Z zD_3}6c#vaWQB+i7cz$kvhM}pKkxPNEkEuymxS@-4rFXe`Vx(W1t9Pn*B$uw8LUD11 zZfc5=si~o*f}4MqNnyG|VOl|wi@&~+QBh95TdsvqTD`ARRd!iuUYU2fX@!M$m0x<6 zX`a8KftQ;BS8-x?e!6E-zFBdYcSK@lSh1T?u9I6@pjTj^o0mmOu3=eurJr|7P^oq? zm#(g^f}^o-Vw8(luth;+Wm-`|aX@HMMT%ins#9c0m4#1Wg^Q18xJy>4zN>RF*SEv6 zjl8T2ce-{QPmSK_^!Mo$M ssh-ed25519 su0Eyw TSYqpni/Ql+lZa+oFPN3hn8fR4HM3mZ6o9UQKF2KI2s -/IxKWNcfPpsW74ajLj5Nzu8oqLEvGht4mOaJCGKUpHE --> ssh-ed25519 xfrWcQ ti3YCRm+xByOvl4kjqqFMA82QNogaQsD52VelAb1IyA -m4M25xeL2PIzp/BZ23VLb1G+3R6FYAt7wH+816hGSSs --> ssh-ed25519 IV3DkQ ZqrkWMup3fqiPtDa57NifZEyRTdNdcp+ZJzB6oKZjAk -jszSfRmBrN5QLqKdM329uGHQYY+t7m0Ra/RpNkI56AQ --> ssh-ed25519 DCzi1A vOXrGSxFvRj7S33RfhNuI1WvOITZ0vcLsLmuutlcqx4 -8ZQQ26trhVFNEG9yFOmjFgDZh1qq0v4lpDzWYlPC5L4 ---- E0g+TAkc6Mj2vicS3ub2CEr2XYu4Q1nkWgnrs8KnFVE -vv,6|WA?d'!DZfu *}a [[ }WA{p@Dv|Cr|[S@q 6 E \ No newline at end of file +-> ssh-ed25519 dkV/5A FhMxjBcbjjS/qYHq0W9vuAEWh0D4LG62iTKNm0vacwY +2o6VCE8zZsRZczN0QemFPCyRqciTHx0Nmzgl+nlXBHA +-> ssh-ed25519 xfrWcQ j6+gGMbV+v2jVQU7DjTI+nBI8S5rncXY7nEmNBmhujU +SVkjUG0FUzxOlJZ9O5LhmIP3XhAvDQQWE0MYaHl7qAI +-> ssh-ed25519 IV3DkQ rb7ReLYjttHEhEhhVFF7eqNSFXrBzMZpusvTyuMXzQs +OSzhuMUuYUogRFxc7cYOJm8ndm+GLoNZT5VQ4A91k5Q +-> ssh-ed25519 DCzi1A BqUcBTDbhl5cbe3lLePWMm7UL1Q0mocynUHG6BxrlH0 +ISVR5FWzADZOaJA2SRv1TmmMqJ6yz+pLWE1miHn2VJk +--- MeQ/Wz0RDfi0OR8Bwvp1QJRlx9FH52S38DFsl9n4V1U +D7E\J6lo:VzZZ?[c 4U)G|O;zi?cYd( \ No newline at end of file diff --git a/systems/server-vm/configuration.nix b/systems/amd-server-vm/configuration.nix similarity index 64% rename from systems/server-vm/configuration.nix rename to systems/amd-server-vm/configuration.nix index 2c47d4f..975f610 100644 --- a/systems/server-vm/configuration.nix +++ b/systems/amd-server-vm/configuration.nix @@ -19,6 +19,7 @@ loader.grub = { efiSupport = true; efiInstallAsRemovable = true; + device = "nodev"; }; }; @@ -27,10 +28,9 @@ custom = { static-ip = { enable = true; - ip = "192.168.0.21"; + ip = "192.168.0.10"; interface = "eth0"; - #dns = "127.0.0.1"; - dns = "192.168.0.10"; + dns = "127.0.0.1"; }; user = { name = "anon"; @@ -43,48 +43,48 @@ }; misc = { docker.enable = true; - #backup = let - # kavita = "/data/kavita"; - # gitolite = "/var/lib/gitolite"; - # syncthing = [ "/data/synced/default/" "/data/synced/work_drive/" ]; - # syncthingFull = syncthing - # ++ [ "/data/synced/fh/" "/data/synced/books/" ]; - # backupPathsSmall = [ "/home" gitolite ] ++ syncthing; - # backupPathsMedium = [ "/home" gitolite ] ++ syncthing; - # backupPathsFull = [ "/home" kavita gitolite ] ++ syncthingFull; - #in { - # enable = true; - # small = backupPathsSmall; # goes to backblaze - # medium = backupPathsMedium; # goes to gdrive - # large = backupPathsFull; # goes to local storage medium - #}; + backup = let + kavita = "/data/kavita"; + gitolite = "/var/lib/gitolite"; + syncthing = [ "/data/synced/default/" "/data/synced/work_drive/" ]; + syncthingFull = syncthing + ++ [ "/data/synced/fh/" "/data/synced/books/" ]; + backupPathsSmall = [ "/home" gitolite ] ++ syncthing; + backupPathsMedium = [ "/home" gitolite ] ++ syncthing; + backupPathsFull = [ "/home" kavita gitolite ] ++ syncthingFull; + in { + enable = true; + small = backupPathsSmall; # goes to backblaze + medium = backupPathsMedium; # goes to gdrive + large = backupPathsFull; # goes to local storage medium + }; }; services = { acme.enable = true; - #gitolite.enable = true; - #github-runner.enable = true; + gitolite.enable = true; + github-runner.enable = true; #caldav.enable = true; - #kop-monitor.enable = true; + kop-monitor.enable = true; kop-fileshare = { basePath = "/stash"; dataDir = "/1tbssd/kop-fileshare"; enable = true; }; - #nginx.enable = true; - #ente.enable = true; - #kavita = { - # enable = true; - # dir = "/data/kavita"; - #}; - #wireguard = { - # enable = true; - # ip = "192.168.2.1"; - #}; - #adguard.enable = true; - #syncthing = { - # enable = true; - # basePath = "/data/synced"; - #}; + nginx.enable = true; + ente.enable = true; + kavita = { + enable = true; + dir = "/data/kavita"; + }; + wireguard = { + enable = true; + ip = "192.168.2.1"; + }; + adguard.enable = true; + syncthing = { + enable = true; + basePath = "/data/synced"; + }; }; nftables.enable = true; cli-tools.enable = true; @@ -98,6 +98,16 @@ virtualisation.vmware.guest.enable = true; services.xserver.videoDrivers = [ "vmware" ]; + + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + options = [ "defaults" "noatime" ]; + }; + fileSystems."/boot" = + { device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; fileSystems."/data" = { device = "/dev/disk/by-uuid/d117419d-fce9-4d52-85c7-e3481feaa22a"; fsType = "btrfs"; diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index fd0982a..1be438e 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -5,11 +5,9 @@ { config, lib, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - + imports = [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; custom = { #tmpfs.enable = true; @@ -51,15 +49,34 @@ nightlight.enable = true; i3.enable = true; shared.enable = true; - games = { - enable = true; - }; + games = { enable = true; }; }; }; mainUser.layout = "de"; mainUser.variant = "us"; - virtualisation.vmware.host.enable = true; + virtualisation.vmware.host.enable = true; + + systemd.services.start-vm = { + description = "Start VM"; + wants = [ "network-online.target" ]; + after = [ "network.target" "network-online.target" "vmware-networks.service" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + Type = "forking"; #?????? doesnt work without it, thanks vmware + ExecStart = let + script = pkgs.writeShellScript "start-vm" '' + ${pkgs.vmware-workstation}/bin/vmrun start /root/vmware/server/server.vmx nogui + ''; + in "${script}"; + User = "root"; + Restart = "on-failure"; + RestartSec = "5s"; + ProtectHome = false; + ProtectSystem = false; + }; + }; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; @@ -70,7 +87,7 @@ #zenpower for ryzen boot.extraModulePackages = with config.boot.kernelPackages; [ zenpower ]; - boot.kernelModules = ["zenpower"]; + boot.kernelModules = [ "zenpower" ]; boot.blacklistedKernelModules = [ "k10temp" ]; services.xserver.desktopManager = { @@ -96,4 +113,3 @@ system.stateVersion = "24.05"; # Did you read the comment? } - diff --git a/systems/amd-server/hardware-configuration.nix b/systems/amd-server/hardware-configuration.nix index f2bec97..08bee7c 100644 --- a/systems/amd-server/hardware-configuration.nix +++ b/systems/amd-server/hardware-configuration.nix @@ -23,17 +23,6 @@ options = [ "fmask=0077" "dmask=0077" ]; }; - fileSystems."/data" = { - device = "/dev/disk/by-uuid/d117419d-fce9-4d52-85c7-e3481feaa22a"; - fsType = "btrfs"; - options = [ "compress=zstd" "noatime" "nofail" ]; - }; - fileSystems."/1tbssd" = { - device = "/dev/disk/by-uuid/801d9217-9c38-4ca8-914e-e31361603892"; - fsType = "ext4"; - options = [ "defaults" "nofail" "noatime" ]; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking