Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit d4458ff0f14c78a524e885ed1147ff85414e6d0d 2 parents 09a5686 + a442bad
Arne Skjærholt authored

Showing 1 changed file with 14 additions and 16 deletions. Show diff stats Hide diff stats

  1. +14 16 dot.xmonad/xmonad.hs
30 dot.xmonad/xmonad.hs
@@ -90,11 +90,13 @@ modMask' = mod4Mask
90 90 keys' :: XConfig Layout -> M.Map (KeyMask, KeySym) (X ())
91 91 keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
92 92 -- launching and killing programs
93   - [ ((modMask, xK_Return), spawn $ XMonad.terminal conf)
94   - , ((modMask, xK_p ), spawn "$(yeganesh -x)")
95   - , ((modMask, xK_o ), spawn "opera -newwindow")
96   - , ((modMask .|. shiftMask, xK_c ), kill)
97   - , ((0 , xK_F12 ), spawn "gnome-screensaver-command -l")
  93 + [ ((modMask, xK_Return ), spawn $ XMonad.terminal conf)
  94 + , ((modMask, xK_p ), spawn "$(yeganesh -x)")
  95 + , ((modMask, xK_o ), spawn "opera -newwindow")
  96 + , ((modMask .|. shiftMask, xK_c ), kill)
  97 + , ((0 , xK_F12 ), spawn "gnome-screensaver-command -l")
  98 + , ((modMask, xK_Page_Up ), spawn "amixer -q set Master 2%+")
  99 + , ((modMask, xK_Page_Down), spawn "amixer -q set Master 2%-")
98 100
99 101 -- layouts
100 102 , ((modMask, xK_space ), sendMessage NextLayout)
@@ -107,17 +109,13 @@ keys' conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
107 109 -- refresh
108 110 , ((modMask, xK_n ), refresh)
109 111
110   - -- focus
111   - , ((modMask, xK_Tab ), windows W.focusDown)
112   - , ((modMask, xK_j ), windows W.focusDown)
113   - , ((modMask, xK_k ), windows W.focusUp)
114   - , ((modMask, xK_m ), windows W.focusMaster)
115   - , ((modMask .|. shiftMask, xK_m ), windows W.shiftMaster)
116   -
117   - -- swapping
118   - , ((modMask .|. shiftMask, xK_Return), windows W.swapMaster)
119   - , ((modMask .|. shiftMask, xK_j ), windows W.swapDown )
120   - , ((modMask .|. shiftMask, xK_k ), windows W.swapUp )
  112 + -- focus and swapping
  113 + , ((modMask, xK_Up ), windows W.focusUp)
  114 + , ((modMask, xK_Down ), windows W.focusDown)
  115 + , ((modMask .|. shiftMask, xK_Up ), windows W.swapUp)
  116 + , ((modMask .|. shiftMask, xK_Down ), windows W.swapDown)
  117 + , ((modMask, xK_Home ), windows W.focusMaster)
  118 + , ((modMask .|. shiftMask, xK_Home ), windows W.shiftMaster)
121 119
122 120 -- increase or decrease number of windows in the master area
123 121 , ((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.