bash: improve SSH_AUTH_SOCK detection

[dotfiles] / .xmonad / xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 2798d9d3ab26c6e4e12c6852070770709c35c6c7..bf5ae5ae9bb448c18ba06540e196b9c35bde0f71 100644 (file)
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -37,7 +37,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
         ((modm, xK_c), spawn "emacsclient --create-frame --no-wait"),
         ((modm, xK_p), spawn "kupfer"),
 
-        ((modm .|. shiftMask, xK_c ), kill),
+        ((modm, xK_w ), kill),
         ((modm, xK_space ), sendMessage NextLayout),
         ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf),
         ((modm, xK_j ), windows W.focusDown),
@@ -59,9 +59,9 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
 
     -- 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), screenWorkspace sc >>= flip whenJust (windows . f))
+    [((m .|. modm, key), f sc)
         | (key, sc) <- zip [xK_o, xK_e, xK_u] [0..]
-        , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
+        , (f, m) <- [(viewScreen def, 0), (sendToScreen def, shiftMask)]]
     ++
 
     -- mod-[1..9], Switch to workspace N