From 24d8eeb413b682d7ce51303b789f7c229ae2d9b6 Mon Sep 17 00:00:00 2001 From: chloe caruso Date: Mon, 5 May 2025 19:05:37 -0700 Subject: [PATCH] reorganize "hosts/" into "users/" the plan here is a user owns one or multiple machines: users/ +-- chloe/ | +-- home.nix # apply to all | +-- sandwich/ | | +-- configuration.nix # per machine | | +-- home.nix | +-- paperback/ | ... +-- natalie/ ... --- .DS_Store | Bin 6148 -> 0 bytes flake.nix | 8 ++--- hosts/.DS_Store | Bin 6148 -> 0 bytes hosts/laptop/.DS_Store | Bin 6148 -> 0 bytes .../laptop => users/chloe}/configuration.nix | 0 {hosts/laptop => users/chloe}/home.nix | 0 .../natalie}/desktop/configuration.nix | 0 .../desktop/hardware-configuration.nix | 0 {hosts => users/natalie}/desktop/home.nix | 0 users/natalie/laptop/configuration.nix | 28 +++++++++++++++++ users/natalie/laptop/home.nix | 29 ++++++++++++++++++ 11 files changed, 61 insertions(+), 4 deletions(-) delete mode 100644 .DS_Store delete mode 100644 hosts/.DS_Store delete mode 100644 hosts/laptop/.DS_Store rename {hosts/laptop => users/chloe}/configuration.nix (100%) rename {hosts/laptop => users/chloe}/home.nix (100%) rename {hosts => users/natalie}/desktop/configuration.nix (100%) rename {hosts => users/natalie}/desktop/hardware-configuration.nix (100%) rename {hosts => users/natalie}/desktop/home.nix (100%) create mode 100644 users/natalie/laptop/configuration.nix create mode 100644 users/natalie/laptop/home.nix diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 140a77d1ac095724aa4222b51f02370376473033..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z>*NNhm@N3Oz1(E!fs76fYsx7cim+m70)3gE3p0lpabUXMG``#OHBl zcUuVNETS_o`_0bJX7fRIGmJ6rui^n?E@R9FMdWDI2)b)S4U^0PL1B$NTIY)>l~K(y zzte?#Z?id*EN4Y!{~ysJP4c4O|KyEkt9@Wuj@7ZAg1KA=MOdtIKU_ZG>{iM&+Sy@r zm(12v_vlJyMVMr>r7B3`8KgYkCs{1lzFcK-u4)4va2(s2y4}s@d^GBb!P&*OCpP0@ zzb8iH;dblT$0w(kH`AB&HIr|eNRB&4In=Np-}e?7!~iis3=jjvKpg|-2C+MJLGlp; z#K6C10M7>jis%_EHL9Zn2Gs%pw!p0fZ0selMi}%AmKq@f!gVR2F6E}h;JO_A!sK}d zOO3jmanpQo^W6;{AUOpG<9&UoD{-F+dFbF$Q>R z5=?w}DRZ}edp*2s1?V#<3g(q)fPh{334jTnBV85Lae+4Ec?L_3xC;7JIUxNAC_-o; I27Z8nFVR~?i~s-t diff --git a/flake.nix b/flake.nix index faad74d..0bd6ce0 100644 --- a/flake.nix +++ b/flake.nix @@ -120,7 +120,7 @@ # natalie's desktop computer nixosConfigurations.nixos = mkSystem "nixos" { userSettings = users.nmarks; - configDir = ./hosts/desktop; + configDir = ./hosts/natalie/desktop; system = "x86_64-linux"; extraModules = [ nixos-cosmic.nixosModules.default @@ -129,20 +129,20 @@ # natalie's laptop darwinConfigurations."Natalies-MacBook-Air" = mkSystem "Natalies-MacBook-Air" { userSettings = users.nmarks; - configDir = ./hosts/laptop; + configDir = ./hosts/natalie/laptop; system = "aarch64-darwin"; }; # chloe's mac studio "sandwich" darwinConfigurations.sandwich = mkSystem "sandwich" { userSettings = users.paper_clover; - configDir = ./hosts/laptop; + configDir = ./hosts/chloe; system = "aarch64-darwin"; }; # chloe's macbook air "paperback" darwinConfigurations.paperback = mkSystem "paperback" { userSettings = users.paper_clover; - configDir = ./hosts/laptop; + configDir = ./hosts/chloe; system = "aarch64-darwin"; }; }; diff --git a/hosts/.DS_Store b/hosts/.DS_Store deleted file mode 100644 index 35fbfdbfc0e1e2dbaad4d81ec972ed669ba56405..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQA+|r5S~?24+(rI@NuD6AvFu6m&5E2bWsl#cE<@GUAN+$_#nbP*B|Pa^n04w zT_drcgeaMT*>84sW|#eL*|`M((VvBFfI0wFQ3(qUHs1)1lWs`CdI*J{L%}4Nr;{L7 z!A3MY{vreP?aB~?4-?2>{rkNIlQ>GVR_k39ilx1BrQ%d-l?QLE=3eG!v$XF|@2GdJ zR2-~qKe&lT^I`qqLM53WC8McMh{6$u+}}n?sOEh&OTtv=dS<|Js?M<9SS(Jv-KK1x zoGqJj(d)FDvfJw{mrnKY==l6<_!K`U>ctQ#@XTr1x442=G|G^|7a|q6k$>kO{%a@3}MpIFKwJ_F*j(^LFkon9=o!zFBG9yN59nJAY6moG6T%OIs--1 ztyBHK{Q3RAp2R(7fEm~+21IG#4f?nxTU$3aN3~X>KBAIPTyF3)1r1$_F_ubk162$9 YB^ijW#oQozQ20kc)4&Zg@T&}b00eP<5C8xG diff --git a/hosts/laptop/.DS_Store b/hosts/laptop/.DS_Store deleted file mode 100644 index 4be084eeb267c00f5520ddb5bd0a88f0f42b9f06..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5Z>*NNhm@N3Oz1(E!fs76fdFH7cim+m717>!I&*gN)Dxvv%Zi|;`2DO zyDbEB7SS1){buK9v-u#q8O9i&tfB#9E@R9FMdWDI2)b)S4U^0PL1B$7EV4zI$gpOa z-|51=w^_`dm}F^X{~zHZiL<=l|KyEktG#Dgj@7Xq{AXGCd62KNNwB=b*|n5OxV3}u zCY~2F_uxXNc@U@br7DP{Ii%d*#%UyriCm>orfPj1a2(s2x!v{pbTsOT!O7XCC)VR( zzb8iH;b!C5heyZfSF@MoHI;9gNRB&4+1Ice-**-n!~iis3=jjvKpg|-2C+MJLGlp; z#K6C10M7>jis%_EHL9Zn2Gs%pw!p0fZ0selMi}%AmKq@f!gVR2F6E}h;JO_A!sK}d zOO3jmanpQo^W<&w!qwAZeWB7B_cYQ-3=jiV2AX>6;{AUKpG<9&UoD{-F+dFbF$Q>R z>Q5)|Qs!>`_Ih~N3eZPT6wE8p00F!5695xDN4hGg;{t8S^9+_6aTWBdazOeKP=wGx I4Ez8CU+