diff --git a/home/aly.nix b/home/alacritty/default.nix
similarity index 59%
rename from home/aly.nix
rename to home/alacritty/default.nix
index 0c86904e..311f553f 100644
--- a/home/aly.nix
+++ b/home/alacritty/default.nix
@@ -1,32 +1,6 @@
 { config, pkgs, ... }:
 
 {
-    imports = [
-        ./gnome.nix
-        ./shell
-        ./hypr
-        ./waybar
-        ./mako
-        ./bemenu
-    ];
-
-    home.username = "aly";
-    home.homeDirectory = "/home/aly";
-
-    home.stateVersion = "23.11";
-    programs.home-manager.enable = true;
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        # warp-terminal
-        discord
-        github-desktop
-        obsidian
-        vscode
-    ];
-
-    services.syncthing.enable = true;
-
     programs.alacritty = {
         enable = true;
         settings = {
diff --git a/home/aly-gnome.nix b/home/aly-gnome.nix
new file mode 100644
index 00000000..8204755e
--- /dev/null
+++ b/home/aly-gnome.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, ... }:
+
+{
+    imports = [
+        ./common.nix
+        ./gnome
+        ./alacritty
+    ];
+
+    # Packages that should be installed to the user profile.
+    home.packages = with pkgs; [
+        # warp-terminal
+        discord
+        github-desktop
+        obsidian
+        vscode
+    ];
+}
diff --git a/home/aly-hyprland.nix b/home/aly-hyprland.nix
new file mode 100644
index 00000000..0356dfa0
--- /dev/null
+++ b/home/aly-hyprland.nix
@@ -0,0 +1,22 @@
+{ config, pkgs, ... }:
+
+{
+    imports = [
+        ./common.nix
+        ./shell
+        ./hypr
+        ./waybar
+        ./mako
+        ./bemenu
+        ./alacritty
+    ];
+
+    # Packages that should be installed to the user profile.
+    home.packages = with pkgs; [
+        # warp-terminal
+        discord
+        github-desktop
+        obsidian
+        vscode
+    ];
+}
diff --git a/home/aly-kde.nix b/home/aly-kde.nix
new file mode 100644
index 00000000..98c99553
--- /dev/null
+++ b/home/aly-kde.nix
@@ -0,0 +1,17 @@
+{ config, pkgs, ... }:
+
+{
+    imports = [
+        ./common.nix
+        ./alacritty
+    ];
+
+    # Packages that should be installed to the user profile.
+    home.packages = with pkgs; [
+        # warp-terminal
+        discord
+        github-desktop
+        obsidian
+        vscode
+    ];
+}
diff --git a/home/aly-nox.nix b/home/aly-nox.nix
new file mode 100644
index 00000000..5dd978f2
--- /dev/null
+++ b/home/aly-nox.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+    imports = [
+        ./common.nix
+        ./shell
+    ];
+}
diff --git a/home/common.nix b/home/common.nix
new file mode 100644
index 00000000..130eb23a
--- /dev/null
+++ b/home/common.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+    home.username = "aly";
+    home.homeDirectory = "/home/aly";
+
+    home.stateVersion = "23.11";
+    programs.home-manager.enable = true;
+
+    services.syncthing.enable = true;
+}
diff --git a/home/gnome.nix b/home/gnome/default.nix
similarity index 100%
rename from home/gnome.nix
rename to home/gnome/default.nix
diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix
index 89579066..e4753be2 100644
--- a/hosts/lavaridge/default.nix
+++ b/hosts/lavaridge/default.nix
@@ -39,6 +39,8 @@
   # nixpkgs.config.chromium.commandLineArgs = "--ozone-platform=wayland";
   # environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
+  home-manager.users.aly = import ../../home/aly-kde.nix;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix
index b2320afc..5d40e4f4 100644
--- a/hosts/mauville/default.nix
+++ b/hosts/mauville/default.nix
@@ -39,6 +39,8 @@
       driversi686Linux.amdvlk
     ];
   };
+
+  home-manager.users.aly = import ../../home/aly-kde.nix;
   
   system.stateVersion = "23.11";
 }
diff --git a/hosts/petalburg/default.nix b/hosts/petalburg/default.nix
index 18c02fa7..79e9475b 100644
--- a/hosts/petalburg/default.nix
+++ b/hosts/petalburg/default.nix
@@ -77,6 +77,8 @@ in {
   powerManagement.powertop.enable = true;
   services.thermald.enable = true;
 
+  home-manager.users.aly = import ../../home/aly-hyprland.nix;
+
   environment.systemPackages = [ cs-adjuster cs-adjuster-plasma pp-adjuster ];
 
   # This value determines the NixOS release from which the default
diff --git a/hosts/rustboro/default.nix b/hosts/rustboro/default.nix
index 1baa280a..da917e7b 100644
--- a/hosts/rustboro/default.nix
+++ b/hosts/rustboro/default.nix
@@ -23,6 +23,8 @@
 
   powerManagement.cpuFreqGovernor = "ondemand";
 
+  home-manager.users.aly = import ../../home/aly-hyprland.nix;
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/users/aly.nix b/users/aly.nix
index b6485d7f..d5b517c0 100644
--- a/users/aly.nix
+++ b/users/aly.nix
@@ -7,6 +7,4 @@
     description = "Aly Raffauf";
     extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" "video" ];
   };
-
-  home-manager.users.aly = import ../home/aly.nix;
 }