From e3cf4968300d525a9a28897db825592ff242d143 Mon Sep 17 00:00:00 2001 From: Salt Date: Mon, 31 Jul 2017 22:08:46 -0500 Subject: [PATCH] Alright that xinit was a little barebones Also I'm giving up and using SDDM's autologin instead. Having everything handled for you is kinda nice. --- .xinitrc | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) mode change 100644 => 100755 .xinitrc diff --git a/.xinitrc b/.xinitrc old mode 100644 new mode 100755 index 34e0b2d4..323a88a1 --- a/.xinitrc +++ b/.xinitrc @@ -1,2 +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 + i3