zsh: define environment variables in zshenv

diff --git a/profile b/profile
index fc234d94ef59f94baac1832e75210f5e1e0e8a5b..586ff0fe12153da1364809671433c1211be6a2b4 100644 (file)
--- a/profile
+++ b/profile
@@ -1,4 +1 @@
-export PATH="$HOME/bin:$PATH"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_CACHE_HOME="$HOME/.cache"
+[[ -r $HOME/.zshenv ]] && source $HOME/.zshenv

diff --git a/zprofile b/zprofile
deleted file mode 100644 (file)
index 53ca887..0000000
--- a/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source ~/.profile'

diff --git a/zshenv b/zshenv
new file mode 100644 (file)
index 0000000..b411fb5
--- /dev/null
+++ b/zshenv
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+export PATH="$HOME/bin:$PATH"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+# vim stuff
+[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
+export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
+export EDITOR=vim
+export VISUAL=vim
+
+# default browser
+export BROWSER=dwb

diff --git a/zshrc b/zshrc
index 2d8463f1d40d927f0a33d8c52a27f86d5150a726..5604a7c5dcc7457e6255e641349ca87b20b6da8a 100644 (file)
--- a/zshrc
+++ b/zshrc
@@ -45,15 +45,6 @@ for alias_file ($ZSH/aliases/*.zsh); do
   source $alias_file
 done
 
   source $alias_file
 done
 

-# vim stuff
-[[ -d "$XDG_CACHE_HOME/vim" ]] || mkdir -p "$XDG_CACHE_HOME/vim"
-export VIMINIT='let $MYVIMRC="$XDG_CONFIG_HOME/vim/vimrc" | source $MYVIMRC'
-export EDITOR=vim
-export VISUAL=vim
-
-# default browser
-export BROWSER=dwb
-

 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
 hash -d ccr=~/ccr
 # set up a few named directories
 hash -d Skaro=/mnt/Skaro
 hash -d ccr=~/ccr


@@ -66,4 +57,3 @@ hash -d UniMaas=~/dropbox/Documents/UniMaas
 
 # set some env variables
 export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle
 
 # set some env variables
 export _gamedir=/mnt/Skaro/Games/Linux/HumbleBundle

-