Merge branch 'master' of git@fucktheforce.de:xeno

4 files changed, 33 insertions, 27 deletions

diff --git a/pbuilderrc b/pbuilderrc
new file mode 100644
index 0000000..66a600b
--- /dev/null
+++ b/pbuilderrc
@@ -0,0 +1,8 @@
+BUILDRESULT=/home/gideonstar/temp/
+MIRRORSITE=http://debian/debian
+DISTRIBUTION=sid
+EXTRAPACKAGES="lintian"
+BUILDRESULTUID=1000
+BUILDRESULTGID=1000
+AUTO_DEBSIGN=no
+DEBOOTSTRAP=cdebootstrap
diff --git a/vim/vimrc b/vim/vimrc
index 5b01cc1..d52f77d 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1,5 +1,5 @@
 syntax on
-colorscheme zenburn
+colorscheme slate
 filetype plugin indent on
 
 set laststatus=2
diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs
index 2d7c62f..a9304ac 100644
--- a/xmonad/xmonad-0.8.hs
+++ b/xmonad/xmonad-0.8.hs
@@ -1,6 +1,7 @@
 import XMonad
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.UrgencyHook
 import XMonad.Util.Run (spawnPipe)
 import XMonad.Actions.CycleWS
 import System.Exit
@@ -9,14 +10,6 @@ import System.IO
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M
  
-myTerminal      = "x-terminal-emulator"
-myBorderWidth   = 1
-myModMask       = mod1Mask
-myNumlockMask   = mod2Mask
-myWorkspaces    = ["1","2","3","4","5","6","7","8","9"]
-myNormalBorderColor  = "#dddddd"
-myFocusedBorderColor = "#ff0000"
- 
 myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     [ ((modMask,               xK_Return), spawn $ XMonad.terminal conf)
     , ((modMask,               xK_q     ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
@@ -55,26 +48,26 @@ myManageHook = composeAll
 myFocusFollowsMouse :: Bool
 myFocusFollowsMouse = True
 
-myLogHook = return ()
-myStartupHook = return ()
-
 myConfig = defaultConfig
 
 main = do
-xmobar <- spawnPipe "xmobar"
-xmonad $ defaultConfig {
+xmproc <- spawnPipe "xmobar"
+xmonad $ withUrgencyHook NoUrgencyHook defaultConfig {
 	manageHook         = manageDocks <+> manageHook defaultConfig,
 	layoutHook         = avoidStruts $ layoutHook defaultConfig,
-        terminal           = myTerminal,
+        terminal           = "x-terminal-emulator",
         focusFollowsMouse  = myFocusFollowsMouse,
-        borderWidth        = myBorderWidth,
-        modMask            = myModMask,
-        numlockMask        = myNumlockMask,
-        workspaces         = myWorkspaces,
-        normalBorderColor  = myNormalBorderColor,
-        focusedBorderColor = myFocusedBorderColor,
+        borderWidth        = 1,
+        modMask            = mod1Mask,
+        numlockMask        = mod2Mask,
+        workspaces         = ["1","2","3","4","5","6","7","8","9"],
+        normalBorderColor  = "#dddddd",
+        focusedBorderColor = "#ff0000",
         keys               = myKeys,
         mouseBindings      = myMouseBindings,
-        logHook            = myLogHook,
-        startupHook        = myStartupHook
+        logHook            = dynamicLogWithPP $ xmobarPP { 
+			     		      ppOutput = hPutStrLn xmproc , 
+					      ppTitle = xmobarColor "green" "" . shorten 50 , 
+					      ppUrgent = xmobarColor "yellow" "red" . shorten 50 },
+        startupHook        = return()
     }
diff --git a/xorg/xdefaults b/xorg/xdefaults
index 014e59f..aa47948 100644
--- a/xorg/xdefaults
+++ b/xorg/xdefaults
@@ -1,8 +1,9 @@
-#URxvt*font: -xos4-terminus-*-*-*-*-*-*-*-*-*-*-*-*
+# Font
 URxvt*font: xft:DejaVu Sans Mono:size=8
 
+# General Settings
 URxvt*buffered: true
-URxvt*internalBorder: 2
+URxvt*internalBorder: 5
 URxvt*reverseVideo: false
 URxvt*scrollBar: false
 URxvt*scrollstyle: plain
@@ -15,8 +16,8 @@ URxvt*cutchars: `"()'*<>[]{|}
 URxvt*urgentOnBell: true
 URxvt*visualBell: false
 URxvt*selection.pattern-0: ([[:word:]]+)
-URxvt*inheritPixmap: false
 
+# Yank URLs
 URxvt*keysym.M-u: perl:mark-yank-urls:activate_mark_mode
 URxvt*underlineURLs: true
 URxvt*perl-lib: /home/gideonstar/etc/perl/
@@ -26,20 +27,24 @@ URxvt*urlLauncher: firefox
 URxvt*matcher.button: 1
 URxvt*matcher.pattern.1: \\bwww\\.[\\w-]\\.[\\w./?&@#-]*[\\w/-]
 
+# Transparency
 URxvt*inheritPixmap: True
 URxvt*transparent: True
 URxvt*shading: 35
 URxvt*fading: 40
 URxvt*tintColor: grey
 
+# Colors
+URxvt*cursorColor: #6E8558
 URxvt*background: #0e1310
 URxvt*foreground: #ffffff
 URxvt*colorBD: #FFFFFF
 URxvt*colorUL: #FFFFFF
+
 URxvt*color0: #5D5D5D
 URxvt*color1: #CC0000
 URxvt*color2: #6E8558
-URxvt*color3: #C4A000
+URxvt*color3: #E7D78E
 URxvt*color4: #3465A4
 URxvt*color5: #CEA86F
 URxvt*color6: #FFFFFF