summaryrefslogtreecommitdiffstats
path: root/xmonad
diff options
context:
space:
mode:
authorStefan Ritter <xeno@thehappy.de>2009-10-21 15:57:01 +0200
committerStefan Ritter <xeno@thehappy.de>2009-10-21 15:57:01 +0200
commitee14f6d0b28afbe5d61ca60e081824d6c4cb0341 (patch)
tree35f9a953f92e33ed0d105e385eed531e1635764a /xmonad
parent7a0fb14d5e0d8ca6192ae9ab07819eaa5928cf06 (diff)
Several things:
* Added emacs config * Using emacs in gitconfig * Modified xmonad.hs for using xmobar * Added 'e' alias for emacs
Diffstat (limited to 'xmonad')
-rw-r--r--xmonad/xmonad-0.8.hs33
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,