Merge branch 'dev' of ssh://git.lyte.dev:2222/lytedev/dotfiles into dev

This commit is contained in:
Daniel Flanagan 2020-02-06 20:42:45 -06:00
commit a942bb37e7
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
4 changed files with 5 additions and 6 deletions

3
apps/gpg/.gitignore vendored
View file

@ -1,3 +0,0 @@
*
!.gitignore
!gpg-agent.conf

3
apps/gpg/agent.conf Normal file
View file

@ -0,0 +1,3 @@
pinentry-program /usr/bin/pinentry-curses
max-cache-ttl 60480000
default-cache-ttl 60480000

View file

View file

@ -70,7 +70,7 @@ links=(
"$dfp/apps/de/libinput/gestures.conf" "$XDG_CONFIG_HOME/libinput-gestures.conf"
# gpg config
"$dfp/apps/gpg/" "$HOME/.gnupg"
"$dfp/apps/gpg/agent.conf" "$HOME/.gnupg/gpg-agent.conf"
# document viewer
"$dfp/apps/zathura/" "$XDG_CONFIG_HOME/zathura"
@ -126,9 +126,8 @@ if [[ "$INTERACTIVE" = 1 ]]; then
"$dfp/bin/lib/sudo_setup"
fi
echo -e "Dotfiles Installed! Running 'exec bash'...\n"
# execute the user's shell
ush="$(getent passwd $LOGNAME | cut -d: -f7)"
echo -e "Dotfiles Installed! Running 'exec $ush'...\n"
exec "$ush"
fi