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 de8a69de..14699587 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 eb7d6d08..95cdb532 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 f964365e..25df0537 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 6c88b060..8ffa16e4 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 db0b1e7d..e75d1e6a 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 ed73dd08..3f56b733 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 b38cc165..ead54949 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 c2ab7ee2..79cfe4af 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 331b92e5..b9ef86aa 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 93736f3e..98178732 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
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

literal 1922
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
Bu{Qt!

diff --git a/modules/variables/default.nix b/modules/variables/default.nix
deleted file mode 100644
index d1bb9a1c..00000000
--- 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 41e8ee23..00000000
--- 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";
-  };
-}