From 044b240b66061f7438588196cba249f79c9d2a3d Mon Sep 17 00:00:00 2001 From: Bun Date: Fri, 21 Mar 2025 17:30:50 -0400 Subject: [PATCH] Move snapshot dir, add corn to Kitty --- hosts/kitty/users/corn/default.nix | 15 +++++++++++++++ hosts/kitty/users/default.nix | 5 ++++- hosts/tower/disko/default.nix | 4 ++-- .../home/programs/terminal/ranger/default.nix | 3 ++- .../disks/impermanence/main/default.nix | 1 - .../system/devices/disks/snapper/default.nix | 2 +- .../disks/snapper/{main => home}/default.nix | 4 ++-- modules/system/secrets/default.nix | Bin 2004 -> 2005 bytes modules/system/users/main/default.nix | 2 +- 9 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 hosts/kitty/users/corn/default.nix rename modules/system/devices/disks/snapper/{main => home}/default.nix (55%) diff --git a/hosts/kitty/users/corn/default.nix b/hosts/kitty/users/corn/default.nix new file mode 100644 index 00000000..20ca5f2e --- /dev/null +++ b/hosts/kitty/users/corn/default.nix @@ -0,0 +1,15 @@ +{ ... }: +{ + users.users."corn" = { + isNormalUser = true; + createHome = true; + openssh.authorizedKeys.keys = [ + "AAAAC3NzaC1lZDI1NTE5AAAAIKaZsnlyUJDNx2oK4iHsUDb+Ok4vg1jNYEAnoHsjjM2c Chinook" + "AAAAC3NzaC1lZDI1NTE5AAAAICtoHVAmq8Ps7EguBsV3VY4snagzkhH6aXqwbKzuGs2H Radiant" + ]; + uid = 1001; + shell = pkgs.zsh; + }; + + environment.persistence."/persist".directories = [ "/home/corn" ]; +} diff --git a/hosts/kitty/users/default.nix b/hosts/kitty/users/default.nix index 57e7f20b..303e215a 100644 --- a/hosts/kitty/users/default.nix +++ b/hosts/kitty/users/default.nix @@ -1,4 +1,7 @@ { ... }: { - imports = [ ./main ]; + imports = [ + ./main + ./corn + ]; } diff --git a/hosts/tower/disko/default.nix b/hosts/tower/disko/default.nix index e3aa3035..8b56d84a 100644 --- a/hosts/tower/disko/default.nix +++ b/hosts/tower/disko/default.nix @@ -68,8 +68,8 @@ mountOptions = [ "compress=zstd" "noatime" "ssd" ]; }; "/persist/.snapshots" = { }; - "/persist/home/${config.sysusers.main}" = { }; - "/persist/home/${config.sysusers.main}/.snapshots" = { }; + "/persist/home" = { }; + "/persist/home/.snapshots" = { }; }; }; }; diff --git a/modules/home/programs/terminal/ranger/default.nix b/modules/home/programs/terminal/ranger/default.nix index d761c1ba..c86fd380 100644 --- a/modules/home/programs/terminal/ranger/default.nix +++ b/modules/home/programs/terminal/ranger/default.nix @@ -105,10 +105,11 @@ c:/home/${config.home.username}/.config l:/home/${config.home.username}/.local d:/mnt + p:/persist n:/etc/nixos # Remote files - H:/home/${config.home.username}/Midas + H:/home/${config.home.username}/Midas/storage K:/home/${config.home.username}/Midas/storage/Files V:/home/${config.home.username}/Midas/storage/Media M:/home/${config.home.username}/Midas/storage/Music diff --git a/modules/system/devices/disks/impermanence/main/default.nix b/modules/system/devices/disks/impermanence/main/default.nix index cca8d2c8..f75b6cc8 100644 --- a/modules/system/devices/disks/impermanence/main/default.nix +++ b/modules/system/devices/disks/impermanence/main/default.nix @@ -11,7 +11,6 @@ "Games" "VMs" - ".snapshots" ".mozilla" ".thunderbird" diff --git a/modules/system/devices/disks/snapper/default.nix b/modules/system/devices/disks/snapper/default.nix index 112c3787..dda37e31 100644 --- a/modules/system/devices/disks/snapper/default.nix +++ b/modules/system/devices/disks/snapper/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./main + ./home ./root ]; diff --git a/modules/system/devices/disks/snapper/main/default.nix b/modules/system/devices/disks/snapper/home/default.nix similarity index 55% rename from modules/system/devices/disks/snapper/main/default.nix rename to modules/system/devices/disks/snapper/home/default.nix index cac62e46..6d85aea1 100644 --- a/modules/system/devices/disks/snapper/main/default.nix +++ b/modules/system/devices/disks/snapper/home/default.nix @@ -1,7 +1,7 @@ { config, lib, ... }: { - services.snapper.configs.${config.sysusers.main} = lib.mkIf config.environment.persistence."/persist".enable { - SUBVOLUME = "/persist/home/${config.sysusers.main}"; + services.snapper.configs.home = lib.mkIf config.environment.persistence."/persist".enable { + SUBVOLUME = "/persist/home"; TIMELINE_CREATE = true; TIMELINE_CLEANUP = true; TIMELINE_LIMIT_DAILY = 1; diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix index 1a44f1446e45ad21a0acc41f403065568ac19539..08d97784dbffa8a2859c872de6367454dfe93c9c 100644 GIT binary patch literal 2005 zcmV;`2P*ggM@dveQdv+`0E9;obG*QASc{$jt<&-vs6<$D@fW%DjDBB!Ez!2Y-C!g5 z`zLXUZNy!Nc6_h}eV4$7(*kv@Dg7CAdTA#a7}|yTS1_`}-UpQM0sD6-L(IW>f%O|t zI&LQ~1sPQ-!R@aHa6pjhaz$60R=*1lpHuojQM`x}uw5?vkh4wt^4q_hfTxRN)$r$UsaktCPYg}bS~1C5`*2ozbBb{t zrC+PgQ5|3}x`V!W??=9+C4r2`0=j^d~D*Jg7iC!SjkhxBhXK4Dt;h<>^Hsa9b?v8|Rpj8%(b4+mqK6zM5P5JBN6N&KU3%V0nV(XF za|zCjv7uNuGiVn-_~>qnOc`rg^x5B`fcWS;VhR#kpEde?$Dvd(`E~Z8-Os^L6Au{> z!^eWN=EK#Aq}O}g*q0w^{BesGeC-;hJEsQ90@fyBow|%x!$2&t8TH#i#}2BOPp-cc ztJzD?;NP7|eNW%liTZV&*+y-7qCoVB#jnoTf=TIDoBE7$OCk zPhUaDirPRM7W=5zbZ(d!y|DHNj)q#kMK6dlF+KXw28ch3!J~W(Bbj%aftPhU=Hk@|V_i_NM=G8tfv&D^rCpB@Z&-%J!zApGS|1!L>@Vp!4iRWF%pBFJXCBUE)?Jw2CZuy zq@1sc@Drmbw`nnNg7-wVwN2tGC(9H`0fw0%@AKYx zEU`f14|Di!m;^Ib4^GEn&rG6H{hs_Pepu2a%wKx8kgvmR@RNX@e_ii(x?%$sM4UgE zId0wm5!JFCcMGaTVgx;MSVCiDZ9;$DC_25_hV_^{ssWxG-l_-}=5T$?r+SR9=6v_G zBkqbf%_%{_xZ;7q3PGZa@o8ke-iG`Zeps(Oym zw5pL4oZ_gn@F-1FtRK=%THiFD0AFzGfCyuE_{I~B?KGN4Qc!LM;@gYg1GeQs6?wkN zVw|d}T4t%pJU9Ulihb~wsXB=0BKbN)cuw=p#*^2goS^d^D7eP5j*N+E)TvSS0v;%g zIPl5=hytnm=Cb6Q3@{APu5eZ0ogeYK?)H~UUosl4&>fDppC!P6z3Y=F#ja>(r|Xa% zXqWyyI?QQnb)ZBglefEs8x>kHx&qydb6QqA%H;rn@Ia<)7e;6*P%u z(51ghHf+Y78t*86XWt+w≧%J=wDMWJ-(QQBL^+KJ%|u>&33LExx@NP{|t5M z>DaD*8?PnFV;!%q3V))TePQQBb=gPZ nipJ8H-ZebH{bM}Vxw9ks(p;*oWgx%~{ezfPmbWUP66s==Z87Bc literal 2004 zcmV;_2P^mhM@dveQdv+`05MfBCuPg%r_Rxj_GDt9GJidcgY$Ok^((TDoWkn|s##1w z1Gmm=D#oZEOOlx~p}8wlgYJ{*WEBZRCxm^2VA%bBzclMRO0J1Z(-W+OYyAO)rqUv` z+PV_zljp9op}?8q&@aNe;OX?ZX^z@@LO`n@OEEG8$RL4ffTk(eI<86V({Yq)> za_C3E5Q{$Hu!%0TLcpq;-=Pe=pUt9gyC&Kq3C_|z+|>}g+Zh-|5!;9b!rEn9jipov zIn%(uCJu0@n2N-mw%Y?BZP3Mufixnfb`1e=`?v}BtT%hsTKs-rxLbNzpo$}^I_5c& zg5!0;JuIASAFWVHSHs^tU0a32F5p!-Gsk(y0V}UfH@hbaj%EW>+th{{Rz0MP12&w@ z1FtQgZ}?O@J3O*K+I0NJMVL7g1T|ekytp%uW!EaoAPR`qF_EQfxQcW}xH&({>RyhKMyX`G@~5)(uPhITxd^lvrxNcd63oWpPw z1lp4zY6>vUYdYfDu4fSHuWAGk;gc*n*WD>(LG8R{Ni9rGU?lK&xTBU9aLuW?WqIm? zcJtWO)Z5r&o`T(~0>(lInnu=7>AQP2%L2YT(FEryWF!kmKMjO=sD)Ss1nznPo1aTA z19Ilip&Z7XRGS?4|KnyWXR4XQtOGn7pZ2Gj){9pn^rijxQ{yPvs$R@HfW9`JgUo$` zc~OB0m4T+Zq1-ZLoZx|}1k&ds%AX{-;5S-u!sNzPvXLAaKv8yqT3s}H!4Wvg-&RNm z(-HI&0~0=7Ttb=?0_SuJ4V>DgnB$DT$zD3%>Y8{t%t|pU|F?%A(QL@UD>#ZyOcd%l z1HPeB(nKh+USdGjtOoXo!l`Onp^JYkuU*k77zFJ)Id;;Tlfh z-cvweJhqiJeDdB=VsU2orTni~iaj}}&oh?>rq?kv9Xv2907LSYA(!0Ck#%^HMWvrp zIy6g8tJ(8jMZIABrfi!NtTb3~>utNQGrAt&e+k8m((e2GVWaJA*bjzr}EVEof-fI_~1?rf|@H4Jg zD)0`L#0|cxCV{~V;x()(W(RK7woPn(MzxZ$lW9+pJpfSJUuO4)4Kn`0B(;M?hw7xQ zFyv7exE<{jBbL9>mC?f`34hqx3j+~2s5dKI1EpUi)DIhkidBSa!fO;a7j~t^(0f6A za~le>+iApe@3bw)(rnEvEgb-e(4sI`eN}e-b-jkJr%^-l%~4DKXJkTP)ND(E^*TvN6G$STlndS-uZ^|ZdhI#rRlfP6rU{!(Cr>?P4 zj63bp8}QfZxh5&BY!Eu#=ks}~@s-z+>5)#0N1MIz`8JV9!(IeJ!*Pn17}it%p()Xv zqijVnQ3z82LXs6L6(q2;lvM0p_R4PEzBYNoTz5{5)hAzliHf2W_|eYdZl~(JD+*2! z;^@_T@?4VZ_g>Ks`OiFunzCyZN|k#1QidBFJ!@L0QlroxV(=8EO>4{M$XukctEq0x zbqYpaq3l8S^HiD_J0QSWBVJi!X$82|poXme5m4;>$+{M9VSoIJIt=Q9BC?~$$&6sN zFvB`JK0_kX{P?a=Oq*eff9-%JmmN=|VR?MUEUrL$?@QiA;9=~=%hs@dfrRp09O_!% zD{D|J)36+A+Kv&3($X3bVDXSf)JBGp)cPeD4wOjKh5>I@q;Z$kx^1 z+`77tbIr^z_=Ljo9v9>bi+wmg(`f6wt8Ey?hnJB`8btODFQv7fA3I!!%q1dtfX1R+ z#%TiypHOw~BlhlhK@tEP3}Y6oa%ud5C%M0e#zD)r4Q_;pq%ek>zNBJ{Hc9Cza+KOj zd%ECF>xgZ%C5}VlehFS>J8iSJcIJ7l=Tvsq$A-sC*n#yAxvnOHuTUWI;&m?*YC+1o z&-T*y*S6@Pu=gj0(n1fJQ^ZD&RNeM4{--~nX)T{3zJlKCh_EzIuWhk6Vw^(Vd43mu;6^$Wj$i3bsVt2PVp5%It#0Jp#;^R?a}1VZ=*N9P^vxT?u-(nM!CtnBWq|jt4pCixy=+;Mi38Ff&%FKX{xbl+=N+?4 zlHO(*4xj9E{aH#i{wqhGm{+r^Yt52vZ%Mwa2CV!$W}AJ`Up6QWimN*L-}(