8 files changed, 28 insertions, 30 deletions
diff --git a/beets/.config/beets/config.yaml b/beets/.config/beets/config.yaml
index acd3a65..dfa5d9f 100644
--- a/beets/.config/beets/config.yaml
+++ b/beets/.config/beets/config.yaml
@@ -8,7 +8,7 @@ import:
   log: ~/.cache/beets.log
   resume: ask
 
-plugins: fetchart lastgenre ftintitle convert albumtypes embedart mbsync missing edit unimported VGMplug playlist scrub lyrics zero replaygain
+plugins: fetchart lastgenre ftintitle convert albumtypes embedart mbsync missing edit unimported VGMplug playlist scrub lyrics zero replaygain info
 
 # albumtypes
 paths:
@@ -19,18 +19,15 @@ paths:
 
 convert:
   dest: ~/audio/music-phone
-    #copy_album_art: yes
-    #  never_convert_lossy_files: yes
-
-    #album_art_maxwidth: 256
+  copy_album_art: yes
+  # album_art_maxwidth: 512
   embed: no
   max_bitrate: 1
   format: opus
-  quiet: true
+  # quiet: true
   formats:
     opus:
-      command: /media/wdblue/audio/music-phone/convert-to-opus-if-not-blacklisted.sh "$source" "$dest"
-        #extension: opus
+      command: ffmpeg -i "$source" "$dest"
 
 embedart:
   auto: no
@@ -42,7 +39,7 @@ fetchart:
 playlist:
   auto: yes
   relative_to: ~/audio/music
-  playlist_dir: ~/sync/playlists
+  playlist_dir: ~/audio/playlists
 
 ftintitle:
   drop: yes
diff --git a/mpd/.config/mpd/mpd.conf b/mpd/.config/mpd/mpd.conf
index 47018e4..661cd2e 100644
--- a/mpd/.config/mpd/mpd.conf
+++ b/mpd/.config/mpd/mpd.conf
@@ -18,8 +18,8 @@ music_directory		"~/audio/music"
 # playlist files not created by the server but only if they are in the MPD
 # format. This setting defaults to playlist saving being disabled.
 #
-playlist_directory		"~/audio/music/playlists"
-#
+playlist_directory		"~/audio/playlists"
+
 # This setting sets the location of the MPD database. This file is used to
 # load the database at server start up and store the database while the
 # server is not up. This setting defaults to disabled which will allow
diff --git a/mpv/.config/mpv/mpv.conf b/mpv/.config/mpv/mpv.conf
index 29d2a3d..53807de 100644
--- a/mpv/.config/mpv/mpv.conf
+++ b/mpv/.config/mpv/mpv.conf
@@ -1,8 +1,9 @@
 audio-file-auto=fuzzy
 sub-auto=fuzzy
---sub-file-paths=subtitles:subs:sub
+sub-file-paths=subtitles:subs:sub
 cache=auto
-cache-secs=30
---hwdec=vdpau-copy
---loop=yes
-
+cache-secs=60
+replaygain=track
+#hwdec=vdpau-copy
+#hwdec=vaapi
+loop=yes
diff --git a/mutt/.config/mutt/binds b/mutt/.config/mutt/binds
index 50a9e84..291b594 100644
--- a/mutt/.config/mutt/binds
+++ b/mutt/.config/mutt/binds
@@ -165,18 +165,19 @@ macro index,pager gS "<change-folder>=$my_spam<enter>"   "go to Spam"
 macro index,pager gf "<change-folder>?"                  "go to mailbox..."
 
 
-macro index,pager A "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
+# macro index,pager A "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --config "$XDG_CONFIG_HOME"/abook/abookrc --datafile "$XDG_DATA_HOME"/abook/addressbook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
+macro index,pager A "<pipe-message>khard add-email<return>" "add the sender email address to khard"
 
 
 bind editor <Tab> complete-query
 
 bind editor <Left> backward-char
-bind editor <Right> forward-char 
+bind editor <Right> forward-char
 bind editor <C-Left> backward-word
 bind editor <C-Right> forward-word
 
-bind editor <BackSpace> backspace 
-bind editor <Delete> delete-char 
+bind editor <BackSpace> backspace
+bind editor <Delete> delete-char
 
 bind editor <Home> bol
 bind editor <End> eol
@@ -184,6 +185,3 @@ bind editor <End> eol
 # disable buffy-cycle
 bind editor <space> noop
 bind editor ^@ buffy-cycle # ctrl-space
-
-
-
diff --git a/mutt/.config/mutt/muttrc b/mutt/.config/mutt/muttrc
index a19917b..cd590ab 100644
--- a/mutt/.config/mutt/muttrc
+++ b/mutt/.config/mutt/muttrc
@@ -4,7 +4,7 @@
 
 set realname = "Ivan Boikov"
 set folder = "$XDG_DATA_HOME/mail/$my_email"
-set from = $my_email 
+set from = $my_email
 
 set spoolfile = "+INBOX"
 # save drafts on the server
@@ -25,7 +25,7 @@ source $XDG_CONFIG_HOME/mutt/themes/xresources
 #source $XDG_CONFIG_HOME/mutt/themes/vombatidae
 
 #set strict_threads = yes
-set sort = threads 
+set sort = threads
 set sort_thread_groups = reverse-date
 
 
@@ -53,5 +53,5 @@ set date_format="!%d/%m/%y %a %H:%M"
 set index_format="%4C %Z  %s %*   %-30.30F %d"
 
 
-set query_command = "abook --mutt-query '%s'"
-
+#set query_command = "abook --mutt-query '%s'"
+set query_command="khard email --parsable '%s'"
diff --git a/ncmpcpp/.config/ncmpcpp/bindings b/ncmpcpp/.config/ncmpcpp/bindings
index 645e41f..5eb5c2e 100644
--- a/ncmpcpp/.config/ncmpcpp/bindings
+++ b/ncmpcpp/.config/ncmpcpp/bindings
@@ -62,6 +62,8 @@
 #
 #def_key "space"
 #  add_item_to_playlist
+def_key "space"
+   select_item
 #
 #def_key "space"
 #  toggle_lyrics_update_on_song_change
@@ -439,9 +441,9 @@ def_key "N"
 
 # not used but bound
 def_key "J"
-    move_sort_order_down
+    move_selected_items_down
 def_key "K"
-    move_sort_order_up
+    move_selected_items_up
 def_key "h"
   jump_to_parent_directory
 def_key "l"
diff --git a/shell/.config/shell/aliasrc b/shell/.config/shell/aliasrc
index e29ab3a..232df6a 100644
--- a/shell/.config/shell/aliasrc
+++ b/shell/.config/shell/aliasrc
@@ -76,7 +76,6 @@ alias yarn='yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config'
 
 [ -d "$XDG_CONFIG_HOME/abook/" ] || mkdir -p "$XDG_CONFIG_HOME/abook/"
 [ -d "$XDG_DATA_HOME/abook/" ] || mkdir -p "$XDG_DATA_HOME/abook/"
-alias abook='abook --config $XDG_CONFIG_HOME/abook/abookrc --datafile $XDG_DATA_HOME/abook/addressbook'
 
 alias beet='$XDG_DATA_HOME/venv/beets/bin/beet'
 
diff --git a/xdg/.config/mimeapps.list b/xdg/.config/mimeapps.list
index c52a941..dd69302 100644
--- a/xdg/.config/mimeapps.list
+++ b/xdg/.config/mimeapps.list
@@ -5,6 +5,7 @@ image/jpg=sxiv.desktop;
 image/jpeg=sxiv.desktop;
 image/gif=sxiv.desktop;
 image/png=sxiv.desktop;
+image/webp=sxiv.desktop;
 
 audio/x-vorbis+ogg=mpv.desktop;
 audio/ogg=mpv.desktop;