瀏覽代碼

use ycm for arduino-files, mv ycm-extra-conf

Kevin Heinicke 10 年之前
父節點
當前提交
45bdc98334
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 2
      .vimrc
  2. 1 0
      .zshrc

+ 2 - 2
.vimrc

@@ -85,9 +85,9 @@ colo Tomorrow-Night-Eighties
 
 
 " YCM Configuration
 " YCM Configuration
 " dont use python-mode autocomplete obsolete now, because of YCM
 " dont use python-mode autocomplete obsolete now, because of YCM
-let g:ycm_filetype_whitelist = {'cpp': 1, 'py': 1}
+let g:ycm_filetype_whitelist = {'cpp': 1, 'py': 1, 'arduino': 1}
 " set ycm_extra_conf
 " set ycm_extra_conf
-let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'
+let g:ycm_global_ycm_extra_conf = '~/.vim/ycm.py'
 " turn off the ycm diagnostic because of struggling with root
 " turn off the ycm diagnostic because of struggling with root
 "let g:ycm_show_diagnostics_ui = 0
 "let g:ycm_show_diagnostics_ui = 0
 
 

+ 1 - 0
.zshrc

@@ -33,6 +33,7 @@ export PYTHONPATH=$ROOTSYS/lib:$PYTHONPATH'
 
 
 ### e5-specific ###
 ### e5-specific ###
 alias me5='sshfs lhcb: ~/mount/e5 && cd ~/mount/e5'
 alias me5='sshfs lhcb: ~/mount/e5 && cd ~/mount/e5'
+alias mbam='sshfs bam: ~/mount/e5 && cd ~/mount/e5'
 
 
 # root
 # root
 alias iwantroot='cd $(brew --prefix root) && source libexec/thisroot.sh'
 alias iwantroot='cd $(brew --prefix root) && source libexec/thisroot.sh'