Răsfoiți Sursa

using_oh_my_zsh: rename zshlocal to zshdev

Repurpose zshlocal properly, to contain machine specific settings. This file
will not be included in the dotfiles repository. The common shortcuts that
should not be in zshrc are instead now stored in zshdev. Is there a better name
for zshdev?
Weiyi Lou 13 ani în urmă
părinte
comite
c59ac23820
4 a modificat fișierele cu 15 adăugiri și 5 ștergeri
  1. 1 1
      RUNME
  2. 8 4
      zsh/zshdev
  3. 1 0
      zsh/zshenv
  4. 5 0
      zsh/zshrc.ohmyzsh

+ 1 - 1
RUNME

@@ -67,7 +67,7 @@ else
 fi
 fi
 ln -s dotfiles/zsh/zshrc.ohmyzsh ~/.zshrc
 ln -s dotfiles/zsh/zshrc.ohmyzsh ~/.zshrc
 ln -s dotfiles/zsh/zshenv ~/.zshenv
 ln -s dotfiles/zsh/zshenv ~/.zshenv
-ln -s dotfiles/zsh/zshlocal ~/.zshlocal
+ln -s dotfiles/zsh/zshdev ~/.zshdev
 ln -s ../../oh-my-zsh-customs/cinaeco.zsh-theme zsh/oh-my-zsh/custom
 ln -s ../../oh-my-zsh-customs/cinaeco.zsh-theme zsh/oh-my-zsh/custom
 echo " -> Done"
 echo " -> Done"
 
 

+ 8 - 4
zsh/zshlocal → zsh/zshdev

@@ -1,3 +1,7 @@
+#
+# zshdev is sourced by a command in zshrc
+#
+
 ## shortcuts to other machines
 ## shortcuts to other machines
 alias murray='ssh weiyi@murray'
 alias murray='ssh weiyi@murray'
 alias nile='ssh weiyi@nile'
 alias nile='ssh weiyi@nile'
@@ -35,13 +39,13 @@ alias noproxy='export http_proxy='';export HTTP_PROXY=$http_proxy;export https_p
 ## shortcuts for Jails setup
 ## shortcuts for Jails setup
 #alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
 #alias guantanamo-start='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k start'
 #alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'
 #alias guantanamo-graceful='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k graceful'
-#alias guantanamo-stop='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k stop'  
-#alias guantanamo-check='chroot /jails/guantanamo /usr/local/apache2/bin/apachectl -t'  
+#alias guantanamo-stop='env -i /usr/sbin/chroot /jails/guantanamo /usr/local/apache2/bin/httpd -k stop'
+#alias guantanamo-check='chroot /jails/guantanamo /usr/local/apache2/bin/apachectl -t'
 
 
 #alias woomera-start='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k start'
 #alias woomera-start='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k start'
 #alias woomera-graceful='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k graceful'
 #alias woomera-graceful='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k graceful'
-#alias woomera-stop='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k stop'  
-#alias woomera-check='chroot /jails/woomera /usr/local/apache2/bin/apachectl -t'  
+#alias woomera-stop='env -i /usr/sbin/chroot /jails/woomera /usr/local/apache2/bin/httpd -k stop'
+#alias woomera-check='chroot /jails/woomera /usr/local/apache2/bin/apachectl -t'
 
 
 #alias littlehey-start='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k start'
 #alias littlehey-start='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k start'
 #alias littlehey-graceful='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k graceful'
 #alias littlehey-graceful='env -i /usr/sbin/chroot /jails/littlehey /usr/local/apache2/bin/httpd -k graceful'

+ 1 - 0
zsh/zshenv

@@ -20,6 +20,7 @@ export PATH=/usr/lib/firefox-3.6:$PATH
 export PATH=/usr/local/bin:/usr/local/git/bin:$PATH
 export PATH=/usr/local/bin:/usr/local/git/bin:$PATH
 export PATH=/usr/local/php/bin:/usr/local/php53/bin:$PATH
 export PATH=/usr/local/php/bin:/usr/local/php53/bin:$PATH
 export PATH=/usr/local/apache2/bin:/usr/local/mysql/bin:$PATH
 export PATH=/usr/local/apache2/bin:/usr/local/mysql/bin:$PATH
+export PATH=/usr/local/Cellar/ruby/1.9.3-p194/bin:$PATH
 export PATH=/opt/local/bin:/opt/local/sbin:$PATH
 export PATH=/opt/local/bin:/opt/local/sbin:$PATH
 export PATH=/jails/alcatraz/usr/local/www/oars/libraries/lithium/console:$PATH
 export PATH=/jails/alcatraz/usr/local/www/oars/libraries/lithium/console:$PATH
 export JAVA_HOME=/usr/local/java
 export JAVA_HOME=/usr/local/java

+ 5 - 0
zsh/zshrc.ohmyzsh

@@ -122,6 +122,11 @@ if [ `uname` != Darwin ]; then
   fi
   fi
 fi
 fi
 
 
+## include additional settings
+if [[ -r ~/.zshdev ]]; then
+    source ~/.zshdev
+fi
+
 ## include settings specific to this machine
 ## include settings specific to this machine
 if [[ -r ~/.zshlocal ]]; then
 if [[ -r ~/.zshlocal ]]; then
     source ~/.zshlocal
     source ~/.zshlocal