minimise nesting in /home

home/default.nix

@@ -1,9 +0,0 @@
-{
-  home = {
-    username = "xun";
-    homeDirectory = "/home/xun";
-    extraOutputsToInstall = ["doc" "devdoc"];
-  };
-
-  programs.home-manager.enable = true;
-}

home/programs/chromium.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{
   programs.chromium = {
     enable = true;
     # package = pkgs.ungoogled-chromium;

home/programs/cmus.nix

@@ -2,7 +2,5 @@
   programs.cmus = {
     enable = true;
     theme = "spotify";
-    extraConfig = ''
-    '';
   };
 }

hosts/hopper/home.nix

@@ -5,16 +5,16 @@
   ...
 }: {
   imports = map (x: homeProfiles + x) [
-    /terminal/programs/xdg.nix
+    /cli/xdg.nix
-    /terminal/programs/comma.nix
+    /cli/comma.nix
 
-    /editors/nvim.nix
+    /programs/nvim.nix
-    /terminal/emulator/foot.nix
+    /programs/foot.nix
 
-    /programs/desktop/default.nix
+    /desktop/xdg-portals.nix
-    /programs/desktop/sway/default.nix
+    /desktop/sway/default.nix
 
-    /programs/media/mpv.nix
+    /programs/mpv.nix
 
     /services/playerctl.nix
     /services/polkit-agent.nix

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
+    /cli/xdg.nix
-    /terminal/shell/fish.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
+    /programs/nvim.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
 
-    /editors/nvim.nix
+    /programs/firefox/default.nix
+    /programs/tor.nix
+    /programs/chromium.nix
 
-    /programs/browsers/firefox/default.nix
+    /programs/foot.nix
-    /programs/browsers/tor.nix
-    /programs/browsers/chromium.nix
-
-    /terminal/emulator/foot.nix
 
     /themes/dark/default.nix
 
     # desktop
-    /programs/desktop/default.nix
+    /desktop/xdg-portals.nix
-    /programs/desktop/sway/default.nix
+    /desktop/sway/default.nix
 
     # development
     /develop/common.nix
@@ -51,17 +49,17 @@
     /develop/langs/csharp.nix
 
     # programs
-    /programs/misc/discord.nix
+    /programs/discord.nix
-    /programs/misc/obs.nix
+    /programs/obs.nix
 
-    /programs/music/beets.nix
+    /programs/beets.nix
-    /programs/music/cmus.nix
+    /programs/cmus.nix
 
-    /programs/media/mpv.nix
+    /programs/mpv.nix
 
     # gaming
-    /programs/games/default.nix
+    /programs/mangohud.nix
-    /programs/games/jc141.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;
 }