From f5b4cb79963bec8dcd40fd352bc586c58640d0a6 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Wed, 7 Oct 2020 12:09:03 +0200
Subject: fixed hlwm config for ubuntu

---
 herbstluftwm/.config/herbstluftwm/hlwm-keybindings          | 6 +++---
 herbstluftwm/.config/herbstluftwm/panel_indicators.sh       | 6 +++---
 herbstluftwm/.config/herbstluftwm/populate_panel.sh         | 2 +-
 herbstluftwm/.config/herbstluftwm/system_utils/backlight.sh | 4 +++-
 herbstluftwm/.config/herbstluftwm/system_utils/volume.sh    | 2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'herbstluftwm/.config')

diff --git a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
index 4afc4a5..84fc8a3 100644
--- a/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
+++ b/herbstluftwm/.config/herbstluftwm/hlwm-keybindings
@@ -17,9 +17,9 @@ hc keybind $Mod-Escape spawn rofi -color-enabled -modi "run,ssh" -show run
 hc keybind $Mod-a spawn rofi -color-enabled -modi "drun" -show drun
 hc keybind $Mod-t spawn env HLWM_CONF_DIR=$HLWM_CONF_DIR $HLWM_CONF_DIR/rofi_theme.sh -color-enabled
 
-hc keybind XF86AudioMute spawn amixer set Master toggle
-hc keybind XF86AudioLowerVolume spawn amixer set Master 1%-
-hc keybind XF86AudioRaiseVolume spawn amixer set Master 1%+
+hc keybind XF86AudioMute spawn amixer -D pulse set Master toggle
+hc keybind XF86AudioLowerVolume spawn amixer -D pulse set Master 1%-
+hc keybind XF86AudioRaiseVolume spawn amixer -D pulse set Master 1%+
 
 hc keybind XF86MonBrightnessUp spawn xbacklight -inc 5
 hc keybind XF86MonBrightnessDown spawn xbacklight -dec 5
diff --git a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
index d4d7077..6abc60f 100755
--- a/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel_indicators.sh
@@ -40,11 +40,11 @@ hlwm_indicator_volume()
         elif [ "$volume" == "mute" ]; then
             volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[0]} Mute%{F-}"
         elif [ "$volume" -eq 0 ]; then
-            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[0]} $volume%%{F-}"
+            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[0]} $volume% %{F-}"
         elif [ "$volume" -lt 33 ]; then
-            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[1]} $volume%%{F-}"
+            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[1]} $volume% %{F-}"
         else
-            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[2]} $volume%%{F-}"
+            volume_status="%{F$HLWM_FG_ACOLOR}${volume_icon[2]} $volume% %{F-}"
         fi
         echo -e "volume\t$volume_status"
     else
diff --git a/herbstluftwm/.config/herbstluftwm/populate_panel.sh b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
index 3ebda1c..853c456 100755
--- a/herbstluftwm/.config/herbstluftwm/populate_panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/populate_panel.sh
@@ -117,7 +117,7 @@ fi
                 ;;
             net)
                 net="${cmd[@]:1}"
-                if [ $net = "off" ] ; then
+                if [ $net == "off" ] ; then
                     net=""
                 else
                     net="$net $separator%{B-} "
diff --git a/herbstluftwm/.config/herbstluftwm/system_utils/backlight.sh b/herbstluftwm/.config/herbstluftwm/system_utils/backlight.sh
index e2f7b13..81c759c 100644
--- a/herbstluftwm/.config/herbstluftwm/system_utils/backlight.sh
+++ b/herbstluftwm/.config/herbstluftwm/system_utils/backlight.sh
@@ -1,7 +1,9 @@
 #!/usr/bin/env bash
 
 hlwm_utils_backlight() {
-    printf "%.0f" $(xbacklight -get)
+    value=$(xbacklight -get)
+
+    [ -n "$value" ] && printf "%.0f" $value
 }
 
 # vim: set ts=8 sw=4 tw=0 et :
diff --git a/herbstluftwm/.config/herbstluftwm/system_utils/volume.sh b/herbstluftwm/.config/herbstluftwm/system_utils/volume.sh
index 4c3e21e..cd1e960 100644
--- a/herbstluftwm/.config/herbstluftwm/system_utils/volume.sh
+++ b/herbstluftwm/.config/herbstluftwm/system_utils/volume.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 hlwm_utils_volume() {
-    local status=($(amixer get Master | sed -rn 's/\s*Front Right.*\[([0-9]+)%\]\s+\[(on|off)\]/\1 \2/p'))
+    local status=($(amixer -D pulse get Master | sed -rn 's/\s*Front Right.*\[([0-9]+)%\]\s+\[(on|off)\]/\1 \2/p'))
     if [ "${status[1]}" == "off" ]; then
         echo "mute"
     else
-- 
cgit v1.2.3