Keyring support and fix some broken scripts

de/bspwm/bspwmrc

@@ -38,8 +38,8 @@ if command -v sxhkd >/dev/null 2>&1; then
 	sxhkd -m -1 &
 fi
 
-if [ -f "$DOTFILES_PATH/de/xloadresources" ]; then
-  source "$DOTFILES_PATH/de/xloadresources"
+if [ -f "$DOTFILES_PATH/de/x/loadresources" ]; then
+  source "$DOTFILES_PATH/de/x/loadresources"
 fi
 
 if [ -f "$HOME/.fehbg" ]; then

de/x/initrc

@@ -20,6 +20,9 @@ if [ -f "$HOME/.xmodmap" ]; then
 	xmodmap "$HOME/.xmodmap"
 fi
 
+eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+export SSH_AUTH_SOCK
+
 xcape -e 'Control_L=Escape' &
 
 pulseaudio --start &

scripts/bin/restartbar

@@ -1,4 +1,3 @@
 #!/usr/bin/env bash
 
-stopbar
-startbar
+stopbar && startbar &

scripts/bin/startbar

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
-bash "${DOTFILES_PATH}/de/bar/bar.bash" &
-bg
-disown
+"${DOTFILES_PATH}/de/bar/bar.bash"

shell/bash/bashrc

@@ -20,11 +20,8 @@ export NOTES_DIR="$NICE_HOME/doc/notes"
 # set our PATH
 source "$DOTFILES_PATH/shell/bash/paths"
 
-# import our aliases
-source "$DOTFILES_PATH/shell/bash/aliases"
-
-# import our autocompletions
-source "$DOTFILES_PATH/shell/bash/autocompletions"
+# stop parsing on a non-interactive shell
+[ -z "$PS1" ] && return
 
 # load our key binds
 case $- in
@@ -32,11 +29,14 @@ case $- in
 	*) ;;
 esac
 
-# stop parsing on a non-interactive shell
-[ -z "$PS1" ] && return
+# import our aliases
+source "$DOTFILES_PATH/shell/bash/aliases"
+
+# import our autocompletions
+source "$DOTFILES_PATH/shell/bash/autocompletions"
 
 # load our vconsole colors
-if [ "${TERM%%-*}" = 'linux' ]; then
+if [ "${TERM%%-*}" = 'linux' ] && [[ $- == *i* ]]; then
 	BASE16_SHELL="$DOTFILES_PATH/scripts/colors/vconsole"
 	[[ -s "$BASE16_SHELL" ]] && source "$BASE16_SHELL"
 fi