Keyring support and fix some broken scripts

This commit is contained in:
Daniel Flanagan 2018-11-08 15:24:22 -06:00
parent 52b60ef859
commit dd83416c32
5 changed files with 15 additions and 15 deletions

View file

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

View file

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

View file

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

View file

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

View file

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