From 4f2f477188e05d8174f28f4ee1f3d45b627d62ef Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 4 Jan 2024 12:00:27 +0100 Subject: nvim: Adapt wording for proper OpenPGP terminology in ultisnips Signed-off-by: David Runge --- .config/nvim/UltiSnips/mail.snippets | 4 ++-- .config/nvim/UltiSnips/text.snippets | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.config/nvim/UltiSnips/mail.snippets b/.config/nvim/UltiSnips/mail.snippets index 3fceb03..95a4101 100644 --- a/.config/nvim/UltiSnips/mail.snippets +++ b/.config/nvim/UltiSnips/mail.snippets @@ -1,7 +1,7 @@ snippet validate_pgp_key "A mail to verify a PGP key" b Hi ${1: Name}, -Please clear-sign [1] the attached `token.txt` file using the mentioned root +Please clear-sign [1] the attached `token.txt` file using the mentioned primary key (not any of its subkeys) and send the resulting file to: David Runge @@ -12,7 +12,7 @@ To clearsign the file, use gpg --armor --default-key ${2: PGP KEY ID}! --clearsign token.txt \`\`\` -If your root key does not provide the Signature capability (S), make sure to +If your primary key does not provide the Signature capability (S), make sure to toggle it on temporarily: \`\`\` diff --git a/.config/nvim/UltiSnips/text.snippets b/.config/nvim/UltiSnips/text.snippets index 866b0ac..cfc757e 100644 --- a/.config/nvim/UltiSnips/text.snippets +++ b/.config/nvim/UltiSnips/text.snippets @@ -1,15 +1,11 @@ snippet pgp_validation_token "A token text to use for verification" b -I am the holder of the PGP key with the ID +I am the holder of the OpenPGP certificate with the fingerprint ${1:PGP KEY ID} -and the mail address +and the User ID ${2:UID} -I am clear-signing this token file for the purpose of validating my PGP key ID -and UID for the use in archlinux-keyring. +I am clear-signing this token file for the purpose of validating my OpenPGP certificate fingerprint and User ID for the use in archlinux-keyring. https://gitlab.archlinux.org/archlinux/archlinux-keyring The resulting clear-signed token file has no application beyond its intended scope. - -Verification token: -${3:`tr -dc A-Za-z0-9