home: Cleanup guix-home gpg configuration
* user-config/zsh/.zshrc (AWS_SHELL_ALIAS): Remove unnecessary (and already commented out) code related to gpg-agent * user-config/zsh/.zshenv: Remove setting of SSH_AUTH_SOCK (its set by the gpg-agent guix service) * .guix/rekahsoft/guix-config/home.scm (%misc-manifest): Remove pinentry-gnome3 (its now included by the gpg-agent-service-type). Remove file user-config/gpg/.gnupg/gpg-agent.conf as its now generated by the gpg-agent service.
This commit is contained in:
parent
d9d49c334b
commit
572af68843
|
@ -382,7 +382,6 @@ single certifcate used for local development with caddy.")
|
|||
"nyxt"
|
||||
"openssh"
|
||||
"gnupg"
|
||||
"pinentry-gnome3"
|
||||
"pass-otp"
|
||||
"password-store"
|
||||
"recutils"
|
||||
|
@ -450,7 +449,7 @@ single certifcate used for local development with caddy.")
|
|||
(home-gpg-agent-configuration
|
||||
(pinentry-program
|
||||
(file-append pinentry-gnome3
|
||||
"/bin/pinentry-gnome3"))
|
||||
"/bin/pinentry-gtk-2"))
|
||||
(ssh-support? #t)))
|
||||
|
||||
(simple-service
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
# File: ~/.gnupg/gpg-agent.conf
|
||||
# Author: Collin J. Doering <rekahsoft@gmail.com>
|
||||
# Date: Dec 15, 2010
|
||||
# Description:
|
||||
|
||||
# Use gpg-agent for ssh keys
|
||||
enable-ssh-support
|
||||
|
||||
# Cache settings
|
||||
default-cache-ttl 10800
|
||||
default-cache-ttl-ssh 10800
|
||||
max-cache-ttl-ssh 10800
|
||||
|
||||
# Environment file
|
||||
#write-env-file /home/collin/.gnupg/gpg-agent.info
|
||||
|
||||
# Keyboard control
|
||||
#no-grab
|
||||
|
||||
# PIN entry program
|
||||
#pinentry-program /usr/bin/pinentry-curses
|
||||
#pinentry-program /usr/bin/pinentry-qt4
|
||||
pinentry-program /home/collin/.guix-home/profile/bin/pinentry-gtk-2
|
|
@ -8,9 +8,6 @@ export VISUAL="emacsclient -a emacs" # $VISUAL opens in GUI with non-daemon as a
|
|||
export GUILE_LOAD_PATH="${GUILE_LOAD_PATH}:$HOME/.guix-home/profile/share/guile/site/3.0"
|
||||
export GUILE_LOAD_COMPILED_PATH="${GUILE_LOAD_COMPILED_PATH}:$HOME/.guix-home/profile/lib/guile/3.0/site-ccache"
|
||||
|
||||
# Use gpg-agent ssh-agent emulation
|
||||
export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
|
||||
|
||||
# Allow applications installed with flatpak to be found
|
||||
export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share"
|
||||
|
||||
|
|
|
@ -233,9 +233,6 @@ stty stop undef
|
|||
# Setup direnv hook
|
||||
eval "$(direnv hook zsh)"
|
||||
|
||||
# # Update startup tty so gpg-agent find correct display for the pinentry program
|
||||
# echo "UPDATESTARTUPTTY" | gpg-connect-agent > /dev/null 2>&1
|
||||
|
||||
# Use zsh-source-highlight
|
||||
source ~/.guix-home/profile/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
|
||||
|
||||
|
|
Loading…
Reference in New Issue