diff --git a/modules/core/users.nix b/modules/core/users.nix
index e067604..ed82d92 100644
--- a/modules/core/users.nix
+++ b/modules/core/users.nix
@@ -3,30 +3,31 @@
   config,
   ...
 }: let
+  inherit (lib) mkIf;
   inherit (config.local.systemVars) username;
+  inherit (config.local.homeVars) fullName;
+  inherit (config.local.profiles) desktop;
 in {
-  config = lib.mkIf (!config.local.profiles.server.enable) {
-    users.users.${config.local.systemVars.username} = {
-      isNormalUser = true;
-      description = config.local.homeVars.fullName or "User";
-      extraGroups = [
-        "networkmanager"
-        "audio"
-        "video"
-        "wheel"
-        "plugdev"
-      ];
-    };
+  users.users.${username} = {
+    isNormalUser = true;
+    description = fullName;
+    extraGroups = mkIf desktop.enable [
+      "networkmanager"
+      "audio"
+      "video"
+      "wheel"
+      "plugdev"
+    ];
+  };
 
-    hjem = {
-      clobberByDefault = true;
-      users.${username} = {
-        enable = true;
-        directory = "/home/${username}";
-        user = "${username}";
-        environment = {
-          forceOverride = true;
-        };
+  hjem = mkIf desktop.enable {
+    clobberByDefault = true;
+    users.${username} = {
+      enable = true;
+      directory = "/home/${username}";
+      user = "${username}";
+      environment = {
+        forceOverride = true;
       };
     };
   };