screenrc rewrite

[dotfiles] / .xmonad / xmonad.hs

diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index f664fa4286ac08db9a6295b4d397e56259c41052..262cd09eb0fa62dc174862aa33ff6f2ff073123f 100644 (file)
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -28,7 +28,7 @@ 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"),
@@ -83,7 +83,6 @@ myManageHook =
         (isSkipTaskBar -?> doFloat),
         (isDialog -?> doFloatAt 0.1 0.1),
         (isFullscreen -?> doFullFloat),
-        ((className =? "Emacs" <&&> resource =? "Ediff") -?> doFloat),
         (fmap Just $ doF avoidMaster)
     ]