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

diff --git a/zsh/env b/zsh/env
index 9348028..603c791 100644
--- a/zsh/env
+++ b/zsh/env
@@ -1,38 +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/>.
 
-# Get the current hostname (first part before a dot).
-host=${$(hostname)//.*/}
-
-# Load environmental related settings used by all shells.
-if [[ -f ~/.shell/env ]]; then
-    . ~/.shell/env
-# Fallback functions as ~/.shell/env couldn't be loaded.
-else
-    function source_debug() {
-        echo $@
-    }
-    function source_config() {
-        echo "Couldn't load source_config(), can't source files." >&2
-    }
-fi
 
-source_debug "sourcing ~/.zsh/env"
+. ~/.shell/functions
+
+source_debug ". ~/.zsh/env"
+
+source_config ~/.shell/env
 
 
 # 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
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
 
-# Load rc file for current OS.
-source_config ~/.zsh os env $(uname) nolocal
-# Load env file for current hostname (first part before a dot) or env.local.
-source_config ~/.zsh host env $host
+source_config ~/.zsh/env.local
 
-source_debug "finished sourcing ~/.zsh/env"
+source_debug ". ~/.zsh/env (done)"
 
 # vim: ft=zsh