summaryrefslogtreecommitdiff
path: root/.xinitrc
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-07-02 16:04:11 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-07-02 16:04:11 -0400
commitf8d7528a5a6ee83536ad397bbad8c46f5984d61f (patch)
tree2af66ef2f73442300066ec3b3a708740857afa8c /.xinitrc
parent8d5dd1b09ca02e869c89ac87f89bc790bc7c29ee (diff)
parentd383205ac60fdcf39bf2b0f813d63f91cf6e9dd5 (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts: .emacs
Diffstat (limited to '.xinitrc')
-rw-r--r--.xinitrc18
1 files changed, 18 insertions, 0 deletions
diff --git a/.xinitrc b/.xinitrc
new file mode 100644
index 0000000..cce93f7
--- /dev/null
+++ b/.xinitrc
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# ~/.xinitrc
+#
+# Executed by startx (run your window manager from here)
+
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+ for f in /etc/X11/xinit/xinitrc.d/*; do
+ [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
+
+# exec gnome-session
+# exec startkde
+# exec startxfce4
+# ...or the Window Manager of your choice
+exec wmii