diff --git a/flake.nix b/flake.nix
index e20c038..e5382f0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,7 +43,7 @@
           inherit pkgs;
           extraSpecialArgs = { inherit inputs outputs; };
           modules = [
-            ./home-manager/home.nix
+            ./home-manager/desktop/leonhard.nix
           ];
         };
       };
diff --git a/home-manager/home.nix b/home-manager/base.nix
similarity index 67%
rename from home-manager/home.nix
rename to home-manager/base.nix
index 26dcf68..49ccb88 100644
--- a/home-manager/home.nix
+++ b/home-manager/base.nix
@@ -1,12 +1,9 @@
-# This is your home-manager configuration file
-# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
 {
   inputs,
   outputs,
   ...
 }:
 {
-  # You can import other home-manager modules here
   imports = [
     outputs.homeManagerModules
 
@@ -24,11 +21,6 @@
     };
   };
 
-  home = {
-    username = "leonhard";
-    homeDirectory = "/home/leonhard";
-  };
-
   programs.home-manager.enable = true;
 
   # Nicely reload system units when changing configs
diff --git a/home-manager/desktop/leonhard.nix b/home-manager/desktop/leonhard.nix
new file mode 100644
index 0000000..9ba8da1
--- /dev/null
+++ b/home-manager/desktop/leonhard.nix
@@ -0,0 +1,15 @@
+{
+  inputs,
+  outputs,
+  ...
+}:
+{
+  imports = [
+    (import ../base.nix { inherit inputs outputs; })
+  ];
+
+  home = {
+    username = "leonhard";
+    homeDirectory = "/home/leonhard";
+  };
+}