X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/fcab17b7b07e0b7874da79b90c51a448488b5525..58d74f209dc98a712a33207c862fc63539e2a106:/.xmonad/xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index dd296bd..d36078b 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 import System.IO
 import XMonad
+import XMonad.Actions.CycleRecentWS
 import XMonad.Actions.PhysicalScreens
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
@@ -18,7 +19,6 @@ import XMonad.Layout.PerWorkspace
 import XMonad.Layout.Renamed
 import XMonad.Layout.Reflect
 import XMonad.Layout.Tabbed
-import XMonad.Layout.ThreeColumns
 import XMonad.Util.Run(spawnPipe)
 import qualified Data.Map as M
 import qualified XMonad.StackSet as W
@@ -50,7 +50,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
         ((modm , xK_comma ), sendMessage (IncMasterN 1)),
         ((modm , xK_period), sendMessage (IncMasterN (-1))),
         ((modm , xK_b ), sendMessage ToggleStruts),
-        ((modm , xK_z ), sendMessage Mag.Toggle)
+        ((modm , xK_z ), sendMessage Mag.Toggle),
+        ((modm , xK_a), cycleRecentWS [xK_Super_L] xK_a xK_a)
     ]
     ++
 
@@ -83,7 +84,6 @@ myManageHook =
         (isSkipTaskBar -?> doFloat),
         (isDialog -?> doFloatAt 0.1 0.1),
         (isFullscreen -?> doFullFloat),
-        ((className =? "Emacs" <&&> resource =? "Ediff") -?> doFloat),
         (fmap Just $ doF avoidMaster)
     ]
 
@@ -134,15 +134,6 @@ myTabbedLayout = createLayout "Tab" $
     avoidStruts $
     tabbed shrinkText myTitleTheme
 
-myThreeColLayout = createLayout "ThreeCol" $
-    avoidStruts $
-    Mag.magnifierOff $
-    ThreeCol numMaster resizeDelta masterRatio
-    where
-        resizeDelta = 3/100
-        masterRatio = 4/10
-        numMaster = 1
-
 myMasterTabbedLayout = createLayout "MTab" $
     avoidStruts $
     Mag.magnifierOff $
@@ -160,18 +151,6 @@ myGimpLayout = createLayout "Gimp" $
     reflectHoriz $
     tabbed shrinkText myTitleTheme
 
-
--- This was the easiest way I found to avoid a compile error when I have
--- an unused layout
-referenceAllLayoutsToAvoidErrors =
-    myFullLayout |||
-    myTiledLayout |||
-    myTabbedLayout |||
-    myThreeColLayout |||
-    myMasterTabbedLayout |||
-    myGimpLayout
-
-
 myLayout =
     (
         onWorkspace "1" (myTabbedLayout ||| myMasterTabbedLayout) $