diff --git a/.xinitrc b/.xinitrc
index 1cf4268..379d79c 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,22 +1,14 @@
 #!/bin/sh
-# Make sure this is before the 'exec' command or it won't be sourced.
-[ -f /etc/xprofile ] && . /etc/xprofile
-[ -f ~/.xprofile ] && . ~/.xprofile
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-wmname LG3D
-export _JAVA_AWT_WM_NONREPARENTING=1
-export AWT_TOOLKIT=MToolkit
-
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
     xrdb -merge $sysresources
-
 fi
 
 if [ -f $sysmodmap ]; then
@@ -24,9 +16,7 @@ if [ -f $sysmodmap ]; then
 fi
 
 if [ -f "$userresources" ]; then
-
     xrdb -merge "$userresources"
-
 fi
 
 if [ -f "$usermodmap" ]; then
@@ -42,10 +32,13 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
  unset f
 fi
 
-# picom &
-# slstatus &
-# setxkbmap -model pc101 -layout us,ara -variant ,, -option grp:win_space_toggle &
+# gnupg keyring agent
+# ensure it's started so SSH will work
+# https://www.gnupg.org/faq/whats-new-in-2.1.html#autostart
+dbus-update-activation-environment --systemd DISPLAY
+gpgconf --launch gpg-agent
+export "SSH_AUTH_SOCK=/run/user/$(id -u)/gnupg/S.gpg-agent.ssh"
+# Keyboard layouts switch (requires setxkbmap)
+setxkbmap -model pc104 -layout us,ar,jp,kr -variant dvorak-l,,, -option grp:win_space_toggle
+
 exec dwm
-# exec env KDEWM=/usr/local/bin/dwm /usr/bin/startplasma-x11
-# exec sddm
-# exec ly