X11: Move pieces from i3 and zshenv into xinitrc

Move everything that is desirable independent of the WM or shell into
xinitrc.
Move .Xresources and .Xmodmap into .config/X11.
Remove all unneeded GNOME bits from i3 config.
Make compositor launch script portable.
Add locker symlink and launch.sh similar to the compositor.
This commit is contained in:
2020-10-31 22:33:26 +01:00
parent feec02e267
commit 08c5c66e1e
9 changed files with 67 additions and 66 deletions

View File

@@ -1,23 +1,64 @@
#!/bin/sh
sysresources=/etc/X11/xinit/.Xresources
userresources="${XDG_CONFIG_HOME:-$HOME/.config}"/X11/xresources
sysmodmap=/etc/X11/xinit/.Xmodmap
userresources="$HOME"/.Xresources
usermodmap="$HOME"/.Xmodmap
usermodmap="${XDG_CONFIG_HOME:-$HOME/.config}"/X11/xmodmap
sysxinitrcd=/etc/X11/xinit/xinitrc.d
userxinitrcd="${XDG_CONFIG_HOME:-$HOME/.config}"/X11/xinitrc.d
[ ! -f "$sysresources" ] || xrdb -merge "$sysresources"
[ ! -f "$sysmodmap" ] || xmodmap "$sysmodmap"
[ ! -f "$userresources" ] || xrdb -merge "$userresources"
[ ! -f "$sysmodmap" ] || xmodmap "$sysmodmap"
[ ! -f "$usermodmap" ] || xmodmap "$usermodmap"
unset {sys,user}{resources,modmap}
if [ -d /etc/X11/xinit/xinitrc.d ] ; then
for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
if [ -d "$sysxinitrcd" ] ; then
for f in "$sysxinitrcd"/?*.sh ; do
[ ! -x "$f" ] || . "$f"
done
unset f
fi
if [ -d "$userxinitrcd" ] ; then
for f in "$userxinitrcd"/?*.sh ; do
[ ! -x "$f" ] || . "$f"
done
unset f
fi
unset {sys,user}{resources,modmap,xinitrcd}
# <right-CTRL> acts as <ESC> when pressed alone and shortly.
xcape -t 250 -e 'Control_R=Escape'
# Key repeat rate
xset r rate 500 25
touchpad="DLL082A:01 06CB:76AF Touchpad"
xinput set-prop "$touchpad" "libinput Tapping Enabled" 1
xinput set-prop "$touchpad" "libinput Natural Scrolling Enabled" 1
xinput set-prop "$touchpad" "libinput Accel Speed" 0.45
unset touchpad
# Muted at startup
amixer -q -D pulse sset Master mute
# SSH
eval $(ssh-agent)
# Compositor
compositor="${XDG_CONFIG_HOME:-$HOME/.config}"/compositor/launch.sh
[ ! -x "$compositor" ] || "$compositor"
unset compositor
# Wallpaper
wallpaper="$HOME"/pics/wallpapers/wallpaper
feh --bg-scale --no-fehbg "$wallpaper"
unset wallpaper
# Locker
locker="${XDG_CONFIG_HOME:-$HOME/.config}"/locker/launch.sh
[ ! -x "$locker" ] || "$locker"
unset locker
exec i3