i3/desktop: Split out

hm/desktop/default.nix

@@ -5,9 +5,13 @@ let
 in
 {
   imports = [
+    ./audio
     ./frobar
     ./i3.nix
+    ./lock
+    ./mpd
     ./qutebrowser.nix
+    ./screenshots
   ];
   config = lib.mkIf config.frogeye.desktop.xorg {
     xsession = {
@@ -154,9 +158,6 @@ in
         publicShare = null;
         templates = null;
         videos = "${config.home.homeDirectory}/Vidéos";
-        extraConfig = {
-          XDG_SCREENSHOTS_DIR = "${config.home.homeDirectory}/Screenshots";
-        };
       };
       configFile = {
         "pulse/client.conf" = {
@@ -222,17 +223,6 @@ in
               };
             };
         };
-      mpd = {
-        enable = true;
-        network = {
-          listenAddress = "0.0.0.0"; # So it can be controlled from home
-          # TODO ... and whoever is the Wi-Fi network I'm using, which, not great
-          startWhenNeeded = true;
-        };
-        extraConfig = ''
-          restore_paused "yes"
-        '';
-      };
       autorandr.enable = true;
     };
 
@@ -249,11 +239,6 @@ in
         # remote
         tigervnc
 
-        # music
-        mpc-cli
-        ashuffle
-        vimpc
-
         # multimedia common
         gimp
         inkscape