diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index e111d8a..0a9184f 100755
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -44,15 +44,12 @@
     ../../modules/home-manager/sbb-tui.nix # cff TUI app
     ../../modules/home-manager/mullvad.nix # mullvad vpn
 
-    ../../modules/other/desktopEntries.nix # creates .desktop files
+    ../../modules/home-manager/other/desktopEntries.nix # creates .desktop files
+    ../../modules/homer-manager/other/user.nix
   ];
 
-
   # Required for Home Manager
-  home.username = "tomasr";
-  home.homeDirectory = "/home/tomasr";
   home.stateVersion = "25.11"; # match your Home Manager release
-
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
   # introduces backwards incompatible changes.
@@ -61,11 +58,6 @@
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
 
-  home.sessionVariables = {
-    EDITOR = "neovim";
-    TERMINAL = "kitty";
-  };
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
 }
diff --git a/modules/other/desktopEntries.nix b/modules/home-manager/other/desktopEntries.nix
similarity index 100%
rename from modules/other/desktopEntries.nix
rename to modules/home-manager/other/desktopEntries.nix
diff --git a/modules/home-manager/other/user.nix b/modules/home-manager/other/user.nix
new file mode 100644
index 0000000..5e66367
--- /dev/null
+++ b/modules/home-manager/other/user.nix
@@ -0,0 +1,12 @@
+{
+  ...
+}:
+{
+  home.username = "tomasr";
+  home.homeDirectory = "/home/tomasr";
+
+  home.sessionVariables = {
+    EDITOR = "neovim";
+    TERMINAL = "kitty";
+  };
+}