xmonad: default to tabbed layout

[dotfiles] / .xmonad / xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index e385b662b3ff333550c842c5c646131a851aaa1f..bc4edd9308d5ef01582c3841db5960addddfde3b 100644 (file)
--- 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
@@ -28,10 +28,11 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     [
         ((modm .|. shiftMask, xK_h), spawn "xfce4-session-logout"),
         ((modm .|. shiftMask, xK_l), spawn "xscreensaver-command --lock"),
-        ((modm, xK_f), spawn "xmonad --restart"),
+        ((modm .|. shiftMask, xK_r), spawn "xmonad --restart"),
 
         ((modm, xK_n), spawn "xfce4-terminal"),
         ((modm, xK_i), spawn "firefox"),
+        ((modm, xK_c), spawn "emacsclient --create-frame --no-wait"),
         ((modm, xK_p), spawn "kupfer"),
 
         ((modm .|. shiftMask, xK_c ), kill),
@@ -49,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)
     ]
     ++
 
@@ -132,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 $
@@ -158,24 +151,10 @@ 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) $
-        onWorkspace "2" (myTabbedLayout ||| myMasterTabbedLayout) $
-        onWorkspace "9" (myFullLayout ||| myMasterTabbedLayout ||| myTabbedLayout ||| myTiledLayout ||| myGimpLayout) $
-        (myMasterTabbedLayout ||| myTabbedLayout ||| myTiledLayout)
+        onWorkspace "9" (myTabbedLayout ||| myFullLayout ||| myGimpLayout) $
+        (myTabbedLayout ||| myMasterTabbedLayout ||| myTiledLayout)
     )
 
 main = do