diff --git a/git/.gitconfig b/git/.gitconfig index 68990f8..79f47ca 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,7 +1,7 @@ [user] email = tobias.manske@mailbox.org name = Tobias Manske - signingkey = FF57750B830AA3A1 + signingkey = 511951B04CA6348737AAA76344EA83E2013CC39A [alias] lg = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all fzf = "!git lg --color=always | fzf --multi --preview 'git show --color=always {+2}' --ansi" diff --git a/gnupg/gpg-agent.conf b/gnupg/gpg-agent.conf index fd13ce7..30cb343 100644 --- a/gnupg/gpg-agent.conf +++ b/gnupg/gpg-agent.conf @@ -1,10 +1,8 @@ default-cache-ttl 2 -default-cache-ttl-ssh 5 +default-cache-ttl-ssh 2 max-cache-ttl 2 -max-cache-ttl-ssh 30 -no-allow-external-cache +max-cache-ttl-ssh 2 enable-ssh-support -ignore-cache-for-signing ssh-fingerprint-digest sha256 allow-loopback-pinentry -pinentry-program /usr/bin/pinentry-qt +pinentry-program /usr/bin/pinentry-gtk-2 diff --git a/gnupg/gpg.conf b/gnupg/gpg.conf index a3a3f00..c814cdb 100644 --- a/gnupg/gpg.conf +++ b/gnupg/gpg.conf @@ -1,9 +1,9 @@ -default-key 020237017D271D4E2344D8F3FF57750B830AA3A1 +default-key 511951B04CA6348737AAA76344EA83E2013CC39A no-greeting expert use-agent -pinentry-mode loopback no-emit-version no-comments keyid-format 0xlong keyserver hkps://keyserver.ubuntu.com +# pinentry-mode loopback