diff --git a/modules/nixos/base/users/default.nix b/modules/nixos/base/users/default.nix
new file mode 100644
index 0000000..400bc96
--- /dev/null
+++ b/modules/nixos/base/users/default.nix
@@ -0,0 +1,12 @@
+{config, ...}: {
+  users = {
+    mutableUsers = false;
+
+    users.users."${config.marleyos.my.name}" = {
+      isNormalUser = true;
+      description = config.marleyos.my.fullName;
+      extraGroups = ["networkmanager" "wheel"];
+      hashedPassword = "$y$j9T$ztWf9WeUCENC2T12qS4mi1$51ihV/5cQ8mdJJrNe7MMguk4hPB61S5xHawsfi.1hL3";
+    };
+  };
+}
diff --git a/systems/x86_64-linux/nyx/default.nix b/systems/x86_64-linux/nyx/default.nix
index 8797edb..bf97525 100644
--- a/systems/x86_64-linux/nyx/default.nix
+++ b/systems/x86_64-linux/nyx/default.nix
@@ -37,16 +37,8 @@ in {
     };
   };
 
-  users.users.marley = {
-    isNormalUser = true;
-    description = "Marley Rae";
-    extraGroups = ["networkmanager" "wheel"];
-  };
-
   programs.firefox.enable = true;
 
-  nixpkgs.config.allowUnfree = true;
-
   environment.systemPackages = [pkgs.vim pkgs.git];
 
   system.stateVersion = "24.05";