From b022021c5dcc48ab39aab758487b9236a895a0dc Mon Sep 17 00:00:00 2001
From: George Rawlinson <george@rawlinson.net.nz>
Date: Wed, 8 Aug 2018 20:53:58 +1200
Subject: [PATCH] refactor(music): add ncmpcpp, beets & mpd configuration

---
 README.md                                     |  7 +--
 music/.config/beets/config.yaml               | 51 +++++++++++++++++++
 {mpd => music}/.config/mpd/mpd.conf           |  0
 .../.config/mpd/playlists/Everything.m3u      |  0
 {mpd => music}/.config/mpd/playlists/P4G.m3u  |  0
 {ncmpcpp => music}/.config/ncmpcpp/bindings   |  0
 {ncmpcpp => music}/.config/ncmpcpp/config     |  0
 7 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 music/.config/beets/config.yaml
 rename {mpd => music}/.config/mpd/mpd.conf (100%)
 rename {mpd => music}/.config/mpd/playlists/Everything.m3u (100%)
 rename {mpd => music}/.config/mpd/playlists/P4G.m3u (100%)
 rename {ncmpcpp => music}/.config/ncmpcpp/bindings (100%)
 rename {ncmpcpp => music}/.config/ncmpcpp/config (100%)

diff --git a/README.md b/README.md
index a77edd6..562566e 100644
--- a/README.md
+++ b/README.md
@@ -2,13 +2,13 @@
 
 ```
 bin            > helpful shell scripts
+darktable      > mostly just filters
 git            > global git config & aliases
 gnupg          > utilise gpg-agent for pgp crypto
 lftp           > sftp management
 mail           > mail config - mutt/mbsync/notmuch
-mpd            > music player daemon config
 mpv            > who needs vlc? minimal video player
-ncmpcpp        > ncurses mpc++ ui/colour settings & playlists
+music          > music config - mpd, ncmpcpp, beets
 npm            > npm configuration (ha ha)
 nvim           > neovim config & plugins
 ssh            > safe-ish ssh config
@@ -21,7 +21,8 @@ zsh            > shell, aliases and cool stuff
 
 `git clone https://github.com/grawlinson/dotfiles.git ~/.dotfiles`
 
-Clone repository, then setup as desired using [GNU Stow][url-gnu-stow]. I prefer using the `--no-folding` flag with `stow`.
+Clone repository, then setup as desired using [GNU Stow][url-gnu-stow].
+I prefer using the `--no-folding` flag with `stow`.
 
 ## Caveats
 
diff --git a/music/.config/beets/config.yaml b/music/.config/beets/config.yaml
new file mode 100644
index 0000000..3d7f0cf
--- /dev/null
+++ b/music/.config/beets/config.yaml
@@ -0,0 +1,51 @@
+directory: ~/Music
+
+paths:
+ default: $albumartist/$album%aunique{}/$track - $title
+ singleton: Non-Album/$artist/$title
+ comp: Various Artists/$album%aunique{}/$track - $title
+ albumtype:soundtrack: Various Artists/$album/$track - $title
+
+plugins: scrub fetchart zero mbsync convert discogs
+
+threaded: yes
+
+import:
+ write: yes
+ copy: yes
+ move: no
+ resume: yes
+ quiet_fallback: skip
+
+convert:
+ auto: yes
+ embed: no
+ command: ffmpeg -i $source -y -vn -aq 0 $dest
+ extension: mp3
+ never_convert_lossy_files: yes
+
+autotag: yes
+strong_rec_thresh: 0.1  # match 90% or better for auto-import
+
+art_filename: cover
+
+replace:
+ '[\\/]': ''
+ '^\.': ''
+ '[\x00-\x1f]': ''
+ '[<>:"\?\*\|]': ''
+ '\.$': ''
+ '\s+$': ''
+
+scrub:
+ auto: yes
+
+fetchart:
+ auto: yes
+ maxwidth: 1000
+ cautious: yes
+ cover_names: cover front art album folder
+ sources: itunes amazon *
+
+zero:
+ fields: comments lyrics encoder
diff --git a/mpd/.config/mpd/mpd.conf b/music/.config/mpd/mpd.conf
similarity index 100%
rename from mpd/.config/mpd/mpd.conf
rename to music/.config/mpd/mpd.conf
diff --git a/mpd/.config/mpd/playlists/Everything.m3u b/music/.config/mpd/playlists/Everything.m3u
similarity index 100%
rename from mpd/.config/mpd/playlists/Everything.m3u
rename to music/.config/mpd/playlists/Everything.m3u
diff --git a/mpd/.config/mpd/playlists/P4G.m3u b/music/.config/mpd/playlists/P4G.m3u
similarity index 100%
rename from mpd/.config/mpd/playlists/P4G.m3u
rename to music/.config/mpd/playlists/P4G.m3u
diff --git a/ncmpcpp/.config/ncmpcpp/bindings b/music/.config/ncmpcpp/bindings
similarity index 100%
rename from ncmpcpp/.config/ncmpcpp/bindings
rename to music/.config/ncmpcpp/bindings
diff --git a/ncmpcpp/.config/ncmpcpp/config b/music/.config/ncmpcpp/config
similarity index 100%
rename from ncmpcpp/.config/ncmpcpp/config
rename to music/.config/ncmpcpp/config