Use flourine X config files

diff --git a/X/.Xresources b/X/.Xresources
index 98a69392000b3dd03bc1b477d6c2feac1b714ee7..7ebee6a3c8b70b15c10a2e93ced5093834b49a45 100644 (file)
--- a/X/.Xresources
+++ b/X/.Xresources
@@ -1,51 +1,43 @@
-#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
-
-#define S_base03        #00161b
-#define S_base02        #04222a
-#define S_base01        #586e75
-#define S_base00        #657b83
-#define S_base0         #839496
-#define S_base1         #93a1a1
-#define S_base2         #eee8d5
-#define S_base3         #fdf6e3
-
-*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
-
-xterm*termName: xterm-color 
-XTerm*locale: true
-XTerm*metaSendsEscape: true
-xterm*faceName: Liberation Mono
-xterm*faceSize: 13
-
-Rxvt*scrollBar: false
-Xcursor.size: 30 
+! special
+*.foreground:   #f8f8f3
+*.background:   #272822
+*.cursorColor:  #f8f8f3
+
+! black
+*.color0:       #000000
+*.color8:       #555555
+
+! red
+*.color1:       #f92672
+*.color9:       #dd4278
+
+! green
+*.color2:       #74e22e
+*.color10:      #9dc54b
+
+! yellow
+*.color3:       #e6db74
+*.color11:      #d1ca89
+
+! blue
+*.color4:       #66d9ef
+*.color12:      #7accda
+
+! magenta
+*.color5:       #ae81ff
+*.color13:      #b392ef
+
+! cyan
+*.color6:       #00d9d9
+*.color14:      #c8f0f0
+
+! white
+*.color7:       #f5deb3
+*.color15:      #ffffff
+
+
+*faceName: Inconsolata
+*faceSize: 14
+
+
+XTerm*termName: xterm-256color

diff --git a/X/.xinitrc b/X/.xinitrc
index a0f6e2a8aab0c1e9a4178eec6aa79fd7662032a0..1a86c7fc988fab9cc81b8f5d6f98da173fd013e1 100644 (file)
--- a/X/.xinitrc
+++ b/X/.xinitrc
@@ -16,9 +16,8 @@ fi
 # Load .Xresources
 xrdb -merge ~/.Xresources &> /dev/null
 
+setxkbmap gb
 
-# Set caps lock as control to avoid emacs pinky
-setxkbmap -option ctrl:nocaps
 
 # Set java font option
 export _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=on"