diff options
| -rw-r--r-- | fish2024/config.fish | 7 | ||||
| -rw-r--r-- | fish2024/fish_variables | 43 | ||||
| -rw-r--r-- | gpg-agent.conf | 2 |
3 files changed, 8 insertions, 44 deletions
diff --git a/fish2024/config.fish b/fish2024/config.fish index a391024..8e00871 100644 --- a/fish2024/config.fish +++ b/fish2024/config.fish @@ -4,3 +4,10 @@ if status is-interactive set -gx GPG_TTY (tty) set -gx LEDGER_FILE $HOME/Budget/hledger/budget.ledger end + +# https://gist.github.com/josh-padnick/c90183be3d0e1feb89afd7573505cab3 +if test -z (pgrep ssh-agent) + eval (ssh-agent -c) > /dev/null + set -Ux SSH_AUTH_SOCK $SSH_AUTH_SOCK + set -Ux SSH_AGENT_PID $SSH_AGENT_PID +end diff --git a/fish2024/fish_variables b/fish2024/fish_variables deleted file mode 100644 index e25b820..0000000 --- a/fish2024/fish_variables +++ /dev/null @@ -1,43 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:585858 -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:a1b56c -SETUVAR fish_color_comment:f7ca88 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:ba8baf -SETUVAR fish_color_error:ab4642 -SETUVAR fish_color_escape:86c1b9 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:\x1d -SETUVAR fish_color_keyword:\x1d -SETUVAR fish_color_match:7cafc2 -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:7cafc2 -SETUVAR fish_color_option:\x1d -SETUVAR fish_color_param:d8d8d8 -SETUVAR fish_color_quote:f7ca88 -SETUVAR fish_color_redirection:d8d8d8 -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_secondary_background:\x1d -SETUVAR fish_pager_color_secondary_completion:\x1d -SETUVAR fish_pager_color_secondary_description:\x1d -SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d -SETUVAR fish_user_paths:/usr/local/go/bin\x1e/home/lemon/\x2ecargo/bin\x1e/home/lemon/go/bin\x1e/home/lemon/\x2elocal/bin diff --git a/gpg-agent.conf b/gpg-agent.conf index 9f1064e..87f4c67 100644 --- a/gpg-agent.conf +++ b/gpg-agent.conf @@ -7,7 +7,7 @@ default-cache-ttl 3600 max-cache-ttl 3600 #pinentry-program /usr/local/bin/pinentry -pinentry-program /usr/bin/pinentry-gnome3 +##pinentry-program /usr/bin/pinentry-gtk-2 allow-loopback-pinentry pinentry-timeout 600 log-file $HOME/.gnupg/gpg-agent.log |