diff --git a/env/wm/extras/bar/bar_commands.bash b/env/wm/extras/bar/bar_commands.bash index 03221dd..def6ba2 100755 --- a/env/wm/extras/bar/bar_commands.bash +++ b/env/wm/extras/bar/bar_commands.bash @@ -13,5 +13,11 @@ while read -r line; do launcher2) rofi -show drun -font "$PRIMARY_FONT_FAMILY $PRIMARY_FONT_SIZE" -lines 16 -width 10 -padding 8 -fuzzy -bw "$BORDER_WIDTH" -color-enabled -color-window "#$(get_color 00)","#$(get_color 0D)","#$(get_color 0D)","#$(get_color 00)" -color-normal "#$(get_color 00)","#$(get_color 06)","#$(get_color 00)","#$(get_color 0D)","#$(get_color 00)" -separator-style none -hide-scrollbar ;; + close) + bspc node -c + ;; + kill) + bspc node -k + ;; esac done diff --git a/env/wm/extras/bar/formatter.bash b/env/wm/extras/bar/formatter.bash index e3c6cee..0a7a2e7 100755 --- a/env/wm/extras/bar/formatter.bash +++ b/env/wm/extras/bar/formatter.bash @@ -11,7 +11,7 @@ reload_colors() { # trap reload_colors SIGUSR1 -LAUNCHER_BUTTONS="%{F$COLOR_DARK}%{A3:launcher2:}%{A:launcher:}!%{A}%{A}%{F-}" +LAUNCHER_BUTTONS="%{F$COLOR_DARK}%{A3:launcher2:}%{A:launcher:}!%{A}%{A} %{A3:close:}%{A:kill:}X%{A}%{A}%{F-}" export MODULE_MATCH=() export MODULE_CALLBACK=() @@ -69,7 +69,7 @@ while read -r line; do fi done - printf "%s\n" "%{l} $LAUNCHER_BUTTONS $l_content %{c}$c_content %{r}$r_content " + printf "%s\n" "%{l} $l_content $LAUNCHER_BUTTONS %{c}$c_content %{r}$r_content " done # echo -e "\nEND BAR LOG" >> "$BAR_LOG" diff --git a/env/wm/extras/bar/start.bash b/env/wm/extras/bar/start.bash index d439d4c..0e368af 100755 --- a/env/wm/extras/bar/start.bash +++ b/env/wm/extras/bar/start.bash @@ -50,6 +50,6 @@ fi source "$BAR_PATH/colors.bash" cat "$BAR_FIFO" | "$BAR_PATH/formatter.bash" | \ - lemonbar -a 12 $BAR_B -g "$WIDTH"x"$BAR_HEIGHT"+"$OFFSET"+"$POS_Y" -u "$BAR_BORDER_WIDTH" -f "$BAR_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B"$COLOR_BACKGROUND" -n "$BAR_WID" | \ + lemonbar -a 14 $BAR_B -g "$WIDTH"x"$BAR_HEIGHT"+"$OFFSET"+"$POS_Y" -u "$BAR_BORDER_WIDTH" -f "$BAR_FONT_FAMILY" -F "$COLOR_FOREGROUND" -B"$COLOR_BACKGROUND" -n "$BAR_WID" | \ "$BAR_PATH/bar_commands.bash"