diff options
| -rw-r--r-- | .config/zsh/.zshrc | 5 | ||||
| -rw-r--r-- | .xinitrc | 33 |
2 files changed, 38 insertions, 0 deletions
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index b776899..7429b9f 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -67,3 +67,8 @@ source $ZDOTDIR/prompt.zsh # display a fortune when opening an interactive terminal tty -s && fortune $HOME/fortunes 2>/dev/null ||: + +# startx if not already running an x server (e.g. via display manager) and only on tty1 +if [ -z "${DISPLAY}" ] && [ "$(tty)" = "/dev/tty1" ]; then + exec startx +fi diff --git a/.xinitrc b/.xinitrc new file mode 100644 index 0000000..a147ba7 --- /dev/null +++ b/.xinitrc @@ -0,0 +1,33 @@ +#!/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 + +# xfce +command -v startxfce4 && exec startxfce4 |