X-Git-Url: https://code.delx.au/dotfiles/blobdiff_plain/fa3c00e8c7773426e698bc704febd8e9d70484fd..a145ebfc025201285edcdec6a1fc04707cab41ba:/.xmonad/xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index bc4edd9..2798d9d 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -3,6 +3,7 @@ import System.IO
 import XMonad
 import XMonad.Actions.CycleRecentWS
 import XMonad.Actions.PhysicalScreens
+import XMonad.Config.Desktop
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.ICCCMFocus
@@ -32,6 +33,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
 
         ((modm, xK_n), spawn "xfce4-terminal"),
         ((modm, xK_i), spawn "firefox"),
+        ((modm .|. shiftMask, xK_i), spawn "firefox --private-window"),
         ((modm, xK_c), spawn "emacsclient --create-frame --no-wait"),
         ((modm, xK_p), spawn "kupfer"),
 
@@ -51,16 +53,15 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
         ((modm , xK_period), sendMessage (IncMasterN (-1))),
         ((modm , xK_b ), sendMessage ToggleStruts),
         ((modm , xK_z ), sendMessage Mag.Toggle),
-        ((modm , xK_a), cycleRecentWS [xK_Super_L] xK_a xK_a)
+        ((modm , xK_a), cycleRecentWorkspaceOnSingleScreen [xK_Super_L] xK_a xK_a)
     ]
     ++
 
     -- mod-{o,e,u}, Switch to physical/Xinerama screens 1, 2, or 3
     -- mod-shift-{o,e,u}, Move client to screen 1, 2, or 3
-    [((m .|. modm, key), f sc)
+    [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f))
         | (key, sc) <- zip [xK_o, xK_e, xK_u] [0..]
-        , (f, m) <- [(viewScreen, 0), (sendToScreen, shiftMask)]
-    ]
+        , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
     ++
 
     -- mod-[1..9], Switch to workspace N
@@ -70,6 +71,10 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
         , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
     ]
 
+cycleRecentWorkspaceOnSingleScreen = cycleWindowSets options
+    where
+        options w = map (W.view `flip` w) (recentTags w)
+        recentTags w = map W.tag $ W.hidden w ++ [W.workspace (W.current w)]
 
 avoidMaster = W.modify' $ \c -> case c of
     W.Stack t [] (r:rs) -> W.Stack t [r] rs
@@ -160,7 +165,7 @@ myLayout =
 main = do
     xmonadDir <- getXMonadDir
     xmobars <- mapM (\x -> spawnPipe ("xmobar -x " ++ (show x) ++ " " ++ xmonadDir ++ "/xmobar.hs")) [1, 2]
-    xmonad $ ewmh defaultConfig {
+    xmonad $ desktopConfig {
         manageHook = myManageHook,
         layoutHook = myLayout,
         workspaces = myWorkspaces,
@@ -168,7 +173,7 @@ main = do
         startupHook = myStartupHook,
         keys = myKeys,
         modMask = mod4Mask,
-        handleEventHook = handleEventHook defaultConfig <+> fullscreenEventHook,
+        handleEventHook = handleEventHook desktopConfig <+> fullscreenEventHook,
         focusFollowsMouse = False
     }