diff options
| author | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-08-04 22:45:56 +0200 |
|---|---|---|
| committer | Raymaekers Luca <raymaekers.luca@gmail.com> | 2023-08-04 22:45:56 +0200 |
| commit | 1914d16f1693a3c31f8ad9e07b1469df1604d690 (patch) | |
| tree | a8a623823adc077f7371de379b9e70eb7a7b485c /config/X/x11/xinitrc | |
| parent | 49bbf6906089b5d957e2a781002d32b811ae630d (diff) | |
| parent | e850f3a1702b4d8b9d0cfec5c07d710b5201ed29 (diff) | |
Merge branch 'main' of /var/git/dotfiles
Diffstat (limited to 'config/X/x11/xinitrc')
| -rwxr-xr-x | config/X/x11/xinitrc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/config/X/x11/xinitrc b/config/X/x11/xinitrc index d261b3f..5f595b1 100755 --- a/config/X/x11/xinitrc +++ b/config/X/x11/xinitrc @@ -6,21 +6,10 @@ 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 +[ -f $sysresources ] && xrdb -merge $sysresources +[ -f $sysmodmap ] && xmodmap $sysmodmap +[ -f "$userresources" ] && xrdb -merge "$userresources" +[ -f "$usermodmap" ] && xmodmap "$usermodmap" if [ -d /etc/X11/xinit/xinitrc.d ] ; then for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do @@ -37,5 +26,6 @@ xmodmap -e "keycode 135 = Super_L" xautolock -time 5 -locker slock & gammastep -m randr & slstatus & +eval "$(keychain --dir "$XDG_CONFIG_HOME/keychain" --eval --quiet --agents gpg,ssh)" unclutter --timeout 3 --jitter 50 -b exec startdwm |