aboutsummaryrefslogtreecommitdiffstats
path: root/zsh
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2014-02-18 16:56:41 +0100
committerJohannes Löthberg <johannes@kyriasis.com>2014-02-18 16:56:41 +0100
commit9c9e27b7bfc9c00acc02b91fdb8cb29c60fe546e (patch)
tree6e0486088938bbb8a88efe5c2639b807b0ddd23a /zsh
parent7e7aa928072775240ff70ca61f2dd0e8a09242d8 (diff)
downloaddotfiles-9c9e27b7bfc9c00acc02b91fdb8cb29c60fe546e.tar.xz
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zprofile14
-rw-r--r--zsh/.zshrc6
2 files changed, 11 insertions, 9 deletions
diff --git a/zsh/.zprofile b/zsh/.zprofile
index a8fd7d2..3cc0aee 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -1,5 +1,4 @@
-export PATH="$HOME"/.local/bin:"$PATH":"$HOME"/.gem/ruby/2.0.0/bin:$PLAN9/bin
-export PLAN9=/usr/local/plan9
+export PATH="$HOME"/.local/bin:"$PATH"
export XDG_CACHE_HOME="$HOME"/.cache
export XDG_CONFIG_HOME="$HOME"/.config
@@ -30,13 +29,10 @@ export TERMINAL=termite
export SDL_AUDIODRIVER=pulse
-export GTK_IM_MODULE=xim
+#export GTK_IM_MODULE=xim
export SUDO_PROMPT=$'\e[31mSUDO\e[m password for \e[34m%p\e[m: '
-
-export GOPATH=$HOME/code/go
-export PATH=$PATH:$GOPATH/bin
-
[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx "$HOME"/.config/X11/xinitrc
-envoy -t gpg-agent
-source <(envoy -p)
+#envoy -t gpg-agent
+#source <(envoy -p)
+
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 01d6100..ad5c01a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -116,3 +116,9 @@ alias sprin='curl -F "sprunge=<-" http://sprunge.us'
sprfile() {
curl -F "sprunge=<$1" http://sprunge.us
}
+
+PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+GPG_AGENT_INFO=$(ss -xl | grep -o '/run/user/1000/keyring-.*/gpg')
+[ -z "$GPG_AGENT_INFO" ] || export GPG_AGENT_INFO=$GPG_AGENT_INFO:0:1
+SSH_AUTH_SOCK=$(ss -xl | grep -o '/run/user/1000/keyring-.*/ssh')
+[ -z "$SSH_AUTH_SOCK" ] || export SSH_AUTH_SOCK