neocturne/xmonad-conf
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some updates for GHC 7.4

Browse source
This commit is contained in:
Matthias Schiffer 2012-03-08 21:12:54 +01:00
parent 01a381911a
commit a544d20f7b
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Storage.hs
View file

@ -1,4 +1,4 @@
{-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, PatternGuards #-} {-# LANGUAGE DeriveDataTypeable, ExistentialQuantification, TypeSynonymInstances, MultiParamTypeClasses, FlexibleInstances, PatternGuards, DatatypeContexts #-}
module Storage ( StoreData module Storage ( StoreData
, Storage , Storage

13
xmonad.hs
View file

@ -15,7 +15,7 @@ import Control.Monad
import Control.Monad.Trans import Control.Monad.Trans
import Data.Maybe import Data.Maybe
import Data.Monoid import Data.Monoid
import Ratio((%)) import Data.Ratio((%))
import System.Exit import System.Exit
--import ConfigurableBorders --import ConfigurableBorders
@ -37,10 +37,11 @@ main = xmonad $ ewmh dwConfig $ defaultConfig
, logHook = ewmhDesktopsLogHook , logHook = ewmhDesktopsLogHook
, focusedBorderColor = "#008000" , focusedBorderColor = "#008000"
, rescreenHook = dynamicRescreenHook dwConfig , rescreenHook = dynamicRescreenHook dwConfig
, borderWidth = 0
} }
`additionalKeysP` ( `additionalKeysP` (
[ ("M-a", sendMessage MirrorShrink) [ ("M-a", sendMessage MirrorShrink)
, ("M-y", sendMessage MirrorExpand) , ("M-z", sendMessage MirrorExpand)
, ("M-<Left>", prevWS) , ("M-<Left>", prevWS)
, ("M-<Right>", nextWS) , ("M-<Right>", nextWS)
, ("M-S-<Left>", shiftToPrev) , ("M-S-<Left>", shiftToPrev)
@ -50,10 +51,11 @@ main = xmonad $ ewmh dwConfig $ defaultConfig
, ("M-<F2>", viewOrWarp 1) , ("M-<F2>", viewOrWarp 1)
, ("M-<F3>", viewOrWarp 2) , ("M-<F3>", viewOrWarp 2)
, ("M-b", banishScreen LowerRight) , ("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-p", spawnOnCurrent "/home/neoraider/bin/dmemu_run -b")
, ("M-g", gets (W.currentTag . windowset) >>= regroupProcess) , ("M-g", gets (W.currentTag . windowset) >>= regroupProcess)
, ("M-S-q", io (exitWith ExitSuccess)) , ("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") , ("M-`", spawn "xclip -o | qrencode -s 10 -o- | display -geometry +0+0")
, ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%- unmute") , ("<XF86AudioLowerVolume>", spawn "amixer -q sset Master 5%- unmute")
, ("<XF86AudioMute>", spawn "amixer -q sset Master toggle") , ("<XF86AudioMute>", spawn "amixer -q sset Master toggle")
@ -145,8 +147,9 @@ myManageHook = composeAll
[ className =? "Guake.py" -?> doFloatMaybeFullscreen -- <+> doConfigBorderOff) [ className =? "Guake.py" -?> doFloatMaybeFullscreen -- <+> doConfigBorderOff)
--, className =? "Do" -?> (doFloat <+> doConfigBorderOff) --, className =? "Do" -?> (doFloat <+> doConfigBorderOff)
, className =? "MPlayer" -?> doCenterFloat , className =? "MPlayer" -?> doCenterFloat
, className =? "mplayer2" -?> doCenterFloat
, className =? "Gnome-session" -?> doIgnoreProcessWorkspace , className =? "Gnome-session" -?> doIgnoreProcessWorkspace
, className =? "Gimp" -?> doFloat --, className =? "Gimp" -?> doFloat
, className =? "jrummikub-JRummikub" -?> doFloat , className =? "jrummikub-JRummikub" -?> doFloat
, className =? "Stjerm" -?> doFloatMaybeFullscreen , className =? "Stjerm" -?> doFloatMaybeFullscreen
, className =? "Display" -?> doFloat , className =? "Display" -?> doFloat
@ -164,7 +167,7 @@ myManageHook = composeAll
--myUnmanageHook = moveUp1 --myUnmanageHook = moveUp1
myLayoutHook = screenWorkspaceStorage $ processWorkspaceManager $ manageFullscreen $ smartBorders (Full ||| tiled ||| Mirror tiled) myLayoutHook = screenWorkspaceStorage $ processWorkspaceManager $ manageFullscreen {- $ smartBorders -} (Full ||| tiled ||| Mirror tiled)
where where
-- default tiling algorithm partitions the screen into two panes -- default tiling algorithm partitions the screen into two panes
tiled = ResizableTall nmaster delta ratio [] tiled = ResizableTall nmaster delta ratio []