hosts: rearrange modules a bit

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>

hosts/default.nix

@@ -3,13 +3,15 @@ let
   inherit (inputs) nixpkgs;
 
   commonModules = [
-    ./modules/nvim
+    ./nvim
     globalArgs
   ];
-  personalModules = [
-    ./modules/xorg.nix
-    ./modules/wayland.nix
-    ./modules/nix.nix
+  desktopModules = [
+    ./xorg.nix
+    ./wayland.nix
+    ./nix.nix
+    ./desktop-pkgs.nix
+    ./sound.nix
   ];
   serverModules = [ ./modules/minimal.nix ];
 in
@@ -22,7 +24,7 @@ in
         ./satori
         { nixpkgs.pkgs = self.legacyPackages.${system}; }
       ]
-      ++ personalModules
+      ++ desktopModules
       ++ commonModules;
     };