Skip to content
Browse files

Merge remote-tracking branch 'origin/master' into modern-haskell

  • Loading branch information...
2 parents 09a5686 + a442bad commit d4458ff0f14c78a524e885ed1147ff85414e6d0d @arnsholt committed Mar 14, 2013
Showing with 14 additions and 16 deletions.
  1. +14 −16 dot.xmonad/xmonad.hs
View
30 dot.xmonad/xmonad.hs
@@ -90,11 +90,13 @@ modMask' = mod4Mask
keys' :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())
keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- launching and killing programs
- [ ((modMask, xK_Return), spawn $ XMonad.terminal conf)
- , ((modMask, xK_p ), spawn "$(yeganesh -x)")
- , ((modMask, xK_o ), spawn "opera -newwindow")
- , ((modMask .|. shiftMask, xK_c ), kill)
- , ((0 , xK_F12 ), spawn "gnome-screensaver-command -l")
+ [ ((modMask, xK_Return ), spawn $ XMonad.terminal conf)
+ , ((modMask, xK_p ), spawn "$(yeganesh -x)")
+ , ((modMask, xK_o ), spawn "opera -newwindow")
+ , ((modMask .|. shiftMask, xK_c ), kill)
+ , ((0 , xK_F12 ), spawn "gnome-screensaver-command -l")
+ , ((modMask, xK_Page_Up ), spawn "amixer -q set Master 2%+")
+ , ((modMask, xK_Page_Down), spawn "amixer -q set Master 2%-")
-- layouts
, ((modMask, xK_space ), sendMessage NextLayout)
@@ -107,17 +109,13 @@ keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
-- refresh
, ((modMask, xK_n ), refresh)
- -- focus
- , ((modMask, xK_Tab ), windows W.focusDown)
- , ((modMask, xK_j ), windows W.focusDown)
- , ((modMask, xK_k ), windows W.focusUp)
- , ((modMask, xK_m ), windows W.focusMaster)
- , ((modMask .|. shiftMask, xK_m ), windows W.shiftMaster)
-
- -- swapping
- , ((modMask .|. shiftMask, xK_Return), windows W.swapMaster)
- , ((modMask .|. shiftMask, xK_j ), windows W.swapDown )
- , ((modMask .|. shiftMask, xK_k ), windows W.swapUp )
+ -- focus and swapping
+ , ((modMask, xK_Up ), windows W.focusUp)
+ , ((modMask, xK_Down ), windows W.focusDown)
+ , ((modMask .|. shiftMask, xK_Up ), windows W.swapUp)
+ , ((modMask .|. shiftMask, xK_Down ), windows W.swapDown)
+ , ((modMask, xK_Home ), windows W.focusMaster)
+ , ((modMask .|. shiftMask, xK_Home ), windows W.shiftMaster)
-- increase or decrease number of windows in the master area
, ((modMask , xK_comma ), sendMessage (IncMasterN 1))

0 comments on commit d4458ff

Please sign in to comment.
Something went wrong with that request. Please try again.