diff --git a/home/terminal/programs/comma.nix b/home/cli/comma.nix
similarity index 100%
rename from home/terminal/programs/comma.nix
rename to home/cli/comma.nix
diff --git a/home/terminal/programs/direnv.nix b/home/cli/direnv.nix
similarity index 100%
rename from home/terminal/programs/direnv.nix
rename to home/cli/direnv.nix
diff --git a/home/terminal/shell/fish.nix b/home/cli/fish.nix
similarity index 100%
rename from home/terminal/shell/fish.nix
rename to home/cli/fish.nix
diff --git a/home/terminal/programs/git.nix b/home/cli/git.nix
similarity index 100%
rename from home/terminal/programs/git.nix
rename to home/cli/git.nix
diff --git a/home/terminal/programs/github.nix b/home/cli/github.nix
similarity index 100%
rename from home/terminal/programs/github.nix
rename to home/cli/github.nix
diff --git a/home/terminal/programs/irssi.nix b/home/cli/irssi.nix
similarity index 100%
rename from home/terminal/programs/irssi.nix
rename to home/cli/irssi.nix
diff --git a/home/terminal/programs/jujutsu.nix b/home/cli/jujutsu.nix
similarity index 100%
rename from home/terminal/programs/jujutsu.nix
rename to home/cli/jujutsu.nix
diff --git a/home/terminal/programs/tmux.nix b/home/cli/tmux.nix
similarity index 100%
rename from home/terminal/programs/tmux.nix
rename to home/cli/tmux.nix
diff --git a/home/terminal/programs/xdg.nix b/home/cli/xdg.nix
similarity index 100%
rename from home/terminal/programs/xdg.nix
rename to home/cli/xdg.nix
diff --git a/home/terminal/shell/zsh.nix b/home/cli/zsh.nix
similarity index 100%
rename from home/terminal/shell/zsh.nix
rename to home/cli/zsh.nix
diff --git a/home/default.nix b/home/default.nix
deleted file mode 100644
index 421a90b..0000000
--- a/home/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  home = {
-    username = "xun";
-    homeDirectory = "/home/xun";
-    extraOutputsToInstall = ["doc" "devdoc"];
-  };
-
-  programs.home-manager.enable = true;
-}
diff --git a/home/programs/desktop/common/fuzzel.nix b/home/desktop/common/fuzzel.nix
similarity index 100%
rename from home/programs/desktop/common/fuzzel.nix
rename to home/desktop/common/fuzzel.nix
diff --git a/home/programs/desktop/common/wl-clipboard.nix b/home/desktop/common/wl-clipboard.nix
similarity index 100%
rename from home/programs/desktop/common/wl-clipboard.nix
rename to home/desktop/common/wl-clipboard.nix
diff --git a/home/programs/desktop/common/wob.nix b/home/desktop/common/wob.nix
similarity index 100%
rename from home/programs/desktop/common/wob.nix
rename to home/desktop/common/wob.nix
diff --git a/home/programs/desktop/sway/default.nix b/home/desktop/sway/default.nix
similarity index 100%
rename from home/programs/desktop/sway/default.nix
rename to home/desktop/sway/default.nix
diff --git a/home/programs/desktop/sway/waybar-workspace.patch b/home/desktop/sway/waybar-workspace.patch
similarity index 100%
rename from home/programs/desktop/sway/waybar-workspace.patch
rename to home/desktop/sway/waybar-workspace.patch
diff --git a/home/programs/desktop/sway/waybar.nix b/home/desktop/sway/waybar.nix
similarity index 100%
rename from home/programs/desktop/sway/waybar.nix
rename to home/desktop/sway/waybar.nix
diff --git a/home/programs/desktop/theme.nix b/home/desktop/theme.nix
similarity index 100%
rename from home/programs/desktop/theme.nix
rename to home/desktop/theme.nix
diff --git a/home/programs/desktop/default.nix b/home/desktop/xdg-portals.nix
similarity index 100%
rename from home/programs/desktop/default.nix
rename to home/desktop/xdg-portals.nix
diff --git a/home/programs/music/beets.nix b/home/programs/beets.nix
similarity index 100%
rename from home/programs/music/beets.nix
rename to home/programs/beets.nix
diff --git a/home/programs/browsers/chromium.nix b/home/programs/chromium.nix
similarity index 92%
rename from home/programs/browsers/chromium.nix
rename to home/programs/chromium.nix
index d85e272..0d83ace 100644
--- a/home/programs/browsers/chromium.nix
+++ b/home/programs/chromium.nix
@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs.chromium = {
     enable = true;
     # package = pkgs.ungoogled-chromium;
diff --git a/home/programs/music/cmus.nix b/home/programs/cmus.nix
similarity index 71%
rename from home/programs/music/cmus.nix
rename to home/programs/cmus.nix
index 7eeeb3f..df567de 100644
--- a/home/programs/music/cmus.nix
+++ b/home/programs/cmus.nix
@@ -2,7 +2,5 @@
   programs.cmus = {
     enable = true;
     theme = "spotify";
-    extraConfig = ''
-    '';
   };
 }
diff --git a/home/programs/misc/discord.nix b/home/programs/discord.nix
similarity index 100%
rename from home/programs/misc/discord.nix
rename to home/programs/discord.nix
diff --git a/home/editors/emacs.nix b/home/programs/emacs.nix
similarity index 100%
rename from home/editors/emacs.nix
rename to home/programs/emacs.nix
diff --git a/home/programs/browsers/firefox/default.nix b/home/programs/firefox/default.nix
similarity index 100%
rename from home/programs/browsers/firefox/default.nix
rename to home/programs/firefox/default.nix
diff --git a/home/programs/browsers/firefox/search-engines.nix b/home/programs/firefox/search-engines.nix
similarity index 100%
rename from home/programs/browsers/firefox/search-engines.nix
rename to home/programs/firefox/search-engines.nix
diff --git a/home/programs/browsers/firefox/userChrome.css b/home/programs/firefox/userChrome.css
similarity index 100%
rename from home/programs/browsers/firefox/userChrome.css
rename to home/programs/firefox/userChrome.css
diff --git a/home/terminal/emulator/foot.nix b/home/programs/foot.nix
similarity index 100%
rename from home/terminal/emulator/foot.nix
rename to home/programs/foot.nix
diff --git a/home/programs/games/jc141.nix b/home/programs/jc141.nix
similarity index 100%
rename from home/programs/games/jc141.nix
rename to home/programs/jc141.nix
diff --git a/home/programs/games/default.nix b/home/programs/mangohud.nix
similarity index 100%
rename from home/programs/games/default.nix
rename to home/programs/mangohud.nix
diff --git a/home/programs/media/mpv.nix b/home/programs/mpv.nix
similarity index 100%
rename from home/programs/media/mpv.nix
rename to home/programs/mpv.nix
diff --git a/home/editors/nvim.nix b/home/programs/nvim.nix
similarity index 100%
rename from home/editors/nvim.nix
rename to home/programs/nvim.nix
diff --git a/home/programs/misc/obs.nix b/home/programs/obs.nix
similarity index 100%
rename from home/programs/misc/obs.nix
rename to home/programs/obs.nix
diff --git a/home/programs/browsers/tor.nix b/home/programs/tor.nix
similarity index 100%
rename from home/programs/browsers/tor.nix
rename to home/programs/tor.nix
diff --git a/home/terminal/emulator/wezterm.nix b/home/programs/wezterm.nix
similarity index 100%
rename from home/terminal/emulator/wezterm.nix
rename to home/programs/wezterm.nix
diff --git a/hosts/hopper/home.nix b/hosts/hopper/home.nix
index 1b02f66..af24cb6 100644
--- a/hosts/hopper/home.nix
+++ b/hosts/hopper/home.nix
@@ -5,16 +5,16 @@
   ...
 }: {
   imports = map (x: homeProfiles + x) [
-    /terminal/programs/xdg.nix
-    /terminal/programs/comma.nix
+    /cli/xdg.nix
+    /cli/comma.nix
 
-    /editors/nvim.nix
-    /terminal/emulator/foot.nix
+    /programs/nvim.nix
+    /programs/foot.nix
 
-    /programs/desktop/default.nix
-    /programs/desktop/sway/default.nix
+    /desktop/xdg-portals.nix
+    /desktop/sway/default.nix
 
-    /programs/media/mpv.nix
+    /programs/mpv.nix
 
     /services/playerctl.nix
     /services/polkit-agent.nix
diff --git a/hosts/nixdesk/home.nix b/hosts/nixdesk/home.nix
index 575c315..4dd5344 100644
--- a/hosts/nixdesk/home.nix
+++ b/hosts/nixdesk/home.nix
@@ -7,33 +7,31 @@
   ...
 }: {
   imports = map (x: homeProfiles + x) [
-    /default.nix
+    /cli/zsh.nix
+    /cli/fish.nix
 
-    /terminal/shell/zsh.nix
-    /terminal/shell/fish.nix
+    /cli/xdg.nix
+    /cli/direnv.nix
+    /cli/tmux.nix
+    /cli/comma.nix
+    /cli/irssi.nix
+    /cli/git.nix
+    /cli/github.nix
+    /cli/jujutsu.nix
 
-    /terminal/programs/xdg.nix
-    /terminal/programs/direnv.nix
-    /terminal/programs/tmux.nix
-    /terminal/programs/comma.nix
-    /terminal/programs/irssi.nix
-    /terminal/programs/git.nix
-    /terminal/programs/github.nix
-    /terminal/programs/jujutsu.nix
+    /programs/nvim.nix
 
-    /editors/nvim.nix
+    /programs/firefox/default.nix
+    /programs/tor.nix
+    /programs/chromium.nix
 
-    /programs/browsers/firefox/default.nix
-    /programs/browsers/tor.nix
-    /programs/browsers/chromium.nix
-
-    /terminal/emulator/foot.nix
+    /programs/foot.nix
 
     /themes/dark/default.nix
 
     # desktop
-    /programs/desktop/default.nix
-    /programs/desktop/sway/default.nix
+    /desktop/xdg-portals.nix
+    /desktop/sway/default.nix
 
     # development
     /develop/common.nix
@@ -51,17 +49,17 @@
     /develop/langs/csharp.nix
 
     # programs
-    /programs/misc/discord.nix
-    /programs/misc/obs.nix
+    /programs/discord.nix
+    /programs/obs.nix
 
-    /programs/music/beets.nix
-    /programs/music/cmus.nix
+    /programs/beets.nix
+    /programs/cmus.nix
 
-    /programs/media/mpv.nix
+    /programs/mpv.nix
 
     # gaming
-    /programs/games/default.nix
-    /programs/games/jc141.nix
+    /programs/mangohud.nix
+    /programs/jc141.nix
 
     /services/playerctl.nix
     /services/polkit-agent.nix
@@ -156,4 +154,12 @@
     inputs.sobercookie.packages.${pkgs.system}.default
     self.packages.${pkgs.system}.krunker
   ];
+
+  home = {
+    username = "xun";
+    homeDirectory = "/home/xun";
+    extraOutputsToInstall = ["doc" "devdoc"];
+  };
+
+  programs.home-manager.enable = true;
 }