diff options
Diffstat (limited to 'xmonad')
| -rw-r--r-- | xmonad/xmonad-0.8.hs | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs index 0ea6d0b..2d7c62f 100644 --- a/xmonad/xmonad-0.8.hs +++ b/xmonad/xmonad-0.8.hs @@ -1,18 +1,21 @@ import XMonad +import XMonad.Hooks.DynamicLog import XMonad.Hooks.ManageDocks +import XMonad.Util.Run (spawnPipe) +import XMonad.Actions.CycleWS import System.Exit +import System.IO import qualified XMonad.StackSet as W import qualified Data.Map as M -myTerminal = "urxvt" +myTerminal = "x-terminal-emulator" myBorderWidth = 1 myModMask = mod1Mask myNumlockMask = mod2Mask myWorkspaces = ["1","2","3","4","5","6","7","8","9"] myNormalBorderColor = "#dddddd" myFocusedBorderColor = "#ff0000" -myDefaultGaps = [(0,0,0,0)] myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ [ ((modMask, xK_Return), spawn $ XMonad.terminal conf) @@ -26,9 +29,12 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ , ((modMask, xK_m ), windows W.focusMaster ) , ((modMask .|. shiftMask, xK_r ), windows W.swapDown ) , ((modMask .|. shiftMask, xK_g ), windows W.swapUp ) - , ((modMask, xK_h ), withFocused $ windows . W.sink) - , ((modMask , xK_h ), sendMessage (IncMasterN 1)) - , ((modMask , xK_f ), sendMessage (IncMasterN (-1))) + , ((modMask, xK_h ), prevWS) + , ((modMask, xK_f ), nextWS) + , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) + --, ((modMask, xK_h ), withFocused $ windows . W.sink) + --, ((modMask , xK_h ), sendMessage (IncMasterN 1)) + --, ((modMask , xK_f ), sendMessage (IncMasterN (-1))) ] ++ @@ -41,20 +47,22 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $ , ((modMask, button2), (\w -> focus w >> windows W.swapMaster)) , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w)) ] - + myManageHook = composeAll [ className =? "MPlayer" --> doFloat , className =? "Gimp" --> doFloat ] - + myFocusFollowsMouse :: Bool myFocusFollowsMouse = True - + myLogHook = return () myStartupHook = return () - -main = xmonad defaults - -defaults = defaultConfig { + +myConfig = defaultConfig + +main = do +xmobar <- spawnPipe "xmobar" +xmonad $ defaultConfig { manageHook = manageDocks <+> manageHook defaultConfig, layoutHook = avoidStruts $ layoutHook defaultConfig, terminal = myTerminal, @@ -65,7 +73,6 @@ defaults = defaultConfig { workspaces = myWorkspaces, normalBorderColor = myNormalBorderColor, focusedBorderColor = myFocusedBorderColor, - defaultGaps = myDefaultGaps, keys = myKeys, mouseBindings = myMouseBindings, logHook = myLogHook, |