commit dd3bc0b326548c2a62083f8c1584537f8fd9a955
parent 9c451990cba912afaa35eac90f8d210884aeb8af
Author: Alex Balgavy <alex@balgavy.eu>
Date: Sun, 20 Dec 2020 13:59:08 +0100
Moved out of iTunes
Changed playlist location, and added the second library.
Diffstat:
6 files changed, 92 insertions(+), 5 deletions(-)
diff --git a/lf/lfrc b/lf/lfrc
@@ -262,7 +262,7 @@ map gdp cd ~/Documents/Personal\ documents/
map gD cd ~/Desktop
map gl cd ~/Downloads
map gw cd ~/Dropbox/vimwiki
-map gm cd ~/Music/iTunes/iTunes\ Media/Music
+map gm cd ~/Music/Libraries/Mine
map g/ cd /
map g. cd ~/.dotfiles
map gv cd /Volumes
diff --git a/mpd/mpd.conf b/mpd/mpd.conf
@@ -1,5 +1,5 @@
-music_directory "~/Music/iTunes/iTunes Media/Music"
-playlist_directory "~/.config/mpd/playlists"
+music_directory "~/Music/Libraries/Mine/"
+playlist_directory "~/Music/Playlists/Mine/"
db_file "~/.local/share/mpd/mpd.db"
log_file "~/.local/share/mpd/mpd.log"
pid_file "~/.local/share/mpd/mpd.pid"
diff --git a/mpd/oldies.conf b/mpd/oldies.conf
@@ -0,0 +1,35 @@
+music_directory "~/Music/Libraries/Oldies/"
+playlist_directory "~/Music/Playlists/Oldies/"
+db_file "~/.local/share/mpd/oldies.db"
+log_file "~/.local/share/mpd/oldies.log"
+pid_file "~/.local/share/mpd/oldies.pid"
+state_file "~/.cache/mpd/oldiesstate"
+follow_outside_symlinks "yes"
+follow_inside_symlinks "yes"
+
+audio_output {
+ type "osx"
+ name "CoreAudio"
+ mixer_type "software"
+}
+
+bind_to_address "127.0.0.1"
+port "6601"
+user "alex"
+
+# Visualizer
+audio_output {
+ type "fifo"
+ name "oldies_fifo"
+ path "/tmp/oldiesmpd.fifo"
+ format "44100:16:2"
+ auto_resample "no"
+ use_mmap "yes"
+}
+
+# refresh the database when files in music_directory change
+auto_update "yes"
+auto_update_depth "2"
+
+# don't start playback after startup
+restore_paused "yes"
diff --git a/ncmpcpp/config b/ncmpcpp/config
@@ -2,7 +2,7 @@
ncmpcpp_directory = "~/.config/ncmpcpp"
lyrics_directory = "~/.local/share/lyrics"
-mpd_music_dir = "~/Music/iTunes/iTunes Media/Music"
+mpd_music_dir = "~/Music/Libraries/Mine/"
system_encoding = "utf-8"
mpd_host = "localhost"
diff --git a/ncmpcpp/oldies-config b/ncmpcpp/oldies-config
@@ -0,0 +1,52 @@
+# vim: filetype=conf
+
+ncmpcpp_directory = "~/.config/ncmpcpp"
+lyrics_directory = "~/.local/share/lyrics"
+mpd_music_dir = "~/Music/Libraries/Oldies/"
+system_encoding = "utf-8"
+
+mpd_host = "localhost"
+mpd_port = "6601"
+mpd_connection_timeout = "5"
+message_delay_time = "1"
+
+visualizer_fifo_path = "/tmp/oldiesmpd.fifo"
+visualizer_output_name = "oldies_fifo"
+visualizer_sync_interval = "30"
+visualizer_type = "spectrum"
+
+song_list_format = {$4%a - }{%t}|{$8%f$9}$R{$3(%l)$9}
+song_status_format = $b{{$8"%t"}} $3by {$4%a{ $3in $7%b{ (%y)}} $3}|{$8%f}
+song_library_format = {%t}|{%f}
+alternative_header_first_line_format = $b$1$aqqu$/a$9 {%t}|{%f} $1$atqq$/a$9$/b
+alternative_header_second_line_format = {{$4$b%a$/b$9}{ - $7%b$9}{ ($4%y$9)}{ - $7%g$9}}|{%D}
+current_item_prefix = $(cyan)$r$b
+current_item_suffix = $/r$(end)$/b
+current_item_inactive_column_prefix = $(magenta)$r
+current_item_inactive_column_suffix = $/r$(end)
+
+playlist_display_mode = columns
+playlist_editor_display_mode = columns
+browser_display_mode = columns
+search_engine_display_mode = columns
+
+progressbar_look = ->
+now_playing_prefix = "> "
+modified_item_prefix = "~ "
+media_library_primary_tag = artist
+media_library_albums_split_by_date = no
+startup_screen = "media_library"
+display_volume_level = yes
+display_bitrate = yes
+ignore_leading_the = yes
+external_editor = vim
+selected_item_prefix = "* "
+use_console_editor = yes
+empty_tag_color = magenta
+main_window_color = white
+progressbar_color = black:b
+progressbar_elapsed_color = blue:b
+statusbar_color = red
+statusbar_time_color = cyan:b
+colors_enabled = "yes"
+user_interface = "alternative"
diff --git a/shell/env b/shell/env
@@ -7,7 +7,7 @@ if [ -n "$VIM_TERMINAL" ]; then EDITOR="vimsend"
else EDITOR="$(command -v vim)"; fi
export EDITOR
-export MUSIC_DIR="/Volumes/HDD/Music/iTunes/iTunes Media/Music"
+export MUSIC_DIR="/Volumes/HDD/Music/Libraries/Mine"
export PAGER="less -FRi"