5 files changed, 113 insertions, 39 deletions

diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index ae8ea3b..f94bc2e 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -3,6 +3,7 @@
 sxhkd &
 dunst &
 unclutter &
+mpDris2 &
 xss-lock -- /home/fd0e/.local/bin/lock &
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
 compton --config ~/.config/compton.conf &
diff --git a/ncmpcpp/.ncmpcpp/config b/ncmpcpp/.ncmpcpp/config
new file mode 100644
index 0000000..cf99ab7
--- /dev/null
+++ b/ncmpcpp/.ncmpcpp/config
@@ -0,0 +1,92 @@
+##
+# Files
+ mpd_music_dir = "~/Music"  
+ lyrics_directory  = ~/.ncmpcpp/lyrics
+ ncmpcpp_directory  = ~/.ncmpcpp
+ mpd_host = "localhost"
+ mpd_port = "6600"  
+ mpd_connection_timeout = "5"  
+ mpd_crossfade_time = "5"  
+
+ # Playlist
+ playlist_disable_highlight_delay = "0"  
+ playlist_display_mode = "columns"  
+ playlist_show_remaining_time = "yes"
+
+ browser_display_mode = "columns"  
+ autocenter_mode = "yes"  
+ fancy_scrolling = "yes"  
+ follow_now_playing_lyrics = "yes"  
+ display_screens_numbers_on_start = "yes"  
+ ignore_leading_the = "yes"  
+ lyrics_database = "1"  
+ song_columns_list_format = "(10)[blue]{l} (30)[green]{a} (30)[magenta]{b} (50)[yellow]{t}"  
+ colors_enabled = "yes"  
+ main_window_color = "white"  
+ main_window_highlight_color =  "blue"
+ header_window_color = "cyan"  
+ volume_color = "red"  
+ progressbar_color = "cyan"  
+ statusbar_color = "white"  
+ active_column_color = "cyan"  
+ active_window_border = "blue"
+
+alternative_header_first_line_format = "$0$aqqu$/a {$7%a - $9}{$5%t$9}|{$8%f$9} $0$atqq$/a$9"
+alternative_header_second_line_format = "{{$6%b$9}{ [$6%y$9]}}|{%D}"
+song_list_format = "{$3%n │ $9}{$7%a - $9}{$5%t$9}|{$8%f$9}$R{$6 │ %b$9}{$3 │ %l$9}"
+user_interface = "alternative"
+#user_interface =                    "classic"
+default_place_to_search_in = "database"
+
+
+# visualizer
+visualizer_fifo_path = "/tmp/mpd.fifo"
+visualizer_output_name = "my_fifo"
+visualizer_sync_interval = "12"
+#visualizer_type = "wave" (spectrum/wave)
+visualizer_type = "spectrum" (spectrum/wave)
+visualizer_in_stereo = "yes"
+visualizer_look = "+|"
+
+
+## Navigation ##
+cyclic_scrolling = "yes"
+header_text_scrolling = "yes"
+jump_to_now_playing_song_at_start = "yes"
+lines_scrolled = "2"
+
+## Other ##
+system_encoding = "utf-8"
+regular_expressions = "extended"
+
+
+
+## Selected tracks ##
+selected_item_prefix = "* "
+discard_colors_if_item_is_selected = "no"
+
+## Seeking ##
+incremental_seeking = "yes"
+seek_time = "1"
+
+## Visivility ##
+header_visibility = "yes"
+statusbar_visibility = "yes"
+titles_visibility = "yes"
+
+
+progressbar_look =  "=>-"
+progressbar_boldness = "yes"
+progressbar_elapsed_color = "white"
+
+now_playing_prefix = "> "
+song_status_format = " $2%a $4⟫$3⟫ $8%t $4⟫$3⟫ $5%b "
+autocenter_mode = "yes"
+centered_cursor = "yes"
+
+# Misc
+display_bitrate = "yes"
+# enable_window_title = "no"
+follow_now_playing_lyrics = "yes"
+ignore_leading_the = "yes"
+empty_tag_marker = ""
diff --git a/polybar/.config/polybar/cmus.sh b/polybar/.config/polybar/cmus.sh
deleted file mode 100755
index 7917d4c..0000000
--- a/polybar/.config/polybar/cmus.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-prepend_zero () {
-        seq -f "%02g" $1 $1
-}
-
-artist=$(echo -n $(cmus-remote -C status | grep "tag artist" | cut -c 12-))
-
-if [[ $artist = *[!\ ]* ]]; then
-        song=$(echo -n $(cmus-remote -C status | grep title | cut -c 11-))
-        position=$(cmus-remote -C status | grep position | cut -c 10-)
-        minutes1=$(prepend_zero $(($position / 60)))
-        seconds1=$(prepend_zero $(($position % 60)))
-        duration=$(cmus-remote -C status | grep duration | cut -c 10-)
-        minutes2=$(prepend_zero $(($duration / 60)))
-        seconds2=$(prepend_zero $(($duration % 60)))
-        echo -n "$artist - $song [$minutes1:$seconds1/$minutes2:$seconds2]"
-else
-        echo
-fi
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 8f9701d..8260bc9 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -35,7 +35,7 @@ font-0 = Hermit:style=medium:pixelsize=10;1
 font-1 = FontAwesome:style=Regular:size=10;1
 modules-left = pulseaudio battery date time bspwm
 modules-center = 
-modules-right = spotify cmus xwindow
+modules-right = spotify mpd
 tray-position = right
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -152,26 +152,26 @@ format = <label>
 format-foreground = #7b8c58
 exec = python ~/.config/polybar/spotify.py -f '{artist}: {song}'
 
-[module/cmus]
-type = custom/script
-exec = ~/.config/polybar/cmus.sh
-exec-if = pgrep -x cmus
-interval = 1
-click-left = cmus-remote --next
-click-right = cmus-remote --prev
-click-middle = cmus-remote --pause
-scroll-up = cmus-remote --volume +5%
-scroll-down = cmus-remote --volume -5%
-format = <label>
-format-prefix = " "
-format-foreground = #7b8c58
-label = %output%
-label-maxlen = 50
+;[module/cmus]
+;type = custom/script
+;exec = ~/.config/polybar/cmus.sh
+;exec-if = pgrep -x cmus
+;interval = 1
+;click-left = cmus-remote --next
+;click-right = cmus-remote --prev
+;click-middle = cmus-remote --pause
+;scroll-up = cmus-remote --volume +5%
+;scroll-down = cmus-remote --volume -5%
+;format = <label>
+;format-prefix = " "
+;format-foreground = #7b8c58
+;label = %output%
+;label-maxlen = 50
 
 [module/mpd]
 type = internal/mpd
 label-offline = mpd is offline
-format-online = <label-song> <icon-prev> <toggle> <icon-next> 
+format-online = <label-song>  <icon-prev> <toggle> <icon-next> 
 format-offline = <label-offline>
 host = 127.0.0.1
 port = 6600
@@ -180,8 +180,9 @@ icon-stop = 
 icon-play = 
 icon-pause = 
 icon-next = 
-label-song-maxlen = 25
+label-song-maxlen = 40
 label-song-ellipsis = true
+label-song-foreground = #7b8c58
 bar-progress-width = 10
 bar-progress-indicator = |
 bar-progress-fill = ─
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 5737f94..bddd6dd 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -116,7 +116,7 @@ alias py2="/bin/python2"
 alias pubip="curl ipinfo.io/ip"
 alias mirror="sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist"
 alias k="pkill "
-alias m="cmus"
+alias m="ncmpcpp"
 alias vimrc="vim $HOME/.config/nvim/init.vim"
 alias poly="vim $HOME/.config/polybar/config"
 alias z="zathura"