9 files changed, 37 insertions, 104 deletions
diff --git a/x/.Xresources b/x/.Xresources
deleted file mode 100755
index 09b8ab7..0000000
--- a/x/.Xresources
+++ /dev/null
@@ -1,30 +0,0 @@
-#if __has_include(".extend.Xresources")
-#include ".extend.Xresources"
-#endif
-#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.
-! config can be added there or also here below.
-! For comments use "!"
-
-Xft.dpi: 96
-Xft.antialias: true
-Xft.hinting: true
-Xft.rgba: rgb
-Xft.autohint: false
-Xft.hintstyle: hintslight
-Xft.lcdfilter: lcddefault
-
-URxvt.internalBrder: 0
-URxvt.externalBorder: 0
-URxvt.intensityStyles: false
-URxvt.font: xft:monospace:size16
-URxvt.scrollBar: false
-URxvt*fading: 30
-
-XTerm*background: #2b2b2b
-XTerm*foreground: #e7e7e7
-XTerm*pointerColor: #16A085
-XTerm*faceName: Fixed
-XTerm*faceSize: 11
diff --git a/x/.Xresources.dark b/x/.Xresources.dark
deleted file mode 100755
index 6db1ab8..0000000
--- a/x/.Xresources.dark
+++ /dev/null
@@ -1,56 +0,0 @@
-#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
-
-*background:            S_base03
-*foreground:            S_base0
-*fadeColor:             S_base03
-*cursorColor:           S_base1
-*pointerColorBackground:S_base01
-*pointerColorForeground:S_base1
-
-#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
-
-!! black dark/light
-*color0:                S_base02
-*color8:                S_base03
-
-!! red dark/light
-*color1:                S_red
-*color9:                S_orange
-
-!! green dark/light
-*color2:                S_green
-*color10:               S_base01
-
-!! yellow dark/light
-*color3:                S_yellow
-*color11:               S_base00
-
-!! blue dark/light
-*color4:                S_blue
-*color12:               S_base0
-
-!! magenta dark/light
-*color5:                S_magenta
-*color13:               S_violet
-
-!! cyan dark/light
-*color6:                S_cyan
-*color14:               S_base1
-
-!! white dark/light
-*color7:                S_base2
-*color15:               S_base3
diff --git a/x/.config/X11/Xresources b/x/.config/X11/Xresources
new file mode 100755
index 0000000..5b0defc
--- /dev/null
+++ b/x/.config/X11/Xresources
@@ -0,0 +1,13 @@
+#if __has_include(".extend.Xresources")
+#include ".extend.Xresources"
+#endif
+
+! ^ The above lines are no comments!
+! Leave them as they are if a file ~/.extend.Xresources is being used on your system.
+! config can be added there or also here below.
+! For comments use "!"
+
+#include "gruvbox-dark.xresources"
+
+*.alpha: 0.8
+*.font: monospace:size=12
diff --git a/x/.gruvbox-dark.xresources b/x/.config/X11/gruvbox-dark.xresources
index 5beeba2..5beeba2 100644
--- a/x/.gruvbox-dark.xresources
+++ b/x/.config/X11/gruvbox-dark.xresources
diff --git a/x/.config/X11/xprofile b/x/.config/X11/xprofile
new file mode 100755
index 0000000..214a253
--- /dev/null
+++ b/x/.config/X11/xprofile
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# set keyboard
+setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle
+xset r rate 300 50
+
+# set wallpaper
+xwallpaper --zoom ${XDG_DATA_HOME}/images/wallpaper.jpg
+
+# load Xresources
+userresources=${XDG_CONFIG_HOME}/X/Xresources
+[ -f $userresources ] && xrdb -load $userresources
+
+# systemd user
+systemctl --user import-environment DISPLAY XAUTHORITY
+
+if command -v dbus-update-activation-environment >/dev/null 2>&1; then
+    dbus-update-activation-environment DISPLAY XAUTHORITY
+fi
+
diff --git a/x/.local/share/config-files/xprofile b/x/.local/share/config-files/xprofile
new file mode 120000
index 0000000..38d3742
--- /dev/null
+++ b/x/.local/share/config-files/xprofile
@@ -0,0 +1 @@
+../../../.config/X11/xprofile
+\ No newline at end of file
diff --git a/x/.local/share/config-files/xresources b/x/.local/share/config-files/xresources
new file mode 120000
index 0000000..eef1e02
--- /dev/null
+++ b/x/.local/share/config-files/xresources
@@ -0,0 +1 @@
+../../../.config/X11/Xresources
+\ No newline at end of file
diff --git a/x/.xinitrc b/x/.xinitrc
index b77a2bd..bfb558c 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,19 +1,7 @@
 #!/bin/sh
 
-[ -f ~/.xprofile ] && . ~/.xprofile
-
-userresources=$HOME/.Xresources
-
-[ -f $userresources ] && xrdb -merge $userresources
-
-# set keyboard
-setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle
-
-# load Xresources
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
-
-# Set display
-systemctl --user import-environment DISPLAY
+xprofile=${XDG_CONFIG_HOME}/X/xprofile
+[ -f  $xprofile ] && . $xprofile
 
 #exec startxfce4
 exec i3
diff --git a/x/.xprofile b/x/.xprofile
deleted file mode 100755
index f79cc58..0000000
--- a/x/.xprofile
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-xwallpaper --zoom ~/.local/share/images/wallpaper.jpg
-