From 9066c338de4567133968be4373a4405118a03ad1 Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Mon, 29 Feb 2016 13:37:58 -0500 Subject: [PATCH] Update configs for bspwmrc and friends --- bspwm/bspwmrc | 3 -- panel/panel | 9 +--- panel/panel_bar | 136 +++++++++++++++++++++++------------------------- sxhkd/sxhkdrc | 2 +- 4 files changed, 68 insertions(+), 82 deletions(-) diff --git a/bspwm/bspwmrc b/bspwm/bspwmrc index 4abd557..399fc3e 100755 --- a/bspwm/bspwmrc +++ b/bspwm/bspwmrc @@ -13,9 +13,6 @@ bspc config initial_polarity second_child bspc monitor -d 1 2 3 4 5 6 7 8 9 10 -echo 'xss-lock' xss-lock -- i3lock -e -i ~/images/lockscreen.png & -echo 'nitrogen' nitrogen --restore & -echo 'panel' $PANEL_CONFIG_DIR/panel & diff --git a/panel/panel b/panel/panel index 7e28041..a8b3bd4 100755 --- a/panel/panel +++ b/panel/panel @@ -13,16 +13,9 @@ trap 'trap - TERM; kill 0' INT TERM QUIT EXIT mkfifo "$PANEL_FIFO" bspc config bottom_padding $PANEL_HEIGHT -bspc control --subscribe > "$PANEL_FIFO" & -sleep 0.3s -clock 'C' '+%a %H:%M:%S' > "$PANEL_FIFO" & -sleep 0.3s -battery 'B' '%' > "$PANEL_FIFO" & -sleep 0.3s -volume 'V' '%' > "$PANEL_FIFO" & source panel_colors -cat "$PANEL_FIFO" | panel_bar | lemonbar -g x$PANEL_HEIGHT -f "$PANEL_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" -b & +panel_bar | lemonbar -g x$PANEL_HEIGHT -f "$PANEL_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B "$COLOR_BACKGROUND" -b & wait diff --git a/panel/panel_bar b/panel/panel_bar index 6c47e13..3cdfb63 100755 --- a/panel/panel_bar +++ b/panel/panel_bar @@ -2,79 +2,75 @@ # # Example panel for LemonBoy's bar -source "$PANEL_CONFIG_DIR/panel_colors" +PATH=$PATH:"$PANEL_CONFIG_DIR" + +source panel_colors num_mon=$(bspc query -M | wc -l) divider=' | ' -while read -r line ; do - case $line in - C*) - # clock output - sys_infos="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}" - ;; - W*) - # bspwm internal state - wm_infos="" - IFS=':' - set -- ${line#?} - while [ $# -gt 0 ] ; do - item=$1 - name=${item#?} - case $item in - M*) - # active monitor - if [ $num_mon -gt 1 ] ; then - wm_infos="$wm_infos %{F$COLOR_ACTIVE_MONITOR_FG}%{B$COLOR_ACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " - fi - ;; - m*) - # inactive monitor - if [ $num_mon -gt 1 ] ; then - wm_infos="$wm_infos %{F$COLOR_INACTIVE_MONITOR_FG}%{B$COLOR_INACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " - fi - ;; - O*) - # focused occupied desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_OCCUPIED_FG}%{B$COLOR_FOCUSED_OCCUPIED_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" - ;; - F*) - # focused free desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_FREE_FG}%{B$COLOR_FOCUSED_FREE_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" - ;; - U*) - # focused urgent desktop - wm_infos="${wm_infos}%{F$COLOR_FOCUSED_URGENT_FG}%{B$COLOR_FOCUSED_URGENT_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" - ;; - o*) - # occupied desktop - wm_infos="${wm_infos}%{F$COLOR_OCCUPIED_FG}%{B$COLOR_OCCUPIED_BG} ${name} %{B-}%{F-}" - ;; - f*) - # free desktop - # wm_infos="${wm_infos}%{F$COLOR_FREE_FG}%{B$COLOR_FREE_BG} ${name} %{B-}%{F-}" - ;; - u*) - # urgent desktop - wm_infos="${wm_infos}%{F$COLOR_URGENT_FG}%{B$COLOR_URGENT_BG} ${name} %{B-}%{F-}" - ;; - L*) - # layout - # wm_infos="$wm_infos %{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG} ${name} %{B-}%{F-}" - ;; - esac - shift - done - ;; - B*) - # battery output - battery_infos="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}" - ;; - V*) - # volume output - volume_infos="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${line#?} %{B-}%{F-}" - ;; - esac - printf "%s\n" "%{l}${wm_infos}%{c}${title}%{r}${battery_infos}${divider}${volume_infos}${divider}${sys_infos}" +while sleep 1; do + # bspwm internal state + wm_info="" + IFS=':' + read -r -a wm_data <<< "$(bspc control --get-status)" + for item in "${wm_data[@]}"; do + name=${item#?} + case $item in + M*) + # active monitor + if [ $num_mon -gt 1 ] ; then + wm_info="$wm_info %{F$COLOR_ACTIVE_MONITOR_FG}%{B$COLOR_ACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " + fi + ;; + m*) + # inactive monitor + if [ $num_mon -gt 1 ] ; then + wm_info="$wm_info %{F$COLOR_INACTIVE_MONITOR_FG}%{B$COLOR_INACTIVE_MONITOR_BG} ${name} %{B-}%{F-} " + fi + ;; + O*) + # focused occupied desktop + wm_info="${wm_info}%{F$COLOR_FOCUSED_OCCUPIED_FG}%{B$COLOR_FOCUSED_OCCUPIED_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + ;; + F*) + # focused free desktop + wm_info="${wm_info}%{F$COLOR_FOCUSED_FREE_FG}%{B$COLOR_FOCUSED_FREE_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + ;; + U*) + # focused urgent desktop + wm_info="${wm_info}%{F$COLOR_FOCUSED_URGENT_FG}%{B$COLOR_FOCUSED_URGENT_BG}%{U$COLOR_FOREGROUND}%{+u} ${name} %{-u}%{B-}%{F-}" + ;; + o*) + # occupied desktop + wm_info="${wm_info}%{F$COLOR_OCCUPIED_FG}%{B$COLOR_OCCUPIED_BG} ${name} %{B-}%{F-}" + ;; + f*) + # free desktop + # wm_info="${wm_info}%{F$COLOR_FREE_FG}%{B$COLOR_FREE_BG} ${name} %{B-}%{F-}" + ;; + u*) + # urgent desktop + wm_info="${wm_info}%{F$COLOR_URGENT_FG}%{B$COLOR_URGENT_BG} ${name} %{B-}%{F-}" + ;; + L*) + # layout + # wm_info="$wm_info %{F$COLOR_LAYOUT_FG}%{B$COLOR_LAYOUT_BG} ${name} %{B-}%{F-}" + ;; + esac + done + + pa_status=$(pulseaudio-ctl full-status) + volume=$(echo $pa_status | cut -d' ' -f1) + muted=$(echo $pa_status | cut -d' ' -f2 | sed -e 's/yes/-/' -e 's/no/%%/') + + battery=$(acpi --battery | cut -d, -f2 | tr -d ' ')'%' + clock=$(date '+%a %d %b %H:%M:%S') + + battery_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${battery} %{B-}%{F-}" + volume_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${volume}${muted} %{B-}%{F-}" + clock_info="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${clock} %{B-}%{F-}" + + printf "%s\n" "%{l}${wm_info}%{c}${title}%{r}${battery_info}${divider}${volume_info}${divider}${clock_info}" done diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc index 10a56c3..2bb0ce7 100644 --- a/sxhkd/sxhkdrc +++ b/sxhkd/sxhkdrc @@ -84,7 +84,7 @@ super + Return urxvt super + space - dmenu_run + xboomx # make sxhkd reload its configuration files: super + Escape