diff --git a/systems/desktop.nix b/systems/desktop.nix
index 821630f..48eedde 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -12,6 +12,7 @@ in {
   imports = [
     ../programs
     (lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
+    (lib.mkAliasOptionModule ["mainUser"] ["users" "users" username])
   ];
 
   boot = {
@@ -184,18 +185,15 @@ in {
 
   virtualisation.libvirtd.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users = {
-    ${username} = {
-      isNormalUser = true;
-      shell = pkgs.fish;
-      extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
-      hashedPasswordFile = config.age.secrets.userPassword.path;
-    };
-
-    root.hashedPasswordFile = config.age.secrets.rootPassword.path;
+  mainUser = {
+    isNormalUser = true;
+    shell = pkgs.fish;
+    extraGroups = ["networkmanager" "wheel" "video" "libvirtd"];
+    hashedPasswordFile = config.age.secrets.userPassword.path;
   };
 
+  users.users.root.hashedPasswordFile = config.age.secrets.rootPassword.path;
+
   fonts.packages = with pkgs; [
     iosevka
     jetbrains-mono
diff --git a/systems/fuji/default.nix b/systems/fuji/default.nix
index 279266c..eae7bcc 100644
--- a/systems/fuji/default.nix
+++ b/systems/fuji/default.nix
@@ -9,5 +9,5 @@
 
   hm.wayland.windowManager.hyprland.settings.monitor = lib.mkForce ["DP-1,1920x1200@60,0x0,1" "HDMI-A-1,1440x900@60,1920x300,1"];
 
-  users.users.leo.packages = with pkgs; [ryujinx];
+  mainUser.packages = with pkgs; [ryujinx];
 }
diff --git a/systems/kilimandjaro/default.nix b/systems/kilimandjaro/default.nix
index 51540cc..909aa8a 100644
--- a/systems/kilimandjaro/default.nix
+++ b/systems/kilimandjaro/default.nix
@@ -17,7 +17,7 @@
 
   programs.light.enable = true;
 
-  users.users.leo.packages = with pkgs; [
+  mainUser.packages = with pkgs; [
     networkmanagerapplet
     protonvpn-gui
   ];