From da957d27060c5b1a382627d93b6e7cc56312534b Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Fri, 18 Oct 2024 18:05:03 +0200 Subject: [PATCH] Update SSH and GPG config --- .config/kglobalshortcutsrc | 5 +++-- .config/ssh/config | 1 + .gitconfig | 2 +- .gitignore | 3 +++ .gnupg/gpg-agent.conf | 1 + .gnupg/sshcontrol | 12 ++++++++++++ .zshrc | 7 +++++++ 7 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 .gnupg/gpg-agent.conf create mode 100644 .gnupg/sshcontrol diff --git a/.config/kglobalshortcutsrc b/.config/kglobalshortcutsrc index e90a187..e657d4d 100644 --- a/.config/kglobalshortcutsrc +++ b/.config/kglobalshortcutsrc @@ -1,5 +1,6 @@ [ActivityManager] _k_friendly_name=Activity Manager +switch-to-activity-06e56b50-274c-44d5-bd05-253d1e88a244=none,none,Switch to activity "Standard" switch-to-activity-10eae782-cee3-42c7-b63f-6cfa29a432f4=none,none,Switch to activity "Default" switch-to-activity-12c956f8-79d2-4e10-ba60-c476b4f44bc6=none,none,Switch to activity "Default" switch-to-activity-c9029e69-ec79-4399-8d82-a2b36f65b1d5=none,none,Switch to activity "Default" @@ -34,7 +35,7 @@ mute=Volume Mute,Volume Mute,Mute [ksmserver] Halt Without Confirmation=none,,Shut Down Without Confirmation Lock Session=Screensaver,Meta+L\tScreensaver,Lock Session -Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Screen +Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Prompt Log Out Without Confirmation=none,,Log Out Without Confirmation LogOut=none,,Log Out Reboot=none,,Reboot @@ -298,7 +299,7 @@ PowerOff=Power Off,Power Off,Power Off Sleep=Sleep,Sleep,Suspend Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,Toggle Keyboard Backlight Turn Off Screen=none,none,Turn Off Screen -_k_friendly_name=Power Management +_k_friendly_name=KDE Power Management System powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile [plasmashell] diff --git a/.config/ssh/config b/.config/ssh/config index b433a2f..9a8cbc1 100644 --- a/.config/ssh/config +++ b/.config/ssh/config @@ -16,3 +16,4 @@ Host portainer.admin.euph.site IdentityFile ~/.ssh/admin-yubikey-primary IdentityFile ~/.ssh/admin-yubikey-secondary IdentitiesOnly yes + diff --git a/.gitconfig b/.gitconfig index af793fa..602a996 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] name = Snoweuph email = snow+git@euph.email - signingKey = BEFC41DA223CEC55 + signingkey = 99ED4727EFBFF719 [commit] gpgSign = true diff --git a/.gitignore b/.gitignore index 75da6bc..8a85851 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,8 @@ # Include ssh Symlink !.ssh +# Include Gnupg +!.gnupg/ + # Include Resource !Resources/ diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf new file mode 100644 index 0000000..85405bc --- /dev/null +++ b/.gnupg/gpg-agent.conf @@ -0,0 +1 @@ +enable-ssh-support diff --git a/.gnupg/sshcontrol b/.gnupg/sshcontrol new file mode 100644 index 0000000..d32a9ca --- /dev/null +++ b/.gnupg/sshcontrol @@ -0,0 +1,12 @@ +# List of allowed ssh keys. Only keys present in this file are used +# in the SSH protocol. The ssh-add tool may add new entries to this +# file to enable them; you may also add them manually. Comment +# lines, like this one, as well as empty lines are ignored. Lines do +# have a certain length limit but this is not serious limitation as +# the format of the entries is fixed and checked by gpg-agent. A +# non-comment line starts with optional white spaces, followed by the +# keygrip of the key given as 40 hex digits, optionally followed by a +# caching TTL in seconds, and another optional field for arbitrary +# flags. Prepend the keygrip with an '!' mark to disable it. + +F0DAEE5CEB66D4072981216F672366437DC9D04 diff --git a/.zshrc b/.zshrc index 8ac91dc..42485e0 100644 --- a/.zshrc +++ b/.zshrc @@ -37,6 +37,13 @@ WORDCHARS="_-" # Define These Characters as Part of "Words" # Application Envs ######################################################### +# GPG +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +fi +export GPG_TTY=$(tty) +gpg-connect-agent updatestartuptty /bye >/dev/null + # Git zinit snippet OMZP::git