From 36b97c4ab2ad294a7f2743af643a8eddc6efad96 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Tue, 25 Feb 2025 03:40:54 -0500
Subject: [PATCH] Simplify variable files, full push for home independence

---
 modules/home/default.nix                      |   1 -
 modules/home/user/default.nix                 |   2 +-
 modules/home/variables/displays/default.nix   |   1 -
 .../home/variables/look/border/default.nix    |   1 -
 .../home/variables/look/colors/default.nix    |   1 -
 modules/home/variables/look/fonts/default.nix |   1 -
 modules/home/variables/workspaces/default.nix |   1 -
 .../accounts/users/custom/main/default.nix    |  78 ++++++++++--------
 modules/system/default.nix                    |   1 -
 modules/system/variables/ips/default.nix      |   1 -
 modules/system/variables/secrets/default.nix  | Bin 1922 -> 1904 bytes
 modules/variables/default.nix                 |   4 -
 modules/variables/users/default.nix           |  11 ---
 13 files changed, 44 insertions(+), 59 deletions(-)
 delete mode 100644 modules/variables/default.nix
 delete mode 100644 modules/variables/users/default.nix

diff --git a/modules/home/default.nix b/modules/home/default.nix
index de8a69d..1469958 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -8,7 +8,6 @@
     ./user
     ./variables
     ./wms
-    ../variables
 
     # Imports
     nur.modules.homeManager.default
diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix
index eb7d6d0..95cdb53 100644
--- a/modules/home/user/default.nix
+++ b/modules/home/user/default.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   home = {
-    username = "${config.sysusers.main}";
+    username = "jimbo";
     homeDirectory = "/home/${config.home.username}";
     sessionVariables = {
       EDITOR = "nvim";
diff --git a/modules/home/variables/displays/default.nix b/modules/home/variables/displays/default.nix
index f964365..25df053 100644
--- a/modules/home/variables/displays/default.nix
+++ b/modules/home/variables/displays/default.nix
@@ -2,7 +2,6 @@
 {
   options.displays = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.displays = {
diff --git a/modules/home/variables/look/border/default.nix b/modules/home/variables/look/border/default.nix
index 6c88b06..8ffa16e 100644
--- a/modules/home/variables/look/border/default.nix
+++ b/modules/home/variables/look/border/default.nix
@@ -2,7 +2,6 @@
 {
   options.look.border = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.look.border = rec {
diff --git a/modules/home/variables/look/colors/default.nix b/modules/home/variables/look/colors/default.nix
index db0b1e7..e75d1e6 100644
--- a/modules/home/variables/look/colors/default.nix
+++ b/modules/home/variables/look/colors/default.nix
@@ -2,7 +2,6 @@
 {
   options.look.colors = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.look.colors = {
diff --git a/modules/home/variables/look/fonts/default.nix b/modules/home/variables/look/fonts/default.nix
index ed73dd0..3f56b73 100644
--- a/modules/home/variables/look/fonts/default.nix
+++ b/modules/home/variables/look/fonts/default.nix
@@ -2,7 +2,6 @@
 {
   options.look.fonts = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.look.fonts = {
diff --git a/modules/home/variables/workspaces/default.nix b/modules/home/variables/workspaces/default.nix
index b38cc16..ead5494 100644
--- a/modules/home/variables/workspaces/default.nix
+++ b/modules/home/variables/workspaces/default.nix
@@ -2,7 +2,6 @@
 {
   options.ws = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.ws = {
diff --git a/modules/system/accounts/users/custom/main/default.nix b/modules/system/accounts/users/custom/main/default.nix
index c2ab7ee..79cfe4a 100644
--- a/modules/system/accounts/users/custom/main/default.nix
+++ b/modules/system/accounts/users/custom/main/default.nix
@@ -1,39 +1,47 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
-  users.users."${config.sysusers.main}" = {
-    hashedPassword = config.secrets.mainAccPass;
-    isNormalUser = true;
-    openssh.authorizedKeys.keyFiles = [
-      ../../../../../../hosts/tower/id_ed25519.pub
-
-      ../../../../../../hosts/envy/id_ed25519.pub
-      ../../../../../../hosts/redmond/id_ed25519.pub
-
-      ../../../../../../hosts/kitty/id_ed25519.pub
-      ../../../../../../hosts/midas/id_ed25519.pub
-      ../../../../../../hosts/prophet/id_ed25519.pub
-    ];
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
-    ];
-    extraGroups = [
-      "wheel"
-      "audio"
-      "video"
-      "input"
-      "disk"
-      "dialout"
-      "rtkit"
-      "kvm"
-      "libvirtd"
-      "qemu-libvirtd"
-      "nginx"
-      "minecraft"
-      "nfsShare"
-    ];
-    uid = 1000;
-    shell = pkgs.zsh;
+  options.sysusers = lib.mkOption {
+    type = lib.types.attrs;
   };
 
-  home-manager.users."${config.sysusers.main}" = import ../../../../../home;
+  config = {
+    sysusers.main = "jimbo";
+
+    users.users."${config.sysusers.main}" = {
+      hashedPassword = config.secrets.mainAccPass;
+      isNormalUser = true;
+      openssh.authorizedKeys.keyFiles = [
+        ../../../../../../hosts/tower/id_ed25519.pub
+
+        ../../../../../../hosts/envy/id_ed25519.pub
+        ../../../../../../hosts/redmond/id_ed25519.pub
+
+        ../../../../../../hosts/kitty/id_ed25519.pub
+        ../../../../../../hosts/midas/id_ed25519.pub
+        ../../../../../../hosts/prophet/id_ed25519.pub
+      ];
+      openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
+      ];
+      extraGroups = [
+        "wheel"
+        "audio"
+        "video"
+        "input"
+        "disk"
+        "dialout"
+        "rtkit"
+        "kvm"
+        "libvirtd"
+        "qemu-libvirtd"
+        "nginx"
+        "minecraft"
+        "nfsShare"
+      ];
+      uid = 1000;
+      shell = pkgs.zsh;
+    };
+
+    home-manager.users."${config.sysusers.main}" = import ../../../../../home;
+  };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 331b92e..b9ef86a 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -7,7 +7,6 @@
     ./services
     ./settings
     ./variables
-    ../variables
   ];
 
   options.system = with lib; {
diff --git a/modules/system/variables/ips/default.nix b/modules/system/variables/ips/default.nix
index 93736f3..9817873 100644
--- a/modules/system/variables/ips/default.nix
+++ b/modules/system/variables/ips/default.nix
@@ -2,7 +2,6 @@
 {
   options.ips = lib.mkOption {
     type = lib.types.attrs;
-    default = {};
   };
 
   config.ips = rec {
diff --git a/modules/system/variables/secrets/default.nix b/modules/system/variables/secrets/default.nix
index a274d1f7500235356fe5cfcd1bacf957e28d849b..59687feccf41276ae9452982b80a7fb2911c92c0 100644
GIT binary patch
literal 1904
zcmV-$2aoswM@dveQdv+`0H_+mS+fae$pk9c=rgY)z%OFnBA^yR4O&3o1Rvax+T&t;
zSH>O%$`ew9)8Y*_JcN{|^nLS3(OZHzm~tzH6)Uuu9h5~@fB}yuc=Sl@?z&`zY($Q~
z`~4jO5&k+dwl@}65%5hiu*h!Hd)41mNR-pjF>?<Fp^c)Bd7|VmBAG9rXawTE#Nb6J
z#=ZX8p8wn@W6Vf(MFklw)U)$z+0+tD5}+OoSG*ThR)n@sK$-w#@J1sto0YWOMOhe-
zK(AD8ADJ)ks&RKo8c~^esf|DRwVS-%4>`4m*p@V73Ot(2s#_Bit(&=`o2elSTU=)K
zCW)>G2c4wRBV@C*f}-c4r;aE=`OvEt`_mZvvJ{bFhUsq)r!+!}Yd))OY`|}GxV8BI
z6FYTBsT8CFWs=<AeiKbqPbf+QrC`{d)xof$rkPkEF?W`hQn%{#)dK{@Tsh6-XAOXj
zfm+9m-HSj@$j}OY|LcUE&EJI!?ffgz5=<^gKnK?~VH}tg!;#wB=EgvKb(r^RFhz^2
zl#|%xQRXc0B1f4`P7?*5>(NHfL|$iB>K;7SEQeR0<|Jp0a}l=9t|1;Kn{n#>PnWG*
zFJJ44QVQl)QEvXlT&#v%hYQrynDYTM${*6%kLHmd?q*D-bp0AsA3%vw4P2uonGnem
z4`GQ3+(3f_eux;3U0_<3VW8DOQKwa{PYD&zJniJsz*4p*yg9b^*)PY7OPfaqzVE)H
zzbg}e<d*f7eu-dsmzfY4*gn6pMh@&`qz8|>=fBq6sVZZBP)rb)+lhd@;9iGaU{j#6
z<>j`d#3UIT#%v~dYl9=0=`~<ZXf8}{0_V872`G3R1l?qzPGi^v)|2hACoT=a2ogQ3
zRS*(>AXO&n>^}KS*J%iicLk!X$B~qL5$poXtXxK4Nw3La+3Tj2{lHaM5q`7#iNwz*
zWizB)bV<OxUTL;Lr1k?ps48t&fP^$N^d_oE5j})pG?Jt?dse&)iFunkp)Gn;QTH1<
zi}*xrpFL{R@>eSz)6nYVS$QZV9a<FKdg~NwDMG2EtlM@;W8elir09KUz8t#FC@%4n
z5J~Z9xqFVXPs@N~0E}8VomNebC?x`xIE9Ok;z*+Y+BJLg*y5FMF#~@Ht-k8^l7?tN
zLgI;$p|3!LquHBXGoz<OV5!oG`E(8Up7d)Y2hKT$G6QN0w|j^PLQM{s0Q9*k1?V+x
z9D`%+WLGG~3s9@bhQjtY4mfb;iK-m!!JAOzH^#Rfr_NjQx!JP{ASRi%&?9yhLLs9+
zpB4ioKy4Bq<j_C>vptctIOTzc>+H%T?D65UJl+mHwyzf|aINVNM^K0JtMvO*B9HQc
z?Sm@S?VR&qmG|T5eIAJ;BN=SZD>P?IyelnB9&Wov2;VW9ck2`@ls>wrzw7y}B<d4n
z)+vvJiXve^iLFHK*cE&k^BO6W(FWslfv7go6q&q$@_2MNBN}EWKIIo&DywLe<Qr-O
z{$M4iyb8}9kRAF(<o;huL0o{;3iy|KMi+gVbK1s3am@D=|J%ls*@~>5Z)LU@g5V!v
ze6@thMxKlcNkO0wU40YLs!49Lhu71{?3`-W+7O%KwJ`Ea{O=~1{Q@MOv3VXWahP&4
za)|%3UVpN{uoZ3fFR1?;|4daoAoFRU!V%9SRGZzZ-#{pKRS>6^vG#XaLYC@Jy4v@i
zOrgV0GBR;&pKcNL+oozs3t1srJDS-Z8`_MUlc4J(Ouv!)ZMN_}?A#InsZw|SiX&kO
zJF>leRSH?|Sc=qLER%qeQ@X~HscfC@>wd*F0z;XK1n%~~L-r|@kgG1ds$%z`2f`30
zO(y)P{{<YFzi2;B+bAs26HmRX4J3Jhz>&E%`?E2h*ZY?lg@HegX`J&me)!@Cab{0Q
z{$A>7k=&tF7e1+Hnaj*@eJUrm6~_O-_<KT0&t+5S<LqJfdC)2&Lh5Iw?e?^H6w{HK
z=ynl=<@Xc#?ZT6^QN;$%QM&pTDI?e0-%IWOj%-+?NkN0~%gDr>ibty!c(y~9q|uN0
zr~>^|xF)%(gL0)=&KGE;*H`Egk+gocm_#G*HwXdum?xf}BbCm`+BbeiojljI$9y7$
z-B@_9cYO<!R+vKI`$LmMGUZSyikS?Xr^-@N3R44%s&*b!Jm>}h()qZ+(kAtx9f-+T
z^zuUf2P52MS^zs8!-?Y3$+N%nYrf~+^j^f<Fp0C_kAX77B!aHf3An3e8W-#C`1C-1
zvn~HRX;`n*Au-cMj*oc4(q_UVeIKRb&nOoZO1NjgJcIa$<cX3?>pWt)@-?|ISr4n6
zdLMr&)Y9yx&YXMX@dRJA&C6(UZ&vg7PplwBU{gvX0E?W%S)XA%<hIl?T@s;Aw3tP?
z-3B8~Rhpa^Oe)Y|nleTVMQKF=u@gy3B`=qcOjtYvv5Uy~G*)<bR6T0yvOs1Lp>h9&
qOsGO4NW;HUcG)ul^q)=GQT~_fR)#RCcJ<=wGK+LwFpbul-{rK5psvjT

literal 1922
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
I8j@zF8{@07Hvj+t

diff --git a/modules/variables/default.nix b/modules/variables/default.nix
deleted file mode 100644
index d1bb9a1..0000000
--- a/modules/variables/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./users ];
-}
diff --git a/modules/variables/users/default.nix b/modules/variables/users/default.nix
deleted file mode 100644
index 41e8ee2..0000000
--- a/modules/variables/users/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, lib, ... }:
-{
-  options.sysusers = lib.mkOption {
-    type = lib.types.attrs;
-    default = {};
-  };
-
-  config.sysusers = {
-    main = "jimbo";
-  };
-}