update vim configuration and move .vimrc to .vim/vimrc

6 files changed, 52 insertions, 2 deletions

diff --git a/.vim/after/ftplugin/cpp.vim b/.vim/after/ftplugin/cpp.vim
new file mode 100644
index 0000000..0e18e2e
--- /dev/null
+++ b/.vim/after/ftplugin/cpp.vim
@@ -0,0 +1,5 @@
+setlocal expandtab
+setlocal shiftwidth=4
+setlocal softtabstop=4
+
+setlocal cino=N-s
diff --git a/.vim/after/ftplugin/cs.vim b/.vim/after/ftplugin/cs.vim
new file mode 100644
index 0000000..765e06c
--- /dev/null
+++ b/.vim/after/ftplugin/cs.vim
@@ -0,0 +1,3 @@
+setlocal expandtab
+setlocal shiftwidth=4
+setlocal softtabstop=4
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
new file mode 160000
+Subproject 4984767509e3d05ca051e253c8a8b37de784be4
diff --git a/.vim/ftdetect/Xresources.vim b/.vim/ftdetect/Xresources.vim
deleted file mode 100644
index 0054363..0000000
--- a/.vim/ftdetect/Xresources.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead */.Xresources.d/*	set filetype=xdefaults
diff --git a/.vim/ftdetect/muttrc.vim b/.vim/ftdetect/muttrc.vim
deleted file mode 100644
index 910fe15..0000000
--- a/.vim/ftdetect/muttrc.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead */.mutt.d/*	set filetype=muttrc
diff --git a/.vim/vimrc b/.vim/vimrc
new file mode 100644
index 0000000..91025df
--- /dev/null
+++ b/.vim/vimrc
@@ -0,0 +1,44 @@
+" Initialize Vundle for plugin management
+
+set nocompatible
+filetype off
+
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+Plugin 'VundleVim/Vundle.vim'
+Plugin 'a.vim'
+Plugin 'andreasvc/vim-256noir'
+Plugin 'aperezdc/vim-template'
+Plugin 'cespare/vim-toml'
+Plugin 'ctrlpvim/ctrlp.vim'
+Plugin 'godlygeek/tabular'
+Plugin 'OmniSharp/omnisharp-vim'
+Plugin 'rodjek/vim-puppet'
+Plugin 'rust-lang/rust.vim'
+Plugin 'scrooloose/syntastic'
+Plugin 'tpope/vim-dispatch'
+Plugin 'tpope/vim-fugitive'
+call vundle#end()
+
+filetype plugin indent on
+
+runtime! ftplugin/man.vim
+
+" Syntax highlighting
+syntax on
+
+" Status line and numbers
+set laststatus=2
+set number
+
+" Colors
+set background=dark
+
+" LaTeX instead of Plain TeX
+let g:tex_flavor = "latex"
+
+" Temporary workaround: csproj indicates a project root
+let g:ctrlp_root_markers = ['*.csproj']
+
+" Ignore some additional patterns when opening files
+set wildignore+=*/tmp/*,*.so,*.swp,*.zip,*/vendor/*,*/node_modules/*