summaryrefslogtreecommitdiff
path: root/config/X
diff options
context:
space:
mode:
authorRaymaekers Luca <raymaekers.luca@gmail.com>2023-07-29 11:45:19 +0200
committerRaymaekers Luca <raymaekers.luca@gmail.com>2023-07-29 11:45:19 +0200
commit4d4769747c968da74f57ed5105cea59903669aee (patch)
tree828284bb53b2ef08dae2ca14d287e2f77b5db43c /config/X
parentb05e5cd55220cb2f47161c529715ec5e67be9490 (diff)
add keychain to xinitrc
Diffstat (limited to 'config/X')
-rwxr-xr-xconfig/X/x11/xinitrc20
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