X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=603c79134041e4e48c26332a85227a19d23cddcc;hb=70b42be6c70cba1f99b53efa9127237fb0f2a5d3;hp=269695ee035d2be5bf73668598109e51ba9b4419;hpb=486bbbcbb78ff022420640be59ebe72a24cb0882;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 269695e..603c791 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,26 +1,41 @@
 # Zsh configuration file for environment related options.
 
+# Copyright (C) 2011-2013  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.
-export PAGER=less
+source_debug ". ~/.zsh/env"
 
-# Set options for less. If the command output fits on the current terminal
-# page less automatically quits. Also allows the use with colordiff.
-export LESS="--no-init --search-skip-screen --quit-if-one-screen \
---RAW-CONTROL-CHARS"
+source_config ~/.shell/env
 
 
-# If an env.local file exists load it, otherwise load an env file for the
-# current hostname (first part before a dot) if it exists.
-host=${$(hostname)//.*/}
-if [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-elif [[ -f ~/.zsh/env.$host ]]; then;
-    source ~/.zsh/env.$host
+# Make sure elements in PATH are unique.
+typeset -U path PATH
+
+# Setup lesspipe to view multiple file-types (like .gz, .zip, etc.) with less.
+# Useful in combination with the "p" alias. Taken from Debian's default bash
+# files. Thanks.
+if [[ -x /usr/bin/lesspipe ]]; then
+    eval "$(SHELL=/bin/sh lesspipe)" || echo "Broken lesspipe!" >&2
 fi
+
+
+source_config ~/.zsh/env.local
+
+source_debug ". ~/.zsh/env (done)"
+
+# vim: ft=zsh