diff --git a/users/guanranwang/home-manager/nixos/dotfiles.nix b/users/guanranwang/home-manager/nixos/dotfiles.nix
index 94cb3af..bedf4ad 100644
--- a/users/guanranwang/home-manager/nixos/dotfiles.nix
+++ b/users/guanranwang/home-manager/nixos/dotfiles.nix
@@ -9,21 +9,16 @@ in {
       source = "${configPath}/fontconfig";
       recursive = true;
     };
-    "hypr" = {
-      source = "${configPath}/hyprland";
-      recursive = true;
-    };
-    "picom" = {
-      source = "${configPath}/picom";
-      recursive = true;
-    };
-
-    "makepkgs.conf" = {
-      source = "${configPath}/makepkgs.conf";
-    };
-    "alsoft.conf" = {
-      source = "${configPath}/alsoft.conf";
-    };
+    #"picom" = {
+    #  source = "${configPath}/picom";
+    #  recursive = true;
+    #};
+    #"makepkgs.conf" = {
+    #  source = "${configPath}/makepkgs.conf";
+    #};
+    #"alsoft.conf" = {
+    #  source = "${configPath}/alsoft.conf";
+    #};
   };
 
   xdg.dataFile = {
@@ -31,10 +26,6 @@ in {
       source = "${dataPath}/backgrounds";
       recursive = true;
     };
-    "icons" = {
-      source = "${dataPath}/icons";
-      recursive = true;
-    };
     #"flatpak" = {
     #  source = "${dataPath}/flatpak";
     #  recursive = true;
diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix
index 1e622fa..6d196e0 100644
--- a/users/guanranwang/home-manager/nixos/home.nix
+++ b/users/guanranwang/home-manager/nixos/home.nix
@@ -81,49 +81,9 @@
         #gnome-tweaks
         #gnome-software
         #gnome-shell-extensions
-      ])
-      ++ (with pkgs.gnomeExtensions; [
-        # GNOME extensions
-        #arcmenu
-        #appindicator
-        #blur-my-shell
-        #caffeine
-        #dash-to-panel
-        #dash-to-dock
-        #gamemode # outdated
-        #just-perfection
-        #kimpanel
       ]);
   };
 
-  wayland.windowManager = {
-    hyprland = {
-      #enable = true;
-      enableNvidiaPatches = true;
-      xwayland.enable = true;
-      plugins = [
-        #inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
-      ];
-
-      extraConfig = ''
-        #source = ~/.config/hypr/themes/mocha.conf
-        #source = ~/.config/hypr/themes/colors.conf
-        #source = ~/.config/hypr/plugins.conf
-        source = ~/.config/hypr/main.conf
-        source = ~/.config/hypr/keybinds.conf
-        source = ~/.config/hypr/autostart.conf
-        source = ~/.config/hypr/env.conf
-      '';
-    };
-  };
-
-  #xsession = {
-  #  enable = true;
-  #  windowManager.bspwm = {
-  #    enable = true;
-  #  };
-  #};
-
   #programs.boxxy = {
   #  enable = true;
   #  #rules = {
diff --git a/users/guanranwang/home-manager/nixos/presets/desktop.nix b/users/guanranwang/home-manager/nixos/presets/desktop.nix
index a53f2c7..b90ebe8 100644
--- a/users/guanranwang/home-manager/nixos/presets/desktop.nix
+++ b/users/guanranwang/home-manager/nixos/presets/desktop.nix
@@ -10,14 +10,13 @@
     ../../resources/browser/chromium.nix
     ../../resources/browser/librewolf.nix
 
-    ../home.nix
+    ../../resources/wm/sway.nix
 
+    ../xdg
+    ../home.nix
     ../dotfiles.nix
     ../fonts.nix
     ../i18n.nix
     ../theme.nix
-
-    ../wm
-    ../xdg
   ];
 }
diff --git a/users/guanranwang/home-manager/nixos/wm/default.nix b/users/guanranwang/home-manager/nixos/wm/default.nix
deleted file mode 100644
index 1e9b1ec..0000000
--- a/users/guanranwang/home-manager/nixos/wm/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{...}: {
-  imports = [
-    ./dunst.nix
-    ./rofi.nix
-    ./sway.nix
-    ./swayidle.nix
-    ./swaylock.nix
-    ./udiskie.nix
-    ./waybar.nix
-  ];
-}
diff --git a/users/guanranwang/home-manager/resources/wm/bspwm.nix b/users/guanranwang/home-manager/resources/wm/bspwm.nix
new file mode 100644
index 0000000..0cf950b
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/wm/bspwm.nix
@@ -0,0 +1,9 @@
+{...}: {
+  # TODO
+  xsession = {
+    enable = true;
+    windowManager.bspwm = {
+      enable = true;
+    };
+  };
+}
diff --git a/users/guanranwang/home-manager/nixos/wm/dunst.nix b/users/guanranwang/home-manager/resources/wm/components/dunst.nix
similarity index 84%
rename from users/guanranwang/home-manager/nixos/wm/dunst.nix
rename to users/guanranwang/home-manager/resources/wm/components/dunst.nix
index d775215..da58dcd 100644
--- a/users/guanranwang/home-manager/nixos/wm/dunst.nix
+++ b/users/guanranwang/home-manager/resources/wm/components/dunst.nix
@@ -23,4 +23,9 @@
       urgency_critical.frame_color = "#fab387";
     };
   };
+
+  xdg.dataFile."icons/dunst" = {
+    source = ../../dotfiles/data/icons/dunst;
+    recursive = true;
+  };
 }
diff --git a/users/guanranwang/home-manager/nixos/wm/rofi.nix b/users/guanranwang/home-manager/resources/wm/components/rofi.nix
similarity index 86%
rename from users/guanranwang/home-manager/nixos/wm/rofi.nix
rename to users/guanranwang/home-manager/resources/wm/components/rofi.nix
index 7e92289..5a4402e 100644
--- a/users/guanranwang/home-manager/nixos/wm/rofi.nix
+++ b/users/guanranwang/home-manager/resources/wm/components/rofi.nix
@@ -10,7 +10,7 @@
 
   # Yes, because I have no idea how to use programs.rofi.theme
   xdg.configFile."rofi" = {
-    source = ../../resources/dotfiles/config/rofi;
+    source = ../../dotfiles/config/rofi;
     recursive = true;
   };
 }
diff --git a/users/guanranwang/home-manager/nixos/wm/swayidle.nix b/users/guanranwang/home-manager/resources/wm/components/swayidle.nix
similarity index 100%
rename from users/guanranwang/home-manager/nixos/wm/swayidle.nix
rename to users/guanranwang/home-manager/resources/wm/components/swayidle.nix
diff --git a/users/guanranwang/home-manager/nixos/wm/swaylock.nix b/users/guanranwang/home-manager/resources/wm/components/swaylock.nix
similarity index 100%
rename from users/guanranwang/home-manager/nixos/wm/swaylock.nix
rename to users/guanranwang/home-manager/resources/wm/components/swaylock.nix
diff --git a/users/guanranwang/home-manager/resources/wm/components/swww.nix b/users/guanranwang/home-manager/resources/wm/components/swww.nix
new file mode 100644
index 0000000..089d0e7
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/wm/components/swww.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [swww];
+}
diff --git a/users/guanranwang/home-manager/nixos/wm/udiskie.nix b/users/guanranwang/home-manager/resources/wm/components/udiskie.nix
similarity index 100%
rename from users/guanranwang/home-manager/nixos/wm/udiskie.nix
rename to users/guanranwang/home-manager/resources/wm/components/udiskie.nix
diff --git a/users/guanranwang/home-manager/nixos/wm/waybar.nix b/users/guanranwang/home-manager/resources/wm/components/waybar.nix
similarity index 100%
rename from users/guanranwang/home-manager/nixos/wm/waybar.nix
rename to users/guanranwang/home-manager/resources/wm/components/waybar.nix
diff --git a/users/guanranwang/home-manager/resources/wm/gnome.nix b/users/guanranwang/home-manager/resources/wm/gnome.nix
new file mode 100644
index 0000000..0b15508
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/wm/gnome.nix
@@ -0,0 +1,15 @@
+# why is this placed in ./wm
+{pkgs, ...}: {
+  home.packages = with pkgs.gnomeExtensions; [
+    # GNOME extensions
+    arcmenu
+    appindicator
+    blur-my-shell
+    caffeine
+    dash-to-panel
+    dash-to-dock
+    gamemode # outdated
+    just-perfection
+    kimpanel
+  ];
+}
diff --git a/users/guanranwang/home-manager/resources/wm/hyprland.nix b/users/guanranwang/home-manager/resources/wm/hyprland.nix
new file mode 100644
index 0000000..ccc4568
--- /dev/null
+++ b/users/guanranwang/home-manager/resources/wm/hyprland.nix
@@ -0,0 +1,41 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  imports = [
+    ./components/dunst.nix
+    ./components/rofi.nix
+    ./components/swayidle.nix
+    ./components/swaylock.nix
+    ./components/swww.nix
+    ./components/udiskie.nix
+    ./components/waybar.nix
+  ];
+
+  wayland.windowManager = {
+    hyprland = {
+      enable = true;
+      enableNvidiaPatches = true;
+      xwayland.enable = true;
+      plugins = [
+        #inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix
+      ];
+
+      extraConfig = ''
+        #source = ~/.config/hypr/themes/mocha.conf
+        #source = ~/.config/hypr/themes/colors.conf
+        #source = ~/.config/hypr/plugins.conf
+        source = ~/.config/hypr/main.conf
+        source = ~/.config/hypr/keybinds.conf
+        source = ~/.config/hypr/autostart.conf
+        source = ~/.config/hypr/env.conf
+      '';
+    };
+  };
+
+  xdg.configFile."hypr" = {
+    source = ../dotfiles/config/hyprland;
+    recursive = true;
+  };
+}
diff --git a/users/guanranwang/home-manager/nixos/wm/sway.nix b/users/guanranwang/home-manager/resources/wm/sway.nix
similarity index 96%
rename from users/guanranwang/home-manager/nixos/wm/sway.nix
rename to users/guanranwang/home-manager/resources/wm/sway.nix
index 6049cd7..e453109 100644
--- a/users/guanranwang/home-manager/nixos/wm/sway.nix
+++ b/users/guanranwang/home-manager/resources/wm/sway.nix
@@ -4,6 +4,15 @@
   lib,
   ...
 }: {
+  imports = [
+    ./components/dunst.nix
+    ./components/rofi.nix
+    ./components/swayidle.nix
+    ./components/swaylock.nix
+    ./components/udiskie.nix
+    ./components/waybar.nix
+  ];
+
   programs.fish.loginShellInit = ''
     if test -z "$Display" -a "$XDG_VTNR" = 1
       exec sway