X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad%2Fxmonad.hs;h=d21028de0002987a0621db5e4c0a2f52883b2ec4;hb=f64326d378c941baee948a51fbc164aca80c1204;hp=e35caf8ae16065faba87e6f2298296194165829e;hpb=e68b7fb428446f5711fe01aa592124499a2acd6d;p=config%2Fdotfiles.git diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index e35caf8..d21028d 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -1,8 +1,6 @@ -- xmonad configuration file. --- --- Tested with xmonad 0.9, most settings should work fine with xmonad 0.7. --- Copyright (C) 2011-2012 Simon Ruderich +-- Copyright (C) 2011-2015 Simon Ruderich -- -- This file is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -18,33 +16,19 @@ -- along with this file. If not, see . --- "hiding" necessary for LayoutCombinators. import XMonad hiding ( (|||) ) --- Necessary for reflectVert. -import XMonad.Layout.Reflect --- Necessary for avoidMaster. +import XMonad.Actions.CycleWS (toggleWS) +import XMonad.Hooks.ManageHelpers ((-?>), composeOne) +import XMonad.Hooks.SetWMName (setWMName) +import XMonad.Layout.IM (withIM, Property(..)) +import XMonad.Layout.LayoutCombinators ((|||), JumpToLayout(..)) +import XMonad.Layout.Named (named) +import XMonad.Layout.NoBorders (smartBorders) +import XMonad.Layout.PerWorkspace (onWorkspace) +import XMonad.Layout.Reflect (reflectHoriz) +import XMonad.Layout.TwoPane (TwoPane(..)) +import XMonad.Util.EZConfig (additionalKeys) import qualified XMonad.StackSet as W --- Necessary for toggleLayouts. -import XMonad.Layout.ToggleLayouts --- Necessary for smartBorders. -import XMonad.Layout.NoBorders --- Necessary for composeOne and -?>. -import XMonad.Hooks.ManageHelpers --- Necessary for `additionalKeys`. -import XMonad.Util.EZConfig --- Necessary for setWMName. -import XMonad.Hooks.SetWMName --- Necessary for toggleWS. -import XMonad.Actions.CycleWS --- Necessary for named. -import XMonad.Layout.Named --- Necessary for JumpToLayout. -import XMonad.Layout.LayoutCombinators --- Necessary for Limit layout. -import XMonad.Layout.TwoPane --- Necessary for the Gimp layout. -import XMonad.Layout.PerWorkspace -import XMonad.Layout.IM -- Prevent new windows from spawning in the master pane. Taken from @@ -179,7 +163,7 @@ myKeys = [ -- Lock the screen. The sleep is necessary to allow xtrlock to grab the -- keyboard input. - , ((myModMask, xK_z), spawn "sleep 1 && xtrlock") + , ((myModMask, xK_z), spawn "sleep 1 && exec xtrlock") ] ++ -- When using multiple screens, switching to another workspace causes