diff --git a/home.nix b/home.nix
index 1979b87..46d30f8 100644
--- a/home.nix
+++ b/home.nix
@@ -5,9 +5,6 @@
     ./home/modules
   ];
 
-  home.username = "ravenshade";
-  home.homeDirectory = "/home/ravenshade";
-
   snowhawk.neovim = {
     enable = true;
     package = inputs.neovim-overlay.packages.${pkgs.system}.default;
diff --git a/home/modules/default.nix b/home/modules/default.nix
index 2e88d42..99b790a 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -7,8 +7,10 @@
     ./fish.nix
     ./git.nix
     ./tmux.nix
+    ./user.nix
   ];
 
+  snowhawk.user.enable = lib.mkDefault true;
   snowhawk.tmux.enable = lib.mkDefault true;
   snowhawk.fish.enable = lib.mkDefault true;
   snowhawk.git.enable = lib.mkDefault true;
diff --git a/home/modules/user.nix b/home/modules/user.nix
new file mode 100644
index 0000000..45d2d86
--- /dev/null
+++ b/home/modules/user.nix
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+let
+  cfg = config.snowhawk.user;
+in
+{
+  options.snowhawk.user = {
+    enable = lib.mkEnableOption "user";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.username = lib.mkDefault "ravenshade";
+    home.homeDirectory = lib.mkDefault "/home/ravenshade";
+  };
+}