X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Fenv;h=61ea779134040430e7640203f8894e84eb51227a;hb=e189acb4d63724d096f6db3b26fbedfbdcda183d;hp=801b2379e24327a75db295599210b221c9a2448e;hpb=7abc06281cf09194942f844e9655ad96d87c0bdd;p=config%2Fdotfiles.git

diff --git a/zsh/env b/zsh/env
index 801b237..61ea779 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,21 +1,37 @@
 # 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, its configuration is done through the .less file.
-export PAGER=less
+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
+
+# vim: ft=zsh