Fixes for gpg-agent
This commit is contained in:
parent
1f9f777b70
commit
43bfd1a5a2
12
config.yaml
12
config.yaml
|
@ -172,9 +172,9 @@ dotfiles:
|
||||||
f_electron12-flags.conf:
|
f_electron12-flags.conf:
|
||||||
src: .config/electron12-flags.conf
|
src: .config/electron12-flags.conf
|
||||||
dst: ~/.config/electron12-flags.conf
|
dst: ~/.config/electron12-flags.conf
|
||||||
f_wayland.sh:
|
f_pam_environment:
|
||||||
src: .config/plasma-workspace/env/wayland.sh
|
src: .pam_environment
|
||||||
dst: ~/.config/plasma-workspace/env/wayland.sh
|
dst: ~/.pam_environment
|
||||||
profiles:
|
profiles:
|
||||||
base:
|
base:
|
||||||
dotfiles:
|
dotfiles:
|
||||||
|
@ -189,6 +189,7 @@ profiles:
|
||||||
- f_mailcap
|
- f_mailcap
|
||||||
- d_zsh
|
- d_zsh
|
||||||
- f_zshrc
|
- f_zshrc
|
||||||
|
- f_pam_environment
|
||||||
- f_tmux.conf
|
- f_tmux.conf
|
||||||
- f_ranger.conf
|
- f_ranger.conf
|
||||||
- f_ssh.conf
|
- f_ssh.conf
|
||||||
|
@ -228,6 +229,8 @@ profiles:
|
||||||
- f_tdesktop_lang.strings
|
- f_tdesktop_lang.strings
|
||||||
- f_fonts.conf
|
- f_fonts.conf
|
||||||
- f_zprofile
|
- f_zprofile
|
||||||
|
- f_electron-flags.conf
|
||||||
|
- f_electron12-flags.conf
|
||||||
Pacman:
|
Pacman:
|
||||||
dotfiles:
|
dotfiles:
|
||||||
- f_makepkg.conf
|
- f_makepkg.conf
|
||||||
|
@ -247,9 +250,6 @@ profiles:
|
||||||
- f_foot.ini
|
- f_foot.ini
|
||||||
- f_gpg-agent.conf
|
- f_gpg-agent.conf
|
||||||
- f_gpg.conf
|
- f_gpg.conf
|
||||||
- f_electron-flags.conf
|
|
||||||
- f_electron12-flags.conf
|
|
||||||
- f_wayland.sh
|
|
||||||
Moria:
|
Moria:
|
||||||
include:
|
include:
|
||||||
- terminal
|
- terminal
|
||||||
|
|
2
dotdrop
2
dotdrop
|
@ -1 +1 @@
|
||||||
Subproject commit 55d7d5602e16edd44f9d4237da54134681402a61
|
Subproject commit 06e9cde0be3afa4d59f4785bbcecbd3e9f9fd6ca
|
|
@ -22,9 +22,6 @@ setopt EXTENDED_HISTORY
|
||||||
# Enable completions for aliases
|
# Enable completions for aliases
|
||||||
setopt complete_aliases
|
setopt complete_aliases
|
||||||
|
|
||||||
# Use exa completions for ls
|
|
||||||
compdef ls='exa'
|
|
||||||
|
|
||||||
# Variable to pass to sdotdrop to get current user
|
# Variable to pass to sdotdrop to get current user
|
||||||
export USRNAME=$USER
|
export USRNAME=$USER
|
||||||
|
|
||||||
|
@ -62,11 +59,10 @@ export MANPAGER="nvim +Man!"
|
||||||
|
|
||||||
# Use GPG for SSH authentication
|
# Use GPG for SSH authentication
|
||||||
export GPG_TTY="$(tty)"
|
export GPG_TTY="$(tty)"
|
||||||
# Fix for pinentry not working for ssh
|
|
||||||
gpg-connect-agent updatestartuptty /bye >/dev/null
|
|
||||||
|
|
||||||
# set SSH_AUTH_SOCK if not logging in over SSH
|
# set SSH_AUTH_SOCK if not logging in over SSH
|
||||||
if [ "$SSH_CONNECTION" -eq "" ]; then
|
if [ "$SSH_CONNECTION" = "" ]; then
|
||||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
|
||||||
gpgconf --launch gpg-agent
|
#gpgconf --launch gpg-agent
|
||||||
|
gpg-connect-agent updatestartuptty /bye >/dev/null
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -24,6 +24,7 @@ _fzf_compgen_path() {
|
||||||
# Modern replacements for cat and ls
|
# Modern replacements for cat and ls
|
||||||
alias cat='bat --paging=never'
|
alias cat='bat --paging=never'
|
||||||
alias ls='exa'
|
alias ls='exa'
|
||||||
|
compdef ls='exa'
|
||||||
|
|
||||||
{%@@ if profile != "mko-laptop" @@%}
|
{%@@ if profile != "mko-laptop" @@%}
|
||||||
# Command not found handler
|
# Command not found handler
|
||||||
|
|
2
home/.pam_environment
Normal file
2
home/.pam_environment
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
SSH_AGENT_PID DEFAULT=
|
||||||
|
SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
|
Loading…
Reference in a new issue