diff --git a/flake.nix b/flake.nix
index 3b2d960..e9a8e6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
   }@inputs:
   {
     nixosConfigurations.rubble = nixpkgs.lib.nixosSystem {
-      modules = [ ./host ];
+      modules = [ ./system ];
       specialArgs = inputs;
     };
   };
diff --git a/system/accounts/users/custom/jimbo/default.nix b/system/accounts/users/custom/jimbo/default.nix
index 508f84c..dafbea9 100644
--- a/system/accounts/users/custom/jimbo/default.nix
+++ b/system/accounts/users/custom/jimbo/default.nix
@@ -1,11 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   users.users.jimbo = {
-    hashedPassword = config.secrets.mainAccPass;
+    hashedPassword = config.secrets.jimboAccPass;
     isNormalUser = true;
+    createHome = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl Desktop"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k Server"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
     ];
     extraGroups = [
diff --git a/system/accounts/users/custom/jules/default.nix b/system/accounts/users/custom/jules/default.nix
index 220cec0..f428f05 100644
--- a/system/accounts/users/custom/jules/default.nix
+++ b/system/accounts/users/custom/jules/default.nix
@@ -1,8 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   users.users.jules = {
-    hashedPassword = config.secrets.mainAccPass;
+    hashedPassword = config.secrets.julesAccPass;
     isNormalUser = true;
+    createHome = true;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwxJcAWuHkKy/Ar37aIoqg34CDcZu7/bh978nYkOgzj jules@jules-pc"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEOszCNP+6rkIS75GyFVhn9o6QpUuGdx/J4rjzROrpSl jules@xeta"
@@ -22,5 +23,5 @@
     shell = pkgs.fish;
   };
 
-  #home-manager.users.jimbo = import ../../../../../home/jimbo;
+  #home-manager.users.jules = import ../../../../../home/jules;
 }
diff --git a/system/devices/networking/default.nix b/system/devices/networking/default.nix
index 06f8613..34dfe97 100644
--- a/system/devices/networking/default.nix
+++ b/system/devices/networking/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   networking = {
     wireless = {
diff --git a/system/programs/doas/default.nix b/system/programs/doas/default.nix
index b92d09c..cd2e2dd 100644
--- a/system/programs/doas/default.nix
+++ b/system/programs/doas/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   security = {
     sudo.enable = false;
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
index e3a32ce..d18b6b7 100644
Binary files a/system/secrets/default.nix and b/system/secrets/default.nix differ
diff --git a/system/settings/default.nix b/system/settings/default.nix
index 666a961..929060e 100644
--- a/system/settings/default.nix
+++ b/system/settings/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./minimal
     ./nix
-    ./security
     ./timezone
   ];
 }