zsh: Separate startup files for different startup methods

5 files changed, 50 insertions, 45 deletions

diff --git a/install b/install
index 4923193f..44581a1f 100755
--- a/install
+++ b/install
@@ -22,8 +22,14 @@ install-dot () {
 
 install-dot $target/.git/hooks/ $target/git-hooks/*
 install-dot .emacs.d/ $target/emacs/{init.el{,c},elisp}
-install-dot . $target/^install(.) $target/zsh/zshrc $target/zsh/fasdrc
+install-dot . $target/^install(.) $target/zsh/fasdrc
 install-dot .ssh/ $target/ssh/*
+
+ln -sf $target/zsh/environment.zsh .zshenv
+ln -sf $target/zsh/interactive.zsh .zshrc
+ln -sf $target/zsh/login.zsh .zlogin
+ln -sf $target/zsh/logout.zsh .zlogout
+
 if [[ -d projects/dwm ]]
 then
 	install-dot projects/dwm/ $target/dwm/*
diff --git a/zsh/environment.zsh b/zsh/environment.zsh
new file mode 100755
index 00000000..080e2344
--- /dev/null
+++ b/zsh/environment.zsh
@@ -0,0 +1,43 @@
+if [[ $defpath == ""  && -d ~/bin ]]
+then
+	defpath=($path)
+	path=(
+		$defpath
+		~/bin
+	)
+	if [[ -d ~/.gem/ruby/*/bin ]]
+	then
+		path=(
+			$path
+			~/.gem/ruby/*/bin
+		)
+	fi
+fi
+
+export PATH
+
+myfuncs=( ~alan/projects/dotfiles/zsh/functions/*(/) )
+fpath=(
+	$myfuncs
+	~alan/projects/dotfiles/zsh/completion/
+	$fpath
+)
+if [[ -d /usr/local/share/zsh-completions ]]
+then
+	fpath=(/usr/local/share/zsh-completions $fpath)
+fi
+
+export FPATH
+
+case $OSTYPE in
+	*gnu*)
+		os=gnu
+		;;
+	freebsd*)
+		os=freebsd
+		;;
+	darwin*)
+		os=osx
+esac
+
+export os
diff --git a/zsh/zshrc b/zsh/interactive.zsh
index 28356be5..800d97d2 100755
--- a/zsh/zshrc
+++ b/zsh/interactive.zsh
@@ -1,36 +1,3 @@
-#!/usr/bin/env zsh
-#
-# System variables
-#
-
-if [[ $defpath == ""  && -d ~/bin ]]
-then
-	defpath=($path)
-	path=(
-		$defpath
-		~/bin
-	)
-	if [[ -d ~/.gem/ruby/*/bin ]]
-	then
-		path=(
-			$path
-			~/.gem/ruby/*/bin
-		)
-	fi
-fi
-
-myfuncs=( ~alan/projects/dotfiles/zsh/functions/*(/) )
-fpath=(
-	$myfuncs
-	~alan/projects/dotfiles/zsh/completion/
-	$fpath
-)
-if [[ -d /usr/local/share/zsh-completions ]]
-then
-	fpath=(/usr/local/share/zsh-completions $fpath)
-fi
-
-export PATH
 export PAGER="less"
 export EDITOR="emacsclient"
 export CLICOLOR=true
@@ -80,17 +47,6 @@ then
 	fi
 fi
 
-case $OSTYPE in
-	*gnu*)
-		os=gnu
-		;;
-	freebsd*)
-		os=freebsd
-		;;
-	darwin*)
-		os=osx
-esac
-
 LS_COLORS='no=00:fi=00:di=36:ln=35:pi=30;44:so=35;44:do=35;44:bd=33;44:cd=37;44:or=05;37;41:mi=05;37;41:ex=01;31:*.cmd=01;31:*.exe=01;31:*.com=01;31:*.bat=01;31:*.reg=01;31:*.app=01;31:*.txt=32:*.org=32:*.md=32:*.mkd=32:*.h=32:*.c=32:*.C=32:*.cc=32:*.cpp=32:*.cxx=32:*.objc=32:*.sh=32:*.csh=32:*.zsh=32:*.el=32:*.vim=32:*.java=32:*.pl=32:*.pm=32:*.py=32:*.rb=32:*.hs=32:*.php=32:*.htm=32:*.html=32:*.shtml=32:*.erb=32:*.haml=32:*.xml=32:*.rdf=32:*.css=32:*.sass=32:*.scss=32:*.less=32:*.js=32:*.coffee=32:*.man=32:*.0=32:*.1=32:*.2=32:*.3=32:*.4=32:*.5=32:*.6=32:*.7=32:*.8=32:*.9=32:*.l=32:*.n=32:*.p=32:*.pod=32:*.tex=32:*.bmp=33:*.cgm=33:*.dl=33:*.dvi=33:*.emf=33:*.eps=33:*.gif=33:*.jpeg=33:*.jpg=33:*.JPG=33:*.mng=33:*.pbm=33:*.pcx=33:*.pdf=33:*.pgm=33:*.png=33:*.ppm=33:*.pps=33:*.ppsx=33:*.ps=33:*.svg=33:*.svgz=33:*.tga=33:*.tif=33:*.tiff=33:*.xbm=33:*.xcf=33:*.xpm=33:*.xwd=33:*.xwd=33:*.yuv=33:*.aac=33:*.au=33:*.flac=33:*.mid=33:*.midi=33:*.mka=33:*.mp3=33:*.mpa=33:*.mpeg=33:*.mpg=33:*.ogg=33:*.ra=33:*.wav=33:*.anx=33:*.asf=33:*.avi=33:*.axv=33:*.flc=33:*.fli=33:*.flv=33:*.gl=33:*.m2v=33:*.m4v=33:*.mkv=33:*.mov=33:*.mp4=33:*.mp4v=33:*.mpeg=33:*.mpg=33:*.nuv=33:*.ogm=33:*.ogv=33:*.ogx=33:*.qt=33:*.rm=33:*.rmvb=33:*.swf=33:*.vob=33:*.wmv=33:*.doc=31:*.docx=31:*.rtf=31:*.dot=31:*.dotx=31:*.xls=31:*.xlsx=31:*.ppt=31:*.pptx=31:*.fla=31:*.psd=31:*.7z=1;35:*.apk=1;35:*.arj=1;35:*.bin=1;35:*.bz=1;35:*.bz2=1;35:*.cab=1;35:*.deb=1;35:*.dmg=1;35:*.gem=1;35:*.gz=1;35:*.iso=1;35:*.jar=1;35:*.msi=1;35:*.rar=1;35:*.rpm=1;35:*.tar=1;35:*.tbz=1;35:*.tbz2=1;35:*.tgz=1;35:*.tx=1;35:*.war=1;35:*.xpi=1;35:*.xz=1;35:*.z=1;35:*.Z=1;35:*.zip=1;35:*.ANSI-30-black=30:*.ANSI-01;30-brblack=01;30:*.ANSI-31-red=31:*.ANSI-01;31-brred=01;31:*.ANSI-32-green=32:*.ANSI-01;32-brgreen=01;32:*.ANSI-33-yellow=33:*.ANSI-01;33-bryellow=01;33:*.ANSI-34-blue=34:*.ANSI-01;34-brblue=01;34:*.ANSI-35-magenta=35:*.ANSI-01;35-brmagenta=01;35:*.ANSI-36-cyan=36:*.ANSI-01;36-brcyan=01;36:*.ANSI-37-white=37:*.ANSI-01;37-brwhite=01;37:*.log=01;34:*~=01;34:*#=01;34:*.bak=01;36:*.BAK=01;36:*.old=01;36:*.OLD=01;36:*.org_archive=01;36:*.off=01;36:*.OFF=01;36:*.dist=01;36:*.DIST=01;36:*.orig=01;36:*.ORIG=01;36:*.swp=01;36:*.swo=01;36:*,v=01;36:*.gpg=34:*.gpg=34:*.pgp=34:*.asc=34:*.3des=34:*.aes=34:*.enc=34:'
 
 #Ignore suffixes in completion
diff --git a/zsh/login.zsh b/zsh/login.zsh
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/zsh/login.zsh
diff --git a/zsh/logout.zsh b/zsh/logout.zsh
new file mode 100755
index 00000000..e69de29b
--- /dev/null
+++ b/zsh/logout.zsh