diff options
| -rw-r--r-- | lib/Storage.hs | 2 | ||||
| -rw-r--r-- | xmonad.hs | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/Storage.hs b/lib/Storage.hs index 7f68b15..9c70b04 100644 --- a/lib/Storage.hs +++ b/lib/Storage.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, PatternGuards #-} +{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, PatternGuards, DatatypeContexts #-} module Storage ( StoreData , Storage @@ -15,7 +15,7 @@ import Control.Monad import Control.Monad.Trans import Data.Maybe import Data.Monoid -import Ratio((%)) +import Data.Ratio((%)) import System.Exit --import ConfigurableBorders @@ -37,10 +37,11 @@ main = xmonad $ ewmh dwConfig $ defaultConfig , logHook = ewmhDesktopsLogHook , focusedBorderColor = "#008000" , rescreenHook = dynamicRescreenHook dwConfig + , borderWidth = 0 } `additionalKeysP` ( [ ("M-a", sendMessage MirrorShrink) - , ("M-y", sendMessage MirrorExpand) + , ("M-z", sendMessage MirrorExpand) , ("M-<Left>", prevWS) , ("M-<Right>", nextWS) , ("M-S-<Left>", shiftToPrev) @@ -50,10 +51,11 @@ main = xmonad $ ewmh dwConfig $ defaultConfig , ("M-<F2>", viewOrWarp 1) , ("M-<F3>", viewOrWarp 2) , ("M-b", banishScreen LowerRight) + , ("M-f", withFocused $ \w -> windows $ W.float w $ W.RationalRect 0 0 1 1) , ("M-p", spawnOnCurrent "/home/neoraider/bin/dmemu_run -b") , ("M-g", gets (W.currentTag . windowset) >>= regroupProcess) , ("M-S-q", io (exitWith ExitSuccess)) - , ("C-M1-l", spawn "gnome-screensaver-command --lock") + , ("C-M1-l", spawn "xscreensaver-command -lock") , ("M-`", spawn "xclip -o | qrencode -s 10 -o- | display -geometry +0+0") , ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%- unmute") , ("<XF86AudioMute>", spawn "amixer -q sset Master toggle") @@ -145,8 +147,9 @@ myManageHook = composeAll [ className =? "Guake.py" -?> doFloatMaybeFullscreen -- <+> doConfigBorderOff) --, className =? "Do" -?> (doFloat <+> doConfigBorderOff) , className =? "MPlayer" -?> doCenterFloat + , className =? "mplayer2" -?> doCenterFloat , className =? "Gnome-session" -?> doIgnoreProcessWorkspace - , className =? "Gimp" -?> doFloat + --, className =? "Gimp" -?> doFloat , className =? "jrummikub-JRummikub" -?> doFloat , className =? "Stjerm" -?> doFloatMaybeFullscreen , className =? "Display" -?> doFloat @@ -164,7 +167,7 @@ myManageHook = composeAll --myUnmanageHook = moveUp1 -myLayoutHook = screenWorkspaceStorage $ processWorkspaceManager $ manageFullscreen $ smartBorders (Full ||| tiled ||| Mirror tiled) +myLayoutHook = screenWorkspaceStorage $ processWorkspaceManager $ manageFullscreen {- $ smartBorders -} (Full ||| tiled ||| Mirror tiled) where -- default tiling algorithm partitions the screen into two panes tiled = ResizableTall nmaster delta ratio [] |