X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=30483a0178dea80120bc2c6c6ee1a9dcfdf4d8dc;hb=17e1c02c53c9083cf2201c6e4c8ac5d493738f42;hp=37b146769c69772288a6da2c217affb2dad88eef;hpb=2f24b0aebdd38599256c21b82ee7b39fe5ad0963;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 37b1467..30483a0 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,21 +1,35 @@
 # Zsh configuration file for environment related options.
 
+# Copyright (C) 2011-2014  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
 
-# Set Vim as my editor.
-export EDITOR=vim
+. ~/.shell/functions
 
-# Set less as my pager, its configuration is done through the .less file.
-export PAGER=less
+source_config ~/.shell/env
 
 
-# If an env file for the current hostname (first part before a dot) exists load
-# it, otherwise load env.local if available.
-host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/env.$host ]]; then;
-    source ~/.zsh/env.$host
-elif [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-fi
+# Make sure elements in PATH are unique.
+typeset -U path PATH
+
+# Use $TMPDIR/zsh as directory for temporary Zsh files to prevent symlink
+# attacks - only helps if $TMPDIR points to a safe directory (which should be
+# true with the settings in shell/env).
+TMPPREFIX="$TMPDIR/zsh"
+
+
+source_config ~/.zsh/env.local
+
+# vim: ft=zsh