gitconfig: added expire-prune

[dotfiles] / .xmonad / xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 24d30bc3b501791fd18fc8d7d12e545e1757ebb3..dd296bdf7869d82f07ab557cca2309d91d29f93c 100644 (file)
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -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),
@@ -82,6 +83,7 @@ myManageHook =
         (isSkipTaskBar -?> doFloat),
         (isDialog -?> doFloatAt 0.1 0.1),
         (isFullscreen -?> doFullFloat),
+        ((className =? "Emacs" <&&> resource =? "Ediff") -?> doFloat),
         (fmap Just $ doF avoidMaster)
     ]
 
@@ -100,7 +102,7 @@ myLogHook hooks = do
 
 myStartupHook = do
     setWMName "LG3D" -- fix for Java Swing apps
-
+    spawn "xfce4-panel --restart" -- ensure it appears on top of xmobar
 
 goldenRatio = (toRational (2/(1+sqrt(5)::Double)))