Add editor config

glejeune · Mar 17, 2015 · 5981a34 · 5981a34
1 parent 9eeabb7
commit 5981a34
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/_editorconfig b/_editorconfig
@@ -0,0 +1,9 @@
+# top-most EditorConfig file
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.erl]
+max_line_length = 160
diff --git a/_vimrc.bundle b/_vimrc.bundle
@@ -51,6 +51,9 @@ NeoBundle 'sjl/splice.vim'
 NeoBundle 'digitaltoad/vim-jade'
 NeoBundle 'kchmck/vim-coffee-script'
 NeoBundle 'airblade/vim-gitgutter'
+NeoBundle 'mcandre/Conque-Shell'
+NeoBundle 'editorconfig/editorconfig-vim'
+NeoBundle 'adimit/prolog.vim'
 
 call neobundle#end()
 

diff --git a/_zsh/rc/prompt b/_zsh/rc/prompt
@@ -60,7 +60,7 @@ precmd () {
   if [[ -s ~/.rvm/scripts/rvm ]] ; then 
     RUBY_VERSION_PROMPT=$(~/.rvm/bin/rvm-prompt)
   elif [[ -s ~/.rbenv/bin/rbenv ]] ; then
-    RUBY_VERSION_PROMPT=$(~/.rbenv/bin/rbenv global)
+    RUBY_VERSION_PROMPT=$(~/.rbenv/bin/rbenv version | awk '{print $1}')
   else
     RUBY_VERSION_PROMPT=""
   fi

diff --git a/_zshrc b/_zshrc
@@ -23,3 +23,4 @@ setopt autocd
 
 export ZSHRC_LOCAL=~/.zshrc.local
 [ -d $ZSHRC_LOCAL ] && [ -f ~/.zshrc.local/zshrc ] && source ~/.zshrc.local/zshrc
+