summaryrefslogtreecommitdiff
path: root/.xinitrc
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-10-16 19:09:42 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-10-16 19:09:42 -0400
commit1ff883371700757696efafefe266572776ac9558 (patch)
treed2104f7f405f4fe7a8957e86f53300ee6d4b1aeb /.xinitrc
parent3d607ee3f5dc7fd27bbce6c447e02778310a4b9d (diff)
parent3515a46d330af1d09bf1e0b963c13a86c2dbe8a8 (diff)
Merge branch 'master' into build64-par
Conflicts: .login-daemons
Diffstat (limited to '.xinitrc')
l---------[-rw-r--r--].xinitrc27
1 files changed, 1 insertions, 26 deletions
diff --git a/.xinitrc b/.xinitrc
index 9c5ce55..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 ck-launch-session wmii
+.config/X11/clientrc \ No newline at end of file