about summary refs log tree commit diff stats
path: root/tools/conf/etc
diff options
context:
space:
mode:
Diffstat (limited to 'tools/conf/etc')
-rw-r--r--tools/conf/etc/X11/xinit/xinitrc35
-rw-r--r--tools/conf/etc/skel/.xinitrc12
2 files changed, 42 insertions, 5 deletions
diff --git a/tools/conf/etc/X11/xinit/xinitrc b/tools/conf/etc/X11/xinit/xinitrc
new file mode 100644
index 0000000..2607046
--- /dev/null
+++ b/tools/conf/etc/X11/xinit/xinitrc
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+ for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
+fi
diff --git a/tools/conf/etc/skel/.xinitrc b/tools/conf/etc/skel/.xinitrc
index c331d37..6ccd340 100644
--- a/tools/conf/etc/skel/.xinitrc
+++ b/tools/conf/etc/skel/.xinitrc
@@ -1,11 +1,13 @@
+## Start the window manager
 
-#xrandr --output eDP1 --mode 1024x768
+xrandr -s 1366x768
 #xrandr --dpi 100
+#xrandr --output eDP1 --mode 1366x768
 #xgamma -gamma 0.8
-syndaemon -d
-#
-## Start the window manager
+#syndaemon -d
+setxkbmap dvorak
 
-#exec dwm
 #exec openbox-session
+#exec dwm
 exec spectrwm
+#exec start-mate