Permalink
Browse files

merge

  • Loading branch information...
tomoh1r committed May 10, 2012
1 parent 1a1a30b commit 512e26de03f3f6acd55cfec197a21600020b23a2
Showing with 7 additions and 10 deletions.
  1. +1 −0 dots/.vimrc
  2. +6 −7 dots/.zsh.alias
  3. +0 −3 dots/.zshrc
View
@@ -176,6 +176,7 @@ let g:NERDTreeIgnore=['\.svn', '\.pyc']
autocmd FileType python call SettingForPython()
autocmd FileType ruby call SettingForPython()
+autocmd FileType sh call SettingForPython()
autocmd FileType ini call SettingForPython()
autocmd FileType cfg call SettingForPython()
autocmd FileType html call SettingForHTML()
View
@@ -13,10 +13,10 @@ export SHELL="/usr/bin/zsh"
export HGENCODING="utf-8"
### for ruby
-export PATH="${HOME}/.rbenv/bin:${PATH}"
-eval "$(rbenv init -)"
+#export PATH="${HOME}/.rbenv/bin:${PATH}"
+#eval "$(rbenv init -)"
#export PATH=${HOME}/local/lib/gems/1.8/bin:${PATH}
-export RUBYOPT='-Ke -rkconv'
+#export RUBYOPT='-Ke -rkconv'
#export RUBYLIB=${HOME}/local/lib:/usr/lib/ruby/1.8
#export GEM_HOME=${HOME}/local/lib/gems/1.8
@@ -28,16 +28,16 @@ export VIRTUALENV_USE_DISTRIBUTE=true
export WORKON_HOME=$HOME/.virtualenvs
source `which virtualenvwrapper.sh`
#for Python 2.7
-workon main27
+#workon bkl27
#for Python 2.6
#workon env26
### for jenkins
#export JENKINS_HOME=$HOME/jenkins
### for node.js
-setopt no_nomatch
-source ~/.nvm/nvm.sh
+#setopt no_nomatch
+#source ~/.nvm/nvm.sh
# pip zsh completion start
function _pip_completion {
@@ -67,4 +67,3 @@ export QT_IM_MODULE=ibus
alias ls='ls -F'
alias ll='ls -l'
alias la='ls -la'
-
View
@@ -44,7 +44,4 @@ zstyle ':completion:*' list-colors 'di=34' 'ln=35' 'so=32' 'ex=31' 'bd=46;34' 'c
[ -f ~/.zsh.alias ] && source ~/.zsh.alias # 設定ファイルのinclude
-#[ -f ~/.zshrc.mode ] && source ~/.zsh.mode # 設定ファイルのinclude
-
[ -f ~/.zsh.include ] && source ~/.zsh.include # 設定ファイルのinclude
-

0 comments on commit 512e26d

Please sign in to comment.