From 234d5d4950799375befb7249246a6528f2755257 Mon Sep 17 00:00:00 2001 From: azahi Date: Wed, 3 Oct 2018 16:43:03 +0300 Subject: Fixes Fix snapping only using half of specified gap number Add ALSA support for media buttons --- src/XMonad/Custom/Bindings.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/XMonad/Custom/Bindings.hs') diff --git a/src/XMonad/Custom/Bindings.hs b/src/XMonad/Custom/Bindings.hs index 414e89a..e744c69 100644 --- a/src/XMonad/Custom/Bindings.hs +++ b/src/XMonad/Custom/Bindings.hs @@ -36,7 +36,6 @@ import XMonad.Actions.MessageFeedback import XMonad.Actions.Navigation2D import XMonad.Actions.PerConditionKeys import XMonad.Actions.Promote ---import XMonad.Actions.Volume import XMonad.Actions.WithAll import XMonad.Custom.Layout import qualified XMonad.Custom.Misc as CM @@ -57,6 +56,7 @@ import XMonad.Prompt.Shell import XMonad.Prompt.Window import XMonad.Prompt.Workspace import qualified XMonad.StackSet as S +import XMonad.Util.ALSA import XMonad.Util.EZConfig import XMonad.Util.NamedActions import XMonad.Util.NamedScratchpad @@ -147,10 +147,10 @@ keyBindings c = let subKeys s ks = subtitle s:mkNamedKeymap c ks in ] ^++^ subKeys "Volume & Music" - -- [ ("" , addName "ALSA: Mute" $ void toggleMute) - -- , ("" , addName "ALSA: Lower volume" $ void $ lowerVolume 5) - -- , ("" , addName "ALSA: Raise volume" $ void $ raiseVolume 5) - [ ("" , addName "MPD: Play/pause" $ spawn "~/.xmonad/bin/mpc-play-pause.sh") + [ ("" , addName "ALSA: Mute" $ void toggleMute) + , ("" , addName "ALSA: Lower volume" $ void $ lowerVolume 5) + , ("" , addName "ALSA: Raise volume" $ void $ raiseVolume 5) + , ("" , addName "MPD: Play/pause" $ spawn "~/.xmonad/bin/mpc-play-pause.sh") , ("" , addName "MPD: Stop" $ spawn "mpc --no-status stop") , ("" , addName "MPD: Previos track" $ spawn "mpc --no-status prev") , ("" , addName "MPD: Next track" $ spawn "mpc --no-status next") @@ -238,7 +238,7 @@ mouseBindings' :: XConfig Layout -> M.Map (KeyMask, Button) (Window -> X ()) mouseBindings' XConfig {XMonad.modMask = m} = M.fromList [ ((m, button1), \w -> focus w >> F.mouseWindow F.position w - >> ifClick (snapSpacedMagicMove gapBase (Just 50) (Just 50) w) + >> ifClick (snapSpacedMagicMove gapFull (Just 50) (Just 50) w) >> windows S.shiftMaster ) , ((m .|. shiftMask, button1), \w -> focus w -- cgit 1.4.1