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 a274d1f..59687fe 100644
Binary files a/modules/system/variables/secrets/default.nix and b/modules/system/variables/secrets/default.nix differ
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";
-  };
-}