diff --git a/.xinitrc b/.xinitrc index 5a28da8..878cea7 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,10 +1,10 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh # shellcheck disable=SC1090,SC1091 # load system xinit scripts if [ -d /etc/X11/xinit/xinitrc.d ]; then for f in "/etc/X11/xinit/xinitrc.d"/?*.sh; do - source "$f" + . "$f" done unset f fi @@ -22,9 +22,9 @@ export __GL_SYNC_TO_VBLANK=0 # disable vsync in driver, to aid with some numlockx on # ensure numlock is on before setting keymap setxkbmap us -variant altgr-intl -option '' # load the correct keymap which actually has 3rd level shift -[[ -f "/etc/xprofile" ]] && source "/etc/xprofile" # load the system-wide xprofile -[[ -f "$HOME/.xprofile" ]] && source "$HOME/.xprofile" # load the local xprofile configuration -[[ -f "$HOME/.Xmodmap" ]] && xmodmap "$HOME/.Xmodmap" # load local keymap +[ -f "/etc/xprofile" ] && . "/etc/xprofile" # load the system-wide xprofile +[ -f "$HOME/.xprofile" ] && . "$HOME/.xprofile" # load the local xprofile configuration +[ -f "$HOME/.Xmodmap" ] && xmodmap "$HOME/.Xmodmap" # load local keymap -[[ -x /usr/bin/picom ]] && /usr/bin/picom -b # start picom as a background service +[ -x /usr/bin/picom ] && /usr/bin/picom -b # start picom as a background service exec i3 -c "$XDG_CONFIG_HOME/i3/config" # start the graphical environment (replaces shell)