diff options
| author | Benjamin Morrison <ben@gbmor.org> | 2022-10-15 02:38:38 -0400 |
|---|---|---|
| committer | Benjamin Morrison <ben@gbmor.org> | 2022-10-15 02:40:45 -0400 |
| commit | e53c78eedff7d6b51cb824f92671a73a7411d1f2 (patch) | |
| tree | d80d245bae3846960df79a5460a188568d748c26 | |
| parent | 705b3c4c6ed218a1000ce8009ba0970885f20022 (diff) | |
| download | dogfiles-e53c78eedff7d6b51cb824f92671a73a7411d1f2.tar.gz | |
update git, gpg, neomutt confs for new gpg key.
add line to gk to make it easier to switch yubikeys.
| -rw-r--r-- | .config/git/config | 2 | ||||
| -rw-r--r-- | .gnupg/gpg.conf | 2 | ||||
| -rw-r--r-- | .neomuttrc | 2 | ||||
| -rwxr-xr-x | bin/gk | 9 |
4 files changed, 11 insertions, 4 deletions
diff --git a/.config/git/config b/.config/git/config index 625c842..21e9f91 100644 --- a/.config/git/config +++ b/.config/git/config @@ -7,7 +7,7 @@ [user] name = "Benjamin Morrison" email = ben@gbmor.org - signingkey = EAB272409CD12FF0 + signingkey = c486b92dc39b1312 [init] templatedir = ~/.config/git/template.git [commit] diff --git a/.gnupg/gpg.conf b/.gnupg/gpg.conf index 404e645..b678fde 100644 --- a/.gnupg/gpg.conf +++ b/.gnupg/gpg.conf @@ -1,4 +1,4 @@ -default-key ben@gbmor.dev +default-key c39b1312 cipher-algo AES256 personal-cipher-preferences AES256 AES192 AES diff --git a/.neomuttrc b/.neomuttrc index 62a4b2f..b864e70 100644 --- a/.neomuttrc +++ b/.neomuttrc @@ -1,6 +1,6 @@ source ~/.config/mutt-dracula/dracula.muttrc -set pgp_default_key = "0x9cd12ff0" +set pgp_default_key = "0xc39b1312" set pgp_use_gpg_agent = yes set crypt_use_gpgme = yes set crypt_verify_sig = yes diff --git a/bin/gk b/bin/gk index a25edf8..942a890 100755 --- a/bin/gk +++ b/bin/gk @@ -1,9 +1,16 @@ #!/bin/sh + +PARAM="$1" + pkill -9 gpg-agent export GPG_TTY=$(tty) export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) -gpg-connect-agent updatestartuptty /bye +if [ "$PARAM" = "switch" ]; then + gpg-connect-agent "scd serialno" "learn --force" /bye +fi + +gpg-connect-agent updatestartuptty /bye gpgconf --create-socketdir |