diff options
| author | Vasil Zlatanov <v@skozl.com> | 2019-04-03 00:56:11 +0100 |
|---|---|---|
| committer | Vasil Zlatanov <v@skozl.com> | 2019-04-03 00:56:11 +0100 |
| commit | 2df2d13c153dbb69098053fa6aa3a5aaa7fed331 (patch) | |
| tree | 87f65095a52e9b47f4b71e4768ef5a0bf03fd94e /Panel | |
| parent | b1dbf62ab9dcad03138a52a8596dccdf9286d958 (diff) | |
| parent | 8ced63b35c8b011ff29a79856165cc748d430a11 (diff) | |
| download | dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.tar.gz dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.tar.bz2 dotfiles-2df2d13c153dbb69098053fa6aa3a5aaa7fed331.zip | |
Resolve conflicts
Diffstat (limited to 'Panel')
| -rwxr-xr-x | Panel/lemonbar/batterymon | 19 | ||||
| -rwxr-xr-x | Panel/lemonbar/music | 2 | ||||
| -rwxr-xr-x | Panel/lemonbar/panel_bar | 6 | ||||
| -rwxr-xr-x | Panel/lemonbar/profile | 6 | ||||
| -rwxr-xr-x | Panel/lemonbar/windows | 2 |
5 files changed, 17 insertions, 18 deletions
diff --git a/Panel/lemonbar/batterymon b/Panel/lemonbar/batterymon index 27ea7a6..9d8c74d 100755 --- a/Panel/lemonbar/batterymon +++ b/Panel/lemonbar/batterymon @@ -1,13 +1,14 @@ #!/bin/sh while true;do -if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then -touch ~/.dontshut -zenity --question --title "Battery" --text "Battery if pretty fucking low, go to sleep?" -if [ $? -ne 1 ];then -pm-suspend -fi -else -rm ~/.dontshut -fi + if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then + touch ~/.dontshut + zenity --question --title "Battery" --text "Battery if pretty fucking low, go to sleep?" + if [ $? -ne 1 ];then + pm-suspend + fi + else + if [ -z ~/.dontshut ] + rm ~/.dontshut + fi sleep 180; done diff --git a/Panel/lemonbar/music b/Panel/lemonbar/music index d9e1d45..0ee2611 100755 --- a/Panel/lemonbar/music +++ b/Panel/lemonbar/music @@ -15,6 +15,6 @@ echo "K`mpc volume -h 127.0.0.1 | perl -pe 's/^volume://' | perl -pe 's/%$//' | mpc -h 127.0.0.1 idle > /dev/null if [ $? -ne 0 ];then echo 'mpd not alive'; -sleep 30; +sleep 300; fi done diff --git a/Panel/lemonbar/panel_bar b/Panel/lemonbar/panel_bar index 40a2b27..64eed1d 100755 --- a/Panel/lemonbar/panel_bar +++ b/Panel/lemonbar/panel_bar @@ -1,7 +1,5 @@ #! /bin/sh -num_mon=$(bspc query -M | wc -l) - . ./panel_colors . ./icons while read -r line ; do @@ -45,7 +43,7 @@ while read -r line ; do ;; K*) # volume output - musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}" + #musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}" ;; @@ -115,5 +113,5 @@ while read -r line ; do # ;; esac # printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos} " - printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}" + printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${battery}${time_infos}" done diff --git a/Panel/lemonbar/profile b/Panel/lemonbar/profile index 3a2f726..fe9d7b1 100755 --- a/Panel/lemonbar/profile +++ b/Panel/lemonbar/profile @@ -1,8 +1,8 @@ #!/bin/sh PANEL_FIFO=/tmp/panel-fifo -PANEL_HEIGHT=24 +PANEL_HEIGHT=40 -FONT_FONT="fixed" -ICON_FONT="FontAwesome-9" +FONT_FONT="DejaVuSans-10" +ICON_FONT="FontAwesome-10" export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY FONT_FONT ICON_FONT diff --git a/Panel/lemonbar/windows b/Panel/lemonbar/windows index 108eeac..4af5a5c 100755 --- a/Panel/lemonbar/windows +++ b/Panel/lemonbar/windows @@ -1,3 +1,3 @@ #!/bin/sh echo 'Wclear' > /tmp/panel-fifo -ratpoison -c 'windows %s%n %t' | while read line;do echo "${line}" | cut -c -25 > /tmp/panel-fifo && sleep 0.004;done +ratpoison -c 'windows %s%n %t' | cut -c -25 > /tmp/panel-fifo |