From 4d4769747c968da74f57ed5105cea59903669aee Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Sat, 29 Jul 2023 11:45:19 +0200
Subject: add keychain to xinitrc

---
 config/X/x11/xinitrc | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

(limited to 'config')

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
-- 
cgit v1.2.3