Move envvars to .zshenv

diff --git a/x/.xinitrc b/x/.xinitrc
index cb60edb588c3dfa76cce18ae929429586d7d4d98..ea1b90ffcc0f1557d3cd6cce67a4b494c8bf7f22 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -5,5 +5,5 @@ xset b off
 xrdb ~/.Xresources
 xmodmap ~/.Xmodmap
 ~/bin/xstatusbar.sh &
-rm -f ~/.ssh/agent ; ssh-agent -a ~/.ssh/agent
-exec $HOME/src/suckless/dwm/dwm
+rm -f ~/.ssh/agent ; ssh-agent -a $SSH_AUTH_SOCK
+exec ~/src/suckless/dwm/dwm

diff --git a/zsh/.zshenv b/zsh/.zshenv
index 5fcaca0a0fe998bce31669177ad00422eed25e60..cce0a45646df0b6fec1326385ba75d274d8b98ad 100644 (file)
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -42,12 +42,6 @@ export IRCNAME="Sergey Matveev"
 export IRCNICK="stargrave"
 # }}}
 
-# Python options {{{
-export PIP_RESPECT_VIRTUALENV=true
-export PIP_VIRTUALENV_BASE=~/.virtualenvs
-export PYTHONDONTWRITEBYTECODE=1
-# }}}
-
 # XDG related junk {{{
 export XDG_CACHE_HOME=/tmp/stargrave-xdg
 export XDG_CONFIG_HOME=/tmp/stargrave-xdg
@@ -78,11 +72,10 @@ export -TU PKG_CONFIG_PATH pkg_config_path
 pkg_config_path=(~/local/lib/pkgconfig ~/local/libdata/pkgconfig)
 # }}}
 
-# C related {{{
-export CFLAGS="-I$HOME/local/include -I/usr/local/include"
-export LDFLAGS="-L$HOME/local/lib -L/usr/local/lib"
-export -TU LD_LIBRARY_PATH ld_library_path
-ld_library_path=(~/local/lib)
+# Python options {{{
+export PIP_RESPECT_VIRTUALENV=true
+export PIP_VIRTUALENV_BASE=~/.virtualenvs
+export PYTHONDONTWRITEBYTECODE=1
 # }}}
 
 # Go related {{{
@@ -93,6 +86,13 @@ export GOPATH=$HOME/work/gopath
 path=($GOPATH/bin ~/work/go/bin $path)
 # }}}
 
+# C related {{{
+export CFLAGS="-I$HOME/local/include -I/usr/local/include"
+export LDFLAGS="-L$HOME/local/lib -L/usr/local/lib"
+export -TU LD_LIBRARY_PATH ld_library_path
+ld_library_path=(~/local/lib)
+# }}}
+
 # Various {{{
 export SHELL=/bin/zsh
 export EDITOR=vim
@@ -104,4 +104,6 @@ export DBUS_SESSION_BUS_ADDRESS=disabled:
 export MYSQL_HISTFILE=/tmp/.mysql_history
 export REDO_JOBS=0 REDO_NO_SYNC=1
 export SHARNESS_TEST_SRCDIR=$HOME/local/stow/sharness/share/sharness
+export FZF_DEFAULT_OPTS="--color=16 --info=inline"
+export AUTOENV_AUTH_FILE=~/.zautoenv-auth
 # }}}

diff --git a/zsh/.zshrc b/zsh/.zshrc
index 45fd16407ce1bec84e3391034cfad38c4429f64f..660346fbb7be11c0935704d825c185dad112bc56 100644 (file)
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -209,7 +209,6 @@ ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=cyan"
 # }}}
 
 # fzf {{{
-export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 cf() {
     local dir=$(find -L ${1:-.} -mindepth 1 -path "*/\.git" -prune -o -type d -print |
         fzf --height 40% --reverse --preview="tree -CN {}")
@@ -225,6 +224,5 @@ done < ~/.zhashd
 # }}}
 
 # autoenv {{{
-export AUTOENV_AUTH_FILE=~/.zautoenv-auth
 . ~/work/zsh-autoenv/autoenv.zsh
 # }}}