Skip to content

Commit aeda8cc

Browse files
committed
update vim
1 parent 9881d02 commit aeda8cc

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.bashrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
# Put your fun stuff here.
1515

16-
PATH="$HOME/bin/:$HOME/.local/bin/:$HOME/.cabal/bin/:${PATH}"
16+
PATH="$HOME/bin/:$HOME/.local/bin/:$HOME/.cabal/bin/:$HOME/.cargo/bin/:${PATH}"
1717
export EDITOR="/usr/bin/vim"
1818
export PIP_DOWNLOAD_CACHE=$HOME/.pip/cache
1919
export GOPATH=$HOME/go

.gitconfig

+2
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@
1414
smudge = git-lfs smudge -- %f
1515
process = git-lfs filter-process
1616
required = true
17+
[pull]
18+
ff = only

.vimrc

+7-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ call vundle#begin()
2323
Plugin 'gmarik/vundle'
2424

2525
if has('python3') || has('python')
26-
Plugin 'Valloric/YouCompleteMe'
26+
Plugin 'ycm-core/YouCompleteMe'
2727
endif
2828
"Plugin 'lukerandall/haskellmode-vim'
2929
"Plugin 'dag/vim2hs'
@@ -39,13 +39,15 @@ Plugin 'idris-hackers/idris-vim'
3939
Plugin 'rust-lang/rust.vim'
4040
Plugin 'qnighy/lalrpop.vim'
4141
Plugin 'google/vim-jsonnet'
42+
Plugin 'LnL7/vim-nix'
4243

4344
Plugin 'Shougo/vimproc.vim'
4445
Plugin 'neovimhaskell/haskell-vim'
4546
Plugin 'ujihisa/neco-ghc'
4647
Plugin 'bitc/vim-hdevtools'
4748
Plugin 'hashivim/vim-terraform'
4849
Plugin 'saltstack/salt-vim'
50+
Plugin 'nathanaelkane/vim-indent-guides'
4951
call vundle#end()
5052

5153
filetype plugin indent on
@@ -97,7 +99,7 @@ if has("autocmd")
9799
" For all text files set 'textwidth' to 78 characters.
98100
autocmd FileType text setlocal textwidth=78
99101

100-
au FileType python setlocal tabstop=8 expandtab shiftwidth=4 softtabstop=4 foldmethod=indent
102+
"au FileType python setlocal tabstop=8 expandtab shiftwidth=4 softtabstop=4 foldmethod=indent
101103
" When editing a file, always jump to the last known cursor position.
102104
" Don't do it when the position is invalid or when inside an event handler
103105
" (happens when dropping a file on gvim).
@@ -180,7 +182,7 @@ let g:syntastic_mode_map = { 'mode': 'active',
180182
let g:syntastic_python_python_exec = 'python'
181183
let g:syntastic_python_checkers=['python', 'pyflakes']
182184
let g:syntastic_idris_checkers=[]
183-
"let g:syntastic_rust_checkers=[]
185+
let g:syntastic_rust_checkers=[]
184186

185187
let g:syntastic_asm_dialect="intel"
186188

@@ -207,3 +209,5 @@ set guioptions-=T
207209
let g:ctrlp_max_files=0
208210
let g:Tex_AdvancedMath = 1
209211
set winaltkeys=no
212+
213+
let g:indent_guides_enable_on_vim_startup = 1

0 commit comments

Comments
 (0)