fix: phase out split-gpg in favor of split-gpg2

files/git/.config/git/config

@@ -121,7 +121,7 @@
 	signatureFile = ~/.signature
 	outputDirectory = /tmp/patch
 [gpg]
-	program = gpgw
+	program = gpg
 	minTrustLevel = fully
 [grep]
 	extendedRegexp = true

files/mutt/.config/mutt/conf.d/pgp.muttrc

@@ -26,17 +26,5 @@ set pgp_autoinline           = no  # Inline is user preference
 set pgp_use_gpg_agent        = yes # Avoid prompting for a passphrase
 set pgp_timeout              = 600 # Seconds to linger passphrase in mememory
 set pgp_good_sign            = "^\\[GNUPG:\\] GOODSIG"
-set pgp_list_pubring_command = "qubes-gpg-client-wrapper --no-verbose --batch --quiet --with-colons --list-keys %r"
-set pgp_list_secring_command = "qubes-gpg-client-wrapper --no-verbose --batch --quiet --with-colons --list-secret-keys %r"
-set pgp_decode_command       = "qubes-gpg-client-wrapper -d --status-fd=2 --batch  %f"
-set pgp_decrypt_command      = "$pgp_decode_command"
-set pgp_verify_command       = "qubes-gpg-client-wrapper --status-fd=2 --no-verbose --quiet --batch --output - --verify %s %f"
-set pgp_sign_command         = "qubes-gpg-client-wrapper --batch --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_clearsign_command    = "qubes-gpg-client-wrapper --batch --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_encrypt_only_command = "/usr/lib/mutt/pgpewrap qubes-gpg-client-wrapper --batch --textmode --armor --always-trust %?a?--encrypt-to %a? --encrypt -- -r %r -- %f | sed -e '2iCharset: UTF-8'"
-set pgp_encrypt_sign_command = "/usr/lib/mutt/pgpewrap qubes-gpg-client-wrapper --batch --textmode --armor --always-trust %?a?--encrypt-to %a? --encrypt --sign %?a?-u %a? -- -r %r -- %f | sed -e '2iCharset: UTF-8'"
-set pgp_import_command       = "qubes-gpg-import-key %f; gpg --no-verbose --import %f"
-set pgp_export_command       = "qubes-gpg-client-wrapper --no-verbose --export --armor %r"
-set pgp_verify_key_command   = "gpg --no-verbose --batch --fingerprint --check-sigs %r"
 
 ## vim: ft=muttrc

files/sh/.config/sh/shrc

@@ -97,11 +97,6 @@ has fdfind && alias fd="fdfind"
 has lynx && alias lynx="lynx -vikeys"
 has qubesctl && alias qubesctl="sudo qubesctl --show-output" qctl="qubesctl"
 has gpg && alias gpgs="gpg --show-keys"
-has gpg2 && alias gpg="gpg2"
-if has qubes-gpg-client-wrapper; then
-  alias qubes-gpg="qubes-gpg-client-wrapper"
-  alias qgpg="qubes-gpg"
-fi
 ## {{{ Tmux
 has tmux && {
   alias t="tmux"

files/sh/.local/bin/gpg-sign-email

@@ -42,6 +42,6 @@ for f in "${@}"; do
   cp "$f" "$f.asc"
   "$vi_cmd" -u NONE \
     -c 'set nomodeline' -c 'norm gg}j' \
-    -c '.,$!gpgw -a --clear-sign' \
+    -c '.,$!gpg -a --clear-sign' \
     -c 'wq' -- "$f.asc"
 done

files/sh/.local/bin/gpgw

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-## SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
-##
-## SPDX-License-Identifier: AGPL-3.0-or-later
-
-set -eu
-
-gpg_cmd="$(has -s qubes-gpg-client-wrapper gpg2 gpg)"
-
-if test -z "$gpg_cmd"; then
-  printf '%s\n' "Please install one of the following tools: qubes-gpg-client-wrapper, gpg2 or gpg."
-  exit 1
-fi
-
-"$gpg_cmd" "$@"

files/vim/.config/vim/vimrc

@@ -245,9 +245,9 @@ vnoremap . :normal .<CR>
 vnoremap > >gv
 vnoremap < <gv
 
-vnoremap <leader>ge !gpgw -aser
+vnoremap <leader>ge !gpg -aser
-vnoremap <leader>gs !gpgw -a --clear-sign<CR>
+vnoremap <leader>gs !gpg -a --clear-sign<CR>
-vnoremap <leader>gd !gpgw -d<CR>
+vnoremap <leader>gd !gpg -d<CR>
 
 nnoremap <leader>r "hyiw:%s/<C-R>h//g<left><left>
 nnoremap <leader>s "hyiw/<C-R>h