diff --git a/users/default.nix b/users/default.nix
index 9a57cbf..3cc8526 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -1,23 +1,20 @@
 {
   pkgs,
   config,
-  user,
-  home,
+  ...
 }:
 {
   home = {
-    username = user.name;
-    homeDirectory = user.home;
-    stateVersion = config.system.stateVersion;
+
     sessionVariables = {
-      XCOMPOSECACHE = "${home.xdg.cacheHome}/X11/xcompos";
+      XCOMPOSECACHE = "${config.xdg.cacheHome}/X11/xcompos";
       XAUTHORITY = "$XDG_RUNTIME_DIR/Xauthority";
-      ANDROID_HOME = "${home.xdg.dataHome}/android";
-      CUDA_CACHE_PATH = "${home.xdg.cacheHome}/nv";
-      GRADLE_USER_HOME = "${home.xdg.dataHome}/gradle";
-      KODI_DATA = "${home.xdg.dataHome}/kodi";
-      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${home.xdg.configHome}/java";
-      WINEPREFIX = "${home.xdg.dataHome}/wine";
+      ANDROID_HOME = "${config.xdg.dataHome}/android";
+      CUDA_CACHE_PATH = "${config.xdg.cacheHome}/nv";
+      GRADLE_USER_HOME = "${config.xdg.dataHome}/gradle";
+      KODI_DATA = "${config.xdg.dataHome}/kodi";
+      _JAVA_OPTIONS = "-Djava.util.prefs.userRoot=${config.xdg.configHome}/java";
+      WINEPREFIX = "${config.xdg.dataHome}/wine";
     };
   };
 
@@ -42,27 +39,27 @@
     };
     gpg = {
       enable = true;
-      homedir = "${home.xdg.dataHome}/gnupg";
+      homedir = "${config.xdg.dataHome}/gnupg";
     };
   };
   xdg = {
     enable = true;
     mime.enable = true;
-    cacheHome = "${home.home.homeDirectory}/.cache";
-    configHome = "${home.home.homeDirectory}/.config";
-    dataHome = "${home.home.homeDirectory}/.local/share";
-    stateHome = "${home.home.homeDirectory}/.local/state";
+    cacheHome = "${config.home.homeDirectory}/.cache";
+    configHome = "${config.home.homeDirectory}/.config";
+    dataHome = "${config.home.homeDirectory}/.local/share";
+    stateHome = "${config.home.homeDirectory}/.local/state";
     userDirs = {
       enable = true;
       createDirectories = true;
-      desktop = "${home.home.homeDirectory}/Desktop";
-      documents = "${home.home.homeDirectory}/Documents";
-      download = "${home.home.homeDirectory}/Downloads";
-      music = "${home.home.homeDirectory}/Music";
-      pictures = "${home.home.homeDirectory}/Pictures";
-      publicShare = "${home.home.homeDirectory}/Public";
-      templates = "${home.home.homeDirectory}/Templates";
-      videos = "${home.home.homeDirectory}/Videos";
+      desktop = "${config.home.homeDirectory}/Desktop";
+      documents = "${config.home.homeDirectory}/Documents";
+      download = "${config.home.homeDirectory}/Downloads";
+      music = "${config.home.homeDirectory}/Music";
+      pictures = "${config.home.homeDirectory}/Pictures";
+      publicShare = "${config.home.homeDirectory}/Public";
+      templates = "${config.home.homeDirectory}/Templates";
+      videos = "${config.home.homeDirectory}/Videos";
     };
   };
 }
diff --git a/users/fp/default.nix b/users/fp/default.nix
index 3650a70..7ac7c85 100644
--- a/users/fp/default.nix
+++ b/users/fp/default.nix
@@ -10,9 +10,12 @@
     isNormalUser = true;
     shell = pkgs.fish;
   };
-  home-manager.users.fp = import ../. {
-    inherit pkgs config;
-    user = config.users.users.fp;
-    home = config.home-manager.users.fp;
+  home-manager.users.fp = {
+    imports = [ ../. ];
+    home = {
+      username = config.users.users.fp.name;
+      homeDirectory = config.users.users.fp.home;
+      stateVersion = config.system.stateVersion;
+    };
   };
 }
diff --git a/users/jopejoe1/default.nix b/users/jopejoe1/default.nix
index f5e3ca1..fd588fc 100644
--- a/users/jopejoe1/default.nix
+++ b/users/jopejoe1/default.nix
@@ -22,23 +22,23 @@
     ];
     uid = 1000;
   };
-  home-manager.users.jopejoe1 =
-    import ../. {
-      inherit pkgs config;
-      user = config.users.users.jopejoe1;
-      home = config.home-manager.users.jopejoe1;
-    }
-    // {
-      programs = {
-        nushell = {
-          enable = true;
-          extraConfig = ''
-            let carapace_completer = {|spans|
-              carapace $spans.0 nushell $spans | from json
-            }
-            $env.config = {
-             show_banner: false,
-             completions: {
+  home-manager.users.jopejoe1 = {
+    imports = [ ../. ];
+    home = {
+      username = config.users.users.jopejoe1.name;
+      homeDirectory = config.users.users.jopejoe1.home;
+      stateVersion = config.system.stateVersion;
+    };
+    programs =
+      nushell = {
+        enable = true;
+        extraConfig = ''
+          let carapace_completer = {|spans|
+            carapace $spans.0 nushell $spans | from json
+          }
+          $env.config = {
+            show_banner: false,
+            completions: {
               case_sensitive: false
               quick: true
               partial: true
@@ -48,9 +48,9 @@
                 max_results: 100
                 completer: $carapace_completer
               }
-             }
             }
-          '';
+          }
+        '';
           shellAliases = {
             vi = "nvim";
             vim = "nvim";
diff --git a/users/root/default.nix b/users/root/default.nix
index 5393389..cc85aed 100644
--- a/users/root/default.nix
+++ b/users/root/default.nix
@@ -7,9 +7,12 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB8oyMpS2hK3gQXyHIIVS6oilgMpemLmfhKKJ6RBMwUh johannes@joens.email"
     ];
   };
-  home-manager.users.root = import ../. {
-    inherit pkgs config;
-    user = config.users.users.root;
-    home = config.home-manager.users.root;
+  home-manager.users.root = {
+    imports = [ ../. ];
+    home = {
+      username = config.users.users.jopejoe1.name;
+      homeDirectory = config.users.users.jopejoe1.home;
+      stateVersion = config.system.stateVersion;
+    };
   };
 }