reorganization and updates

3 files changed, 40 insertions, 1 deletions

diff --git a/x/.Xresources b/x/.Xresources
index b2bc1e3..09b8ab7 100755
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,7 +1,7 @@
 #if __has_include(".extend.Xresources")
 #include ".extend.Xresources"
 #endif
-#include ".Xresources.dark"
+#include ".gruvbox-dark.xresources"
 
 ! ^ The above lines are no comments!
 ! Leave them as they are if a file ~/.extend.Xresources is being used on your system.
diff --git a/x/.gruvbox-dark.xresources b/x/.gruvbox-dark.xresources
new file mode 100644
index 0000000..5beeba2
--- /dev/null
+++ b/x/.gruvbox-dark.xresources
@@ -0,0 +1,36 @@
+! -----------------------------------------------------------------------------
+! File: gruvbox-dark.xresources
+! Description: Retro groove colorscheme generalized
+! Author: morhetz <morhetz@gmail.com>
+! Source: https://github.com/morhetz/gruvbox-generalized
+! Last Modified: 6 Sep 2014
+! -----------------------------------------------------------------------------
+
+! hard contrast: *background: #1d2021
+*background: #282828
+! soft contrast: *background: #32302f
+*foreground: #ebdbb2
+! Black + DarkGrey
+*color0:  #282828
+*color8:  #928374
+! DarkRed + Red
+*color1:  #cc241d
+*color9:  #fb4934
+! DarkGreen + Green
+*color2:  #98971a
+*color10: #b8bb26
+! DarkYellow + Yellow
+*color3:  #d79921
+*color11: #fabd2f
+! DarkBlue + Blue
+*color4:  #458588
+*color12: #83a598
+! DarkMagenta + Magenta
+*color5:  #b16286
+*color13: #d3869b
+! DarkCyan + Cyan
+*color6:  #689d6a
+*color14: #8ec07c
+! LightGrey + White
+*color7:  #a89984
+*color15: #ebdbb2
diff --git a/x/.xinitrc b/x/.xinitrc
index a01a091..3927c0d 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -4,5 +4,8 @@ setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle
 # load Xresources
 [[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
 
+# Set display
+systemctl --user import-environment DISPLAY
+
 #exec startxfce4
 exec i3