From 578878f57bd1db44c6c5e22dbda0de486c389266 Mon Sep 17 00:00:00 2001
From: Ben Morrison <ben@gbmor.dev>
Date: Thu, 23 Apr 2020 17:30:21 -0400
Subject: minor changes to launch of gpg-agent

---
 .gnupg/gpg-agent.conf |  2 +-
 .zprofile             | 13 +++++++++++++
 .zshrc.local          | 26 +-------------------------
 bin/gk                |  2 +-
 4 files changed, 16 insertions(+), 27 deletions(-)
 create mode 100644 .zprofile

diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index 9ae5feb..905af8c 100644
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -4,4 +4,4 @@ max-cache-ttl 120
 #keep-display
 pinentry-program /usr/bin/pinentry-curses
 
-extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
+#extra-socket /run/user/1000/gnupg/S.gpg-agent.extra
diff --git a/.zprofile b/.zprofile
new file mode 100644
index 0000000..44983af
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,13 @@
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
+
+# use gpg-agent for ssh
+export GPG_TTY=$(tty)
+export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+gpg-connect-agent updatestartuptty /bye > /dev/null
+#gpgconf --launch gpg-agent
+gpgconf --create-socketdir
+
+ulimit -n 8096
diff --git a/.zshrc.local b/.zshrc.local
index 1b0f3dd..e15f697 100644
--- a/.zshrc.local
+++ b/.zshrc.local
@@ -1,16 +1,3 @@
-export LANG=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
-export LANGUAGE=en_US.UTF-8
-
-# use gpg-agent for ssh
-export GPG_TTY="$(tty)"
-export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
-#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-gpg-connect-agent updatestartuptty /bye > /dev/null
-#gpgconf --launch gpg-agent
-gpgconf --create-socketdir
-
-
 alias vim='nvim'
 alias less='$PAGER'
 alias more='$PAGER'
@@ -45,7 +32,7 @@ alias devtilde='cd ~/dev/tildegit'
 # misc environment modifications
 export VISUAL=nvim
 export EDITOR=$VISUAL
-export PAGER='$HOME/.cargo/bin/bat -p'
+export PAGER='/home/ahriman/.cargo/bin/bat -p'
 export BROWSER=firefox
 export TERM=xterm-256color
 export MANPATH="/usr/local/man:$MANPATH"
@@ -84,17 +71,6 @@ export BOOT_CLOJURE_NAME=org.clojure/clojure
 export BOOT_VERSION=2.8.3
 export BOOT_CLOJURE_VERSION=1.8.0
 
-# hide user@host for agnoster oh-my-zsh theme
-DEFAULT_USER=ahriman
-prompt_context(){}
-
-# remove newline before zsh prompt
-#SPACESHIP_PROMPT_ADD_NEWLINE=false
-
-ulimit -n 8096
-
-#eval "$(starship init zsh)"
-
 # shadowgate mud over ssl
 alias shadowgate='socat TCP-LISTEN:8080,fork,reuseaddr OPENSSL:shadowgate.org:8443'
 
diff --git a/bin/gk b/bin/gk
index f0886f6..c801a45 100755
--- a/bin/gk
+++ b/bin/gk
@@ -1,7 +1,7 @@
 #!/bin/sh
 pkill gpg-agent
 
-export GPG_TTY="$(tty)"
+export GPG_TTY=$(tty)
 export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 gpg-connect-agent updatestartuptty /bye
 
-- 
cgit 1.4.1