Permalink
Browse files

Merge remote-tracking branch 'origin/master'

  • Loading branch information...
2 parents fd0ca1e + 30ba998 commit 5d22609bae39ae4b47214a70fe221195950af2c6 @mattjbray committed Dec 14, 2012
Showing with 83 additions and 1 deletion.
  1. +72 −0 .Xresources
  2. +3 −0 .gitmodules
  3. +1 −0 .oh-my-zsh
  4. +7 −1 .xinitrc
View
@@ -0,0 +1,72 @@
+! Solarized color scheme for the X Window System
+!
+! http://ethanschoonover.com/solarized
+
+
+! Common
+
+#define S_yellow #b58900
+#define S_orange #cb4b16
+#define S_red #dc322f
+#define S_magenta #d33682
+#define S_violet #6c71c4
+#define S_blue #268bd2
+#define S_cyan #2aa198
+#define S_green #859900
+
+
+! Dark
+
+#define S_base03 #002b36
+#define S_base02 #073642
+#define S_base01 #586e75
+#define S_base00 #657b83
+#define S_base0 #839496
+#define S_base1 #93a1a1
+#define S_base2 #eee8d5
+#define S_base3 #fdf6e3
+
+
+! Light
+
+! #define S_base03 #fdf6e3
+! #define S_base02 #eee8d5
+! #define S_base01 #93a1a1
+! #define S_base00 #839496
+! #define S_base0 #657b83
+! #define S_base1 #586e75
+! #define S_base2 #073642
+! #define S_base3 #002b36
+
+
+! To only apply colors to your terminal, for example, prefix
+! the color assignment statement with its name. Example:
+!
+! URxvt*background: S_base03
+
+*background: S_base03
+*foreground: S_base0
+*fading: 40
+*fadeColor: S_base03
+*cursorColor: S_base1
+*pointerColorBackground: S_base01
+*pointerColorForeground: S_base1
+
+*color0: S_base02
+*color1: S_red
+*color2: S_green
+*color3: S_yellow
+*color4: S_blue
+*color5: S_magenta
+*color6: S_cyan
+*color7: S_base2
+*color9: S_orange
+*color8: S_base03
+*color10: S_base01
+*color11: S_base00
+*color12: S_base0
+*color13: S_violet
+*color14: S_base1
+*color15: S_base3
+
+URxvt.font: -*-terminus-medium-*-*-*-*-140-*-*-*-*-iso8859-1
View
@@ -0,0 +1,3 @@
+[submodule ".oh-my-zsh"]
+ path = .oh-my-zsh
+ url = git://github.com/robbyrussell/oh-my-zsh.git
Submodule .oh-my-zsh added at 397c08
View
@@ -1,3 +1,9 @@
+xset +fp /usr/share/fonts/local
+xset fp rehash
+[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
conky | while read -r; do xsetroot -name "$REPLY"; done &
exec dunst --geometry x1+0-0 &
-exec dwm
+while true
+ do
+ /usr/bin/dwm 2> /dev/null
+done

0 comments on commit 5d22609

Please sign in to comment.