diff --git a/dotfiles/xmonad/xmonad-x86_64-linux b/dotfiles/xmonad/xmonad-x86_64-linux index 695f574..1b4780e 100755 Binary files a/dotfiles/xmonad/xmonad-x86_64-linux and b/dotfiles/xmonad/xmonad-x86_64-linux differ diff --git a/dotfiles/xmonad/xmonad.hs b/dotfiles/xmonad/xmonad.hs index 46e0922..1909a4a 100644 --- a/dotfiles/xmonad/xmonad.hs +++ b/dotfiles/xmonad/xmonad.hs @@ -252,9 +252,9 @@ main = do ,((0 , xF86XK_Sleep ), spawn "pm-suspend") ,((0 , xF86XK_MonBrightnessUp ), spawn "xbacklight -inc 10") ,((0 , xF86XK_MonBrightnessDown ), spawn "xbacklight -dec 10") - ,((0 , xF86XK_AudioMute), spawn "amixer -q set Master toggle") - ,((0 , xF86XK_AudioLowerVolume), spawn "amixer -q set Master 5%-") - ,((0 , xF86XK_AudioRaiseVolume ), spawn "amixer -q set Master 5%+") + ,((0 , xF86XK_AudioMute), spawn "amixer -D pulse -q set Master toggle") + ,((0 , xF86XK_AudioLowerVolume), spawn "amixer -D pulse -q set Master 5%-") + ,((0 , xF86XK_AudioRaiseVolume ), spawn "amixer -D pulse -q set Master 6%+") ] `additionalMouseBindings` [((myModMask, 6), \_ -> moveTo Next NonEmptyWS) diff --git a/dotfiles/xmonad/xmonad.o b/dotfiles/xmonad/xmonad.o index 64c2f81..1d8ef36 100644 Binary files a/dotfiles/xmonad/xmonad.o and b/dotfiles/xmonad/xmonad.o differ diff --git a/scripts/lemonbar/final_bar.sh b/scripts/lemonbar/final_bar.sh index 8373aa8..9b550cd 100755 --- a/scripts/lemonbar/final_bar.sh +++ b/scripts/lemonbar/final_bar.sh @@ -17,7 +17,11 @@ battery() { } volume() { - amixer get Master | grep -P -o '\[[0-9]+%\]' + + # amixer get Master works fine on everything but + # Ubuntu. You need amixer -d pulse in Ubuntu. + amixer -D pulse get Master | grep -P -o '\[[0-9]+%\]' + } cpuload() { diff --git a/ubuntu/installer.sh b/ubuntu/installer.sh index 993f4fe..99d63cf 100644 --- a/ubuntu/installer.sh +++ b/ubuntu/installer.sh @@ -21,6 +21,7 @@ sudo apt-get -qq -y install xinit sudo apt-get -qq -y install wmname sudo apt-get -qq -y install libxcb-xinerama0-dev sudo apt-get -qq -y install libxcb-randr0-dev +sudo apt-get -qq -y install xbacklight # Build and install lemonbar from source echo "Installing lemonbar from source..."