11 files changed, 40 insertions, 57 deletions
diff --git a/.vim/after/ftplugin/cpp.vim b/.config/vim/after/ftplugin/cpp.vim
index 0e18e2e..0e18e2e 100644
--- a/.vim/after/ftplugin/cpp.vim
+++ b/.config/vim/after/ftplugin/cpp.vim
diff --git a/.vim/ftdetect/cls.vim b/.config/vim/ftdetect/cls.vim
index 1a23087..1a23087 100644
--- a/.vim/ftdetect/cls.vim
+++ b/.config/vim/ftdetect/cls.vim
diff --git a/.vim/ftplugin/c.vim b/.config/vim/ftplugin/c.vim
index beaaf90..beaaf90 100644
--- a/.vim/ftplugin/c.vim
+++ b/.config/vim/ftplugin/c.vim
diff --git a/.vim/ftplugin/mail.vim b/.config/vim/ftplugin/mail.vim
index 0915315..0915315 100644
--- a/.vim/ftplugin/mail.vim
+++ b/.config/vim/ftplugin/mail.vim
diff --git a/.vim/ftplugin/tex.vim b/.config/vim/ftplugin/tex.vim
index 40e8bf7..40e8bf7 100644
--- a/.vim/ftplugin/tex.vim
+++ b/.config/vim/ftplugin/tex.vim
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index a9995d5..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule ".vim/bundle/Vundle.vim"]
-	path = .vim/bundle/Vundle.vim
-	url = https://github.com/Vundlevim/Vundle.vim
diff --git a/.vim/after/ftplugin/cs.vim b/.vim/after/ftplugin/cs.vim
deleted file mode 100644
index 765e06c..0000000
--- a/.vim/after/ftplugin/cs.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-setlocal expandtab
-setlocal shiftwidth=4
-setlocal softtabstop=4
diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim
deleted file mode 160000
-Subproject 4984767509e3d05ca051e253c8a8b37de784be4
diff --git a/.vim/ftdetect/mutt.vim b/.vim/ftdetect/mutt.vim
deleted file mode 100644
index 9b67c41..0000000
--- a/.vim/ftdetect/mutt.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead */.mutt/*	set filetype=muttrc
diff --git a/.vim/vimrc b/.vim/vimrc
deleted file mode 100644
index 0db9545..0000000
--- a/.vim/vimrc
+++ /dev/null
@@ -1,50 +0,0 @@
-" 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 'LucHermitte/lh-vim-lib'
-Plugin 'LucHermitte/local_vimrc'
-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/*
-set wildignore+=*.so,*.swp,*.zip,*/vendor/*,*/node_modules/*
-
-" Set viminfo path according to XDG Base Directory specification
-set viminfo+=n~/.cache/vim/viminfo
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..c298e8d
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,40 @@
+" Disable Vi-compatibility
+set nocompatible
+
+" Set paths according to XDG Base Directory specification
+set viminfo+=n${XDG_CACHE_HOME}/vim/viminfo
+set runtimepath=${XDG_CONFIG_HOME}/vim,${XDG_CONFIG_HOME}/vim/after,$VIM,$VIMRUNTIME
+
+" Syntax highlighting
+syntax on
+
+" Enable the filetype plugin
+filetype plugin indent on
+" LaTeX instead of Plain TeX
+let g:tex_flavor = "latex"
+
+" Status line and numbers
+set laststatus=2
+set number
+set relativenumber
+set ruler
+
+" Colors
+set background=dark
+
+" Ignore some additional patterns when opening files
+set wildignore+=*.o,*.so,*.swp
+
+" Search subdirectories with :find & co
+set path+=**
+
+" Better completion
+set wildmenu
+set wildmode=longest:full,full
+
+" netrw
+let g:netrw_banner=0
+" let g:netrw_browse_split=4
+let g:netrw_altv=1
+let g:netrw_liststyle=3
+let g:netrw_list_hide=netrw_gitignore#Hide()