1 files changed, 5 insertions, 131 deletions
diff --git a/modules/music/default.home.nix b/modules/music/default.home.nix
index 10c91bc..ac4f9d6 100644
--- a/modules/music/default.home.nix
+++ b/modules/music/default.home.nix
@@ -1,133 +1,7 @@
-{ config, pkgs, ... }@moduleAttrs:
-let
-  cfg = import ./config.nix moduleAttrs;
-in
+{ ... }:
 {
-  home.packages = with pkgs; [ mpc_cli playerctl ];
-
-  services.mopidy = {
-    enable = true;
-    extensionPackages = with pkgs; [
-      mopidy-mpd
-      mopidy-mpris
-      mopidy-spotify
-      mopidy-iris
-      # mopidy-ytmusic
-    ];
-    settings = {
-      core = {
-        restore_state = true;
-      };
-      file = {
-        enabled = true;
-        media_dirs = [ cfg.mpd.musicDir ];
-        show_dotfiles = false;
-      };
-      m3u = {
-        enabled = true;
-        playlists_dir = cfg.mpd.playlistDir;
-      };
-      audio = {
-        mixer = "software";
-        output = "autoaudiosink";
-      };
-      mpris = {
-        enabled = true;
-        bus_type = "session";
-      };
-      mpd = {
-        enabled = true;
-        hostname = cfg.mpd.host;
-        port = cfg.mpd.port;
-        max_connections = 20;
-        connection_timeout = 60;
-      };
-      http = {
-        enabled = true;
-        hostname = "0.0.0.0";
-        port = cfg.mopidyHttpPort;
-        default_app = "iris";
-      };
-      softwaremixer.enabled = true;
-      stream.enabled = true;
-      spotify = (import ./spotify.private.nix) // {
-        timeout = 20000;
-        bitrate = 320;
-        cache_size = 32 * 1024;
-      };
-      # ytmusic = {
-      #   enabled = true;
-      #   oauth_json = "~/.local/share/mopidy/ytmusic-auth.json";
-      # };
-    };
-  };
-
-  programs.ncmpcpp = {
-    enable = true;
-    package = pkgs.ncmpcpp;
-
-    bindings = with builtins; let
-      toBinding = s: let get = elemAt s; in { key = get 0; command = get 1; };
-    in
-    map toBinding [
-      [ "h" [ "previous_column" "master_screen" "jump_to_parent_directory" ] ]
-      [ "l" [ "next_column" "slave_screen" "enter_directory" ] ]
-      [ "k" "scroll_up" ]
-      [ "j" "scroll_down" ]
-      [ "g" "page_up" ]
-      [ "G" "page_down" ]
-      [ "d" "delete_playlist_items" ]
-      [ "n" "next_found_item" ]
-      [ "N" "previous_found_item" ]
-      [ "P" "show_playlist_editor" ]
-      [ "B" "show_browser" ]
-      [ "s" "show_search_engine" ]
-      [ "S" "show_search_engine" ]
-      [ "8" "show_visualizer" ]
-      [ "ctrl-s" "save_playlist" ]
-      [ "c" "clear_main_playlist" ]
-      [ "ctrl-l" "show_lyrics" ]
-    ];
-
-    settings = {
-      user_interface = "alternative";
-      playlist_display_mode = "columns";
-      browser_display_mode = "columns";
-      playlist_editor_display_mode = "classic";
-
-      empty_tag_color = "magenta";
-      header_window_color = "magenta";
-      volume_color = "cyan";
-      state_line_color = "magenta";
-      state_flags_color = "magenta:b";
-      color1 = "white";
-      color2 = "magenta";
-      main_window_color = "white";
-      progressbar_color = "black:b";
-      progressbar_elapsed_color = "magenta:b";
-      statusbar_color = "magenta";
-      statusbar_time_color = "magenta:b";
-      player_state_color = "magenta:b";
-      alternative_ui_separator_color = "magenta";
-      window_border_color = "magenta";
-      active_window_border = "red";
-
-      progressbar_look = "=>-";
-      now_playing_prefix = "$(blue)$b";
-      now_playing_suffix = "$/b$(end)";
-      current_item_prefix = "$(magenta)$r$b";
-      current_item_suffix = "$/r$(end)$/b";
-      current_item_inactive_column_prefix = "$(white)$r";
-      current_item_inactive_column_suffix = "$/r$(end)";
-
-      media_library_primary_tag = "album_artist";
-      media_library_albums_split_by_date = "no";
-      startup_screen = "browser";
-      ignore_leading_the = "yes";
-      display_volume_level = "no";
-      external_editor = "sensible-editor";
-      use_console_editor = "yes";
-      mouse_support = "yes";
-    };
-  };
+  imports = [
+    ./mpd.home.nix
+    ./client.home.nix
+  ];
 }