Merge remote-tracking branch 'origin/master'

2 files changed, 83 insertions, 0 deletions

diff --git a/xresources/.xresources/main b/xresources/.xresources/main
new file mode 100644
index 00000000..73f8096d
--- /dev/null
+++ b/xresources/.xresources/main
@@ -0,0 +1,13 @@
+#include "solarized-light"
+
+Xcursor.theme:            Neutral
+Xcursor.size:             22
+
+Emacs.ToolBar:            off
+Emacs.MenuBar:            off
+Emacs.ScrollBars:         off
+Emacs.CursorBlink:        off
+
+Emacs.Font:                         -*-Input Mono Narrow-normal-*-*-*-16-*-*-*-*-*-*-*
+Emacs.fixed-pitch.attributeFont:    -*-Input Mono Narrow-normal-*-*-*-16-*-*-*-*-*-*-*
+Emacs.variable-pitch.attributeFont: -*-Input Sans-medium-r-*-*-16-*-*-*-*-*-*-*
diff --git a/xresources/.xresources/solarized-light b/xresources/.xresources/solarized-light
new file mode 100644
index 00000000..3906b7b0
--- /dev/null
+++ b/xresources/.xresources/solarized-light
@@ -0,0 +1,70 @@
+! 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
+*color8:                  S_base03
+*color9:                  S_orange
+*color10:                 S_base01
+*color11:                 S_base00
+*color12:                 S_base0
+*color13:                 S_violet
+*color14:                 S_base1
+*color15:                 S_base3