move the X11 config files to .config/X11, add a serverrc file

remove extra newline from .config/X11/login

9 files changed, 71 insertions, 54 deletions

diff --git a/.Xdefaults b/.Xdefaults
index ceabc5c..7588317 100644..120000
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,18 +1 @@
-URxvt.background: #000000
-URxvt.foreground: #CCCCCC
-
-URxvt.scrollstyle: plain
-URxvt.scrollBar_floating: true
-
-URxvt.font: xft:Monospace-8
-URxvt.cursorBlink: true
-URxvt.termName: xterm-256color
-URxvt.pastableTabs: true
-
-URxvt.scrollTtyOutput: false
-URxvt.scrollTtyKeypress: false
-URxvt.scrollWithBuffer: true
-
-URxvt.perl-ext-common: default,matcher
-URxvt.urlLauncher: v-www-browser
-URxvt.matcher.button: 1
+.config/X11/defaults
\ No newline at end of file
diff --git a/.config/X11/clientrc b/.config/X11/clientrc
new file mode 100644
index 0000000..d1e1725
--- /dev/null
+++ b/.config/X11/clientrc
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+	echo ' ==> Running scripts in Entering xinitrc.d/*'
+	for f in /etc/X11/xinit/xinitrc.d/*; do
+		echo "  -> $f"
+		[ -x "$f" ] && "$f" &
+	done
+	unset f
+	echo '  -> done'
+fi
+
+usermodmap="$XDG_CONFIG_HOME/X11/modmap"
+if [ -f "$usermodmap" ]; then
+	xmodmap "$usermodmap"
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice
+#export WMII_CONFPATH="$XDG_CONFIG_HOME/wmii"
+exec wmii
diff --git a/.config/X11/defaults b/.config/X11/defaults
new file mode 100644
index 0000000..ceabc5c
--- /dev/null
+++ b/.config/X11/defaults
@@ -0,0 +1,18 @@
+URxvt.background: #000000
+URxvt.foreground: #CCCCCC
+
+URxvt.scrollstyle: plain
+URxvt.scrollBar_floating: true
+
+URxvt.font: xft:Monospace-8
+URxvt.cursorBlink: true
+URxvt.termName: xterm-256color
+URxvt.pastableTabs: true
+
+URxvt.scrollTtyOutput: false
+URxvt.scrollTtyKeypress: false
+URxvt.scrollWithBuffer: true
+
+URxvt.perl-ext-common: default,matcher
+URxvt.urlLauncher: v-www-browser
+URxvt.matcher.button: 1
diff --git a/.config/X11/login b/.config/X11/login
new file mode 100644
index 0000000..03bad2a
--- /dev/null
+++ b/.config/X11/login
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#
+# ~/.xsession
+#
+# Executed by xdm/gdm/kdm at login
+#
+
+/bin/bash --login -i ~/.xinitrc
diff --git a/.config/X11/modmap b/.config/X11/modmap
new file mode 100644
index 0000000..e4ade24
--- /dev/null
+++ b/.config/X11/modmap
@@ -0,0 +1,7 @@
+remove lock = Caps_Lock
+keysym Caps_Lock = Super_L
+
+keycode 135 = Super_R
+
+clear mod4
+add mod4 = Super_L Super_R Hyper_L Hyper_R Menu
diff --git a/.config/X11/serverrc b/.config/X11/serverrc
new file mode 100644
index 0000000..d6c6ffc
--- /dev/null
+++ b/.config/X11/serverrc
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+VT=vt07
+#VT=$(tty|sed 's@/dev/tty@vt@')
+
+exec /usr/bin/X -nolisten tcp "$VT" "$@"
diff --git a/.xinitrc b/.xinitrc
index bfc352b..c0f7e1c 100644..120000
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,26 +1 @@
-#!/bin/sh
-#
-# ~/.xinitrc
-#
-# Executed by startx (run your window manager from here)
-
-if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  echo ' ==> Running scripts in Entering xinitrc.d/*'
-  for f in /etc/X11/xinit/xinitrc.d/*; do
-    echo "  -> $f"
-    [ -x "$f" ] && "$f" &
-  done
-  unset f
-  echo '  -> done'
-fi
-
-usermodmap="$HOME/.xmodmap"
-if [ -f "$usermodmap" ]; then
-  xmodmap "$usermodmap"
-fi
-
-# exec gnome-session
-# exec startkde
-# exec startxfce4
-# ...or the Window Manager of your choice
-exec wmii
+.config/X11/clientrc
\ No newline at end of file
diff --git a/.xserverrc b/.xserverrc
new file mode 120000
index 0000000..f46e3e3
--- /dev/null
+++ b/.xserverrc
@@ -0,0 +1 @@
+.config/X11/serverrc
\ No newline at end of file
diff --git a/.xsession b/.xsession
index a16dc0b..ee16887 100644..120000
--- a/.xsession
+++ b/.xsession
@@ -1,10 +1 @@
-#!/bin/sh
-
-#
-# ~/.xsession
-#
-# Executed by xdm/gdm/kdm at login
-#
-
-/bin/bash --login -i ~/.xinitrc
-
+.config/X11/login
\ No newline at end of file