From 07d7358c1a7224d51e92688aba14d8da6450707b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Sat, 2 Dec 2017 23:01:28 +0100
Subject: Rework .xinitrc

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .xinitrc | 72 ++++++++++++++++++++++++++++------------------------------------
 1 file changed, 31 insertions(+), 41 deletions(-)

diff --git a/.xinitrc b/.xinitrc
index 5bda61e..a0e5f79 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,5 +1,5 @@
 #!/bin/bash
-cd $HOME
+cd "$HOME" || exit 1
 
 export VDPAU_NVIDIA_NO_OVERLAY=1
 #export SDL_AUDIODRIVER=alsa
@@ -17,59 +17,49 @@ nvidia-settings -a '[gpu:0]/GPUGraphicsClockOffset[3]=150'
 nvidia-settings -a '[gpu:0]/GPUMemoryTransferRateOffset[3]=400'
 
 # I don't like no background ;)
-dash $HOME/.bg &
+dash "$HOME/.bg" &
 
 numlockx
 xset -dpms
 xset r rate 250 50 &
-source $HOME/bin/gpg-agent.sh
-gpg-connect-agent -q UPDATESTARTUPTTY /bye
+#source $HOME/bin/gpg-agent.sh
+#gpg-connect-agent -q UPDATESTARTUPTTY /bye
+
+systemctl --user import-environment DISPLAY XAUTHORITY
+dbus-update-activation-environment DISPLAY XAUTHORITY
+
+eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets)"
+export GNOME_KEYRING_CONTROL
+export GNOME_KEYRING_PID
+export DBUS_SESSION_BUS_ADDRESS
+export DBUS_SESSION_BUS_PID
+
+systemctl --user import-environment GNOME_KEYRING_CONTROL GNOME_KEYRING_PID SSH_AUTH_SOCK
+
 
 # autostart entries
 setxkbmap us altgr-intl
 #sup --delay-after 3 --delay 1 --reset-after 0 xbindkeys -n &
-xkbcomp ~/.xkbmap $DISPLAY &
-xautolock -nowlocker $HOME/bin/screen-locker.sh -locker $HOME/bin/screen-locker.sh -time 10 &
+xkbcomp ~/.xkbmap "$DISPLAY" &
+xautolock -nowlocker "$HOME/bin/screen-locker.sh" -locker "$HOME/bin/screen-locker.sh" -time 10 &
 pulseaudio --start &
 remote-notify-client.sh </dev/null &
 # might need --glx-copy-from-front to reduce lag in urxvt
 #compton -bfzCG --backend glx --vsync opengl-swc --paint-on-overlay -D2 #--glx-no-rebind-pixmap --glx-no-stencil --unredir-if-possible
 redshift -l 48.190:15.62 -t 5700:3400 -m randr &
 mount-ssh &
-dunst &
-
-autostart () {
-  #urxvt -g 125x+45+1041+0 -e ssh mistral &
-  #urxvt -g 125x+45+1920+0 -e ssh karif &
-  #stalonetray --dockapp-mode -p --kludges force_icons_size &
-  #for f in $XDG_CONFIG_HOME/conky/*; do
-    #conky -c "$f" &
-  #done
-  rm -f $HOME/passwords.kdb.lock
-  keepassx &
-  #transmission-remote-gtk &
-  #claws-mail &
-  thunderbird &
-  #kwalletd5 &
-  #kded5 &
-  #kmail &
-  firefox &
-  steam &
-  copyq &
-  #$HOME/git/thetime/src/thetime -t "%F %H:%M:%S" -p 1921,1160 -f "xft:DejaVu Sans:size=10"
-}
+#dunst &
 
-# WM
-case "$1" in
-  console)
-	i3 &
-	sleep 1
-	urxvt &
-  ;;
-  *)
-	autostart &
-	exec i3
-  ;;
-esac
+rm -f "$HOME/passwords.kdb.lock"
+keepassx &
+#transmission-remote-gtk &
+#claws-mail &
+thunderbird &
+#kwalletd5 &
+#kded5 &
+#kmail &
+firefox &
+steam &
+copyq &
 
-exec xinitrc
+exec i3
-- 
cgit v1.2.3-24-g4f1b