From ef5fce8e32fef681dcc62423de9c2ab1cd0764f1 Mon Sep 17 00:00:00 2001 From: M1dgard Date: Tue, 17 Apr 2018 19:55:16 +0200 Subject: [PATCH] Simplify shared MPD settings with inheritance --- polybar/config.ini | 100 +++++++++------------------------------------ 1 file changed, 20 insertions(+), 80 deletions(-) diff --git a/polybar/config.ini b/polybar/config.ini index 24f1321..05ecaa0 100644 --- a/polybar/config.ini +++ b/polybar/config.ini @@ -131,6 +131,7 @@ label-urgent-background = ${module/bspwm.label-urgent-background} label-urgent-padding = ${module/bspwm.label-urgent-padding} [mpd-shared] +type = internal/mpd format-online = icon-prev =  @@ -144,106 +145,45 @@ icon-pause-foreground = ${colors.foreground-alt} icon-next =  icon-next-foreground = ${colors.foreground-alt} -label-song = %artist% - %title% -label-song-foreground = ${colors.foreground} -label-song-maxlen = 25 -label-song-ellipsis = true +label-song = %artist% - %title% +label-song-maxlen = 22 +small-label-song-maxlen = 7 +label-song-ellipsis = false +label-song-foreground = ${colors.foreground} -bar-progress-width = 45 -bar-progress-indicator = | -bar-progress-fill = ─ -bar-progress-empty = ─ +bar-progress-width = 25 +small-bar-progress-width = 10 +bar-progress-indicator = ▁ +bar-progress-indicator-foreground = #eee +bar-progress-fill = ▁ +bar-progress-fill-foreground = #999 +bar-progress-empty = ▁ +bar-progress-empty-foreground = #333 -; {{{ nothing interesting here, just copying MPD settings [module/mpd-local] -type = internal/mpd +inherit = mpd-shared host = localhost port = 6600 -format-online = ${mpd-shared.format-online} - -icon-prev = ${mpd-shared.icon-prev} -icon-prev-foreground = ${mpd-shared.icon-prev-foreground} -icon-stop = ${mpd-shared.icon-stop} -icon-stop-foreground = ${mpd-shared.icon-stop-foreground} -icon-play = ${mpd-shared.icon-play} -icon-play-foreground = ${mpd-shared.icon-play-foreground} -icon-pause = ${mpd-shared.icon-pause} -icon-pause-foreground = ${mpd-shared.icon-pause-foreground} -icon-next = ${mpd-shared.icon-next} -icon-next-foreground = ${mpd-shared.icon-next-foreground} - -label-song = ${mpd-shared.label-song} -label-song-foreground = ${mpd-shared.label-song-foreground} -label-song-maxlen = ${mpd-shared.label-song-maxlen} -label-song-ellipsis = ${mpd-shared.label-song-ellipsis} - -bar-progress-width = ${mpd-shared.bar-progress-width} -bar-progress-indicator = ${mpd-shared.bar-progress-indicator} -bar-progress-fill = ${mpd-shared.bar-progress-fill} -bar-progress-empty = ${mpd-shared.bar-progress-empty} - [module/mpd-online-1] -type = internal/mpd +inherit = mpd-shared host = ${env:MPD_ONLINE_1_HOST} port = ${env:MPD_ONLINE_1_PORT} password = ${env:MPD_ONLINE_1_PASS} -format-online = ${mpd-shared.format-online} - -icon-prev = ${mpd-shared.icon-prev} -icon-prev-foreground = ${mpd-shared.icon-prev-foreground} -icon-stop = ${mpd-shared.icon-stop} -icon-stop-foreground = ${mpd-shared.icon-stop-foreground} -icon-play = ${mpd-shared.icon-play} -icon-play-foreground = ${mpd-shared.icon-play-foreground} -icon-pause = ${mpd-shared.icon-pause} -icon-pause-foreground = ${mpd-shared.icon-pause-foreground} -icon-next = ${mpd-shared.icon-next} -icon-next-foreground = ${mpd-shared.icon-next-foreground} - -label-song = ${mpd-shared.label-song} -label-song-foreground = ${mpd-shared.label-song-foreground} -label-song-maxlen = ${mpd-shared.label-song-maxlen} -label-song-ellipsis = ${mpd-shared.label-song-ellipsis} - -bar-progress-width = ${mpd-shared.bar-progress-width} -bar-progress-indicator = ${mpd-shared.bar-progress-indicator} -bar-progress-fill = ${mpd-shared.bar-progress-fill} -bar-progress-empty = ${mpd-shared.bar-progress-empty} - [module/mpd-online-2] -type = internal/mpd +inherit = mpd-shared host = ${env:MPD_ONLINE_2_HOST} port = ${env:MPD_ONLINE_2_PORT} password = ${env:MPD_ONLINE_2_PASS} -format-online = ${mpd-shared.format-online} +label-song-maxlen = ${mpd-shared.small-label-song-maxlen} +label-song-foreground = ${colors.foreground-alt} -icon-prev = ${mpd-shared.icon-prev} -icon-prev-foreground = ${mpd-shared.icon-prev-foreground} -icon-stop = ${mpd-shared.icon-stop} -icon-stop-foreground = ${mpd-shared.icon-stop-foreground} -icon-play = ${mpd-shared.icon-play} -icon-play-foreground = ${mpd-shared.icon-play-foreground} -icon-pause = ${mpd-shared.icon-pause} -icon-pause-foreground = ${mpd-shared.icon-pause-foreground} -icon-next = ${mpd-shared.icon-next} -icon-next-foreground = ${mpd-shared.icon-next-foreground} - -label-song = ${mpd-shared.label-song} -label-song-foreground = ${mpd-shared.label-song-foreground} -label-song-maxlen = ${mpd-shared.label-song-maxlen} -label-song-ellipsis = ${mpd-shared.label-song-ellipsis} - -bar-progress-width = ${mpd-shared.bar-progress-width} -bar-progress-indicator = ${mpd-shared.bar-progress-indicator} -bar-progress-fill = ${mpd-shared.bar-progress-fill} -bar-progress-empty = ${mpd-shared.bar-progress-empty} -; }}} +bar-progress-width = ${mpd-shared.small-bar-progress-width} [module/xbacklight] type = internal/xbacklight