diff --git a/desktop/default.nix b/desktop/default.nix
deleted file mode 100644
index 272996d7..00000000
--- a/desktop/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ pkgs, ... }:
-
-{
-  imports = [
-    ./dual-function-keys
-    ./dunst
-    ./fcitx5-mozc
-    ./fonts
-    ./hyprland
-    ./pipewire
-    ./rofi
-    ./stylix
-    ./swaylock
-    ./waybar
-    ./xdg-user-dirs
-  ];
-
-  environment.systemPackages = with pkgs; [
-    grim
-    slurp
-    wl-clipboard
-    lnch
-    wev
-    swww
-    kickoff
-    greetd.tuigreet
-    (pkgs.callPackage ../packages/nwg-dock { })
-  ];
-
-  services.greetd = {
-    enable = true;
-    restart = false;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
-        user = "greeter";
-      };
-      initial_session = {
-        command = "${pkgs.hyprland}/bin/Hyprland";
-        user = "user";
-      };
-    };
-  };
-
-  zramSwap.enable = true;
-}
diff --git a/modules/default.nix b/modules/default.nix
index 6e872a6f..455ac82e 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -17,6 +17,18 @@
     ./ncmpcpp
     ./neovim
     ./joshuto
+
+    ./dual-function-keys
+    ./dunst
+    ./fcitx5-mozc
+    ./fonts
+    ./hyprland
+    ./pipewire
+    ./rofi
+    ./stylix
+    ./swaylock
+    ./waybar
+    ./xdg-user-dirs
   ];
 
   virtualisation.vmware.host = {
@@ -105,6 +117,16 @@
     tessen
     wtype
     mtr
+
+    grim
+    slurp
+    wl-clipboard
+    lnch
+    wev
+    swww
+    kickoff
+    greetd.tuigreet
+    (pkgs.callPackage ../packages/nwg-dock { })
   ];
 
   home-manager.sharedModules = [{
@@ -116,4 +138,21 @@
     package = pkgs."htop-vim";
     settings = { tree_view = 1; };
   };
+
+  services.greetd = {
+    enable = true;
+    restart = false;
+    settings = {
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
+        user = "greeter";
+      };
+      initial_session = {
+        command = "${pkgs.hyprland}/bin/Hyprland";
+        user = "user";
+      };
+    };
+  };
+
+  zramSwap.enable = true;
 }
diff --git a/desktop/dual-function-keys/default.nix b/modules/dual-function-keys/default.nix
similarity index 100%
rename from desktop/dual-function-keys/default.nix
rename to modules/dual-function-keys/default.nix
diff --git a/desktop/dunst/default.nix b/modules/dunst/default.nix
similarity index 100%
rename from desktop/dunst/default.nix
rename to modules/dunst/default.nix
diff --git a/desktop/fcitx5-mozc/default.nix b/modules/fcitx5-mozc/default.nix
similarity index 100%
rename from desktop/fcitx5-mozc/default.nix
rename to modules/fcitx5-mozc/default.nix
diff --git a/desktop/fonts/default.nix b/modules/fonts/default.nix
similarity index 100%
rename from desktop/fonts/default.nix
rename to modules/fonts/default.nix
diff --git a/desktop/hyprland/default.nix b/modules/hyprland/default.nix
similarity index 100%
rename from desktop/hyprland/default.nix
rename to modules/hyprland/default.nix
diff --git a/desktop/hyprland/tags.sh b/modules/hyprland/tags.sh
similarity index 100%
rename from desktop/hyprland/tags.sh
rename to modules/hyprland/tags.sh
diff --git a/desktop/pipewire/default.nix b/modules/pipewire/default.nix
similarity index 100%
rename from desktop/pipewire/default.nix
rename to modules/pipewire/default.nix
diff --git a/desktop/rofi/default.nix b/modules/rofi/default.nix
similarity index 100%
rename from desktop/rofi/default.nix
rename to modules/rofi/default.nix
diff --git a/desktop/rofi/launchpad.rasi b/modules/rofi/launchpad.rasi
similarity index 100%
rename from desktop/rofi/launchpad.rasi
rename to modules/rofi/launchpad.rasi
diff --git a/desktop/stylix/default.nix b/modules/stylix/default.nix
similarity index 100%
rename from desktop/stylix/default.nix
rename to modules/stylix/default.nix
diff --git a/desktop/stylix/wallpaper.png b/modules/stylix/wallpaper.png
similarity index 100%
rename from desktop/stylix/wallpaper.png
rename to modules/stylix/wallpaper.png
diff --git a/desktop/swaylock/default.nix b/modules/swaylock/default.nix
similarity index 100%
rename from desktop/swaylock/default.nix
rename to modules/swaylock/default.nix
diff --git a/desktop/waybar/default.nix b/modules/waybar/default.nix
similarity index 100%
rename from desktop/waybar/default.nix
rename to modules/waybar/default.nix
diff --git a/desktop/xdg-user-dirs/default.nix b/modules/xdg-user-dirs/default.nix
similarity index 100%
rename from desktop/xdg-user-dirs/default.nix
rename to modules/xdg-user-dirs/default.nix