- xmonad update (0.11) + new keystrokes + color fix

- xinitrc cursor, dpms, etc

2 files changed, 32 insertions, 13 deletions

diff --git a/configs/xinitrc_msi b/configs/xinitrc_msi
index cbe0635..50fb29b 100644
--- a/configs/xinitrc_msi
+++ b/configs/xinitrc_msi
@@ -1,11 +1,18 @@
 #!/bin/sh
 
+xrandr -s 0
+xrdb -load $HOME/.Xdefaults
+xsetroot -cursor_name left_ptr
+xset b off
+xset s off
+xset -dpms
+
 start-pulseaudio-x11
 
 feh --bg-center ~/chai.jpg
 
-# hide cursor when unused
-unclutter -idle 3 -root &
+# hide cursor when unused (DONT FORGET -noevents / BUG)
+unclutter -idle 3 -root -noevents &
 
 # Turn CapsLock into Control
 xmodmap -e "clear lock" -e "keycode 66 = Control_R" -e "add Control = Control_R"
@@ -27,8 +34,11 @@ fi
 # activate trickled network bandwith control
 trickled
 
+if [ -x /usr/bin/xcompmgr ]; then
+  /usr/bin/xcompmgr &
+fi
 if [ -x /usr/bin/ck-launch-session ]; then
-  exec ck-launch-session dbus-launch xmonad
+  exec ck-launch-session dbus-launch ~/.cabal/bin/xmonad
 else
-  exec dbus-launch xmonad
+  exec dbus-launch ~/.cabal/bin/xmonad
 fi
diff --git a/configs/xmonad.hs b/configs/xmonad.hs
index acec436..9d0ae28 100644
--- a/configs/xmonad.hs
+++ b/configs/xmonad.hs
@@ -14,6 +14,7 @@ import XMonad.Layout.Spiral
 import XMonad.Layout.Tabbed
 import XMonad.Actions.SpawnOn
 import XMonad.Actions.PhysicalScreens
+import XMonad.Actions.CycleWS
 import XMonad.Util.Run
 import XMonad.Util.EZConfig(additionalKeys)
 import qualified XMonad.StackSet as W
@@ -51,6 +52,7 @@ myWorkspaces = ["1:pidg","2:file","3:web","4:work1","5:work2"] ++ map show [6..9
 --
 myManageHook = composeAll
     [ className =? "Iceweasel" --> doShift "3:web"
+    , className =? "Chromium" --> doShift "3:web"
     , className =? "Icedove" --> doShift "3:web"
     , className =? "Pidgin" --> doShift "1:pidg"
     , className =? "Eclipse" --> doShift "2:file"
@@ -77,25 +79,20 @@ myManageHook = composeAll
 -- which denotes layout choice.
 --
 myLayout = avoidStruts (
-    Tall 1 (3/100) (1/2) |||
-    Mirror (Tall 1 (3/100) (1/2)) |||
-    tabbed shrinkText tabConfig |||
-    Full |||
-    spiral (6/7))
-
+    Tall 1 (3/100) (1/2) ||| Mirror (Tall 1 (3/100) (1/2)) ||| Full ||| tabbed shrinkText myTabConfig)
 
 ------------------------------------------------------------------------
 -- Colors and borders
 -- Currently based on the ir_black theme.
 --
 myNormalBorderColor = "#7c7c7c"
-myFocusedBorderColor = "#ffb6b0"
+myFocusedBorderColor = "#ff0000"
 
 -- Colors for text and backgrounds of each tab when in "Tabbed" layout.
-tabConfig = defaultTheme {
+myTabConfig = defaultTheme {
     activeBorderColor = "#7C7C7C",
     activeTextColor = "#CEFFAC",
-    activeColor = "#000000",
+    activeColor = "#445566",
     inactiveBorderColor = "#7C7C7C",
     inactiveTextColor = "#EEEEEE",
     inactiveColor = "#000000"
@@ -184,6 +181,18 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
   , ((modMask, xK_n),
      refresh)
 
+  , ((modMask, xK_Left),
+     prevWS)
+
+  , ((modMask, xK_Right),
+     nextWS)
+
+  , ((modMask, xK_Up),
+     shiftToNext)
+
+  , ((modMask, xK_Down),
+     shiftToPrev)
+
   -- Move focus to the next window.
   , ((modMask, xK_Tab),
      windows W.focusDown)