Don't use deprecated :Gstatus (use :Git)

This probably fixes "The file has changed reload [y/n]?"

.vimrc_template

@@ -25,6 +25,7 @@ Plugin 'scrooloose/nerdtree'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-eunuch'
 Plugin 'majutsushi/tagbar'
+Plugin 'jceb/vim-orgmode'
 
 "Python
 Plugin 'vim-python/python-syntax'
@@ -46,6 +47,8 @@ call vundle#end()
 "Local settings
 "{{{
 set guifont=JetBrains\ Mono\ 12
+"When on remote terminal this incites rage
+set mouse=a
 
 if !empty($DISPLAY)
     colorscheme snowhite

ftplugin/rust.vim

@@ -1,3 +1 @@
 nnoremap <buffer> <localleader>x :term cargo run<cr>
-iabbrev print println!("{}",
-iabbrev debug println!("{:?}",

plugin/settings.vim

@@ -26,6 +26,7 @@ set encoding=utf-8
 set number
 set showmatch
 set matchtime=2
+set autoread
 
 set hlsearch
 set incsearch
@@ -41,6 +42,7 @@ set cino=(0,u0,Ws,m1
 " {{{
 let g:tex_fold_enabled = 1
 let g:javaScript_fold = 1
+let g:rust_recommended_style = 0
 " }}}
 
 " Gui stuff
@@ -48,7 +50,6 @@ let g:javaScript_fold = 1
 set guicursor=n-v-i-c:block-Cursor
 set guicursor+=n-v-i-c:blinkon0
 set guioptions=a
-set mouse=a
 
 set langmenu=en_US.UTF-8
 " }}}
@@ -90,6 +91,7 @@ let g:LatexBox_latexmk_options = '-outdir=build -shell-escape'
 " {{{
 set completeopt-=preview
 let g:ycm_autoclose_preview_window_after_completion = 0
+let g:ycm_auto_hover = ''
 let g:ycm_key_detailed_diagnostics = ''
 let g:ycm_extra_conf_globlist  = ['!*']
 let g:ycm_filetype_blacklist = {
@@ -99,6 +101,7 @@ let g:ycm_filetype_blacklist = {
             \ 'text': 1,
             \ 'rst': 1,
             \ 'html': 1,
+            \ 'org': 1
             \ }
 let g:ycm_clangd_args = ['--header-insertion=never']
 if has('patch-8.0')
@@ -123,6 +126,16 @@ let g:doge_enable_mappings = 0
 let g:doge_doc_standard_python = 'numpy'
 " }}}
 
+" NNN Stuff
+" {{{
+let g:nnn#set_default_mappings = 0
+let g:nnn#layout = 'new'
+let g:nnn#action = {
+            \ '<leader>nt': 'tab split',
+            \ '<leader>ns': 'split',
+            \ '<leader>nv': 'vsplit' }
+" }}}
+
 " Coding style
 " {{{
 
@@ -161,6 +174,14 @@ augroup fuckingcomment
 augroup END
 " }}}
 
+" Nice hack for project filenames
+" {{{
+augroup relativize
+    autocmd!
+    autocmd FileReadPost,BufReadPost * cd .
+augroup END
+" }}}
+
 " For Terminal
 " {{{
 if has('terminal')
@@ -178,6 +199,8 @@ nnoremap , <nop>
 let maplocalleader = " "
 nnoremap <space> <nop>
 
+inoremap <s-cr> <c-o>O
+
 nnoremap q <nop>
 nnoremap Q <nop>
 nnoremap Y y$
@@ -247,18 +270,20 @@ nnoremap <leader>lp :lprev<cr>
 
 " Mappings for Plugins
 " {{{
-nnoremap <leader>N :NERDTree<cr>
+nnoremap <leader>N :NnnPicker %:p:h<CR>
+nnoremap <leader>n :NnnPicker<CR>
 nnoremap <leader>] :YcmCompleter GoTo<cr>
 nnoremap <leader>yt :YcmCompleter GetType<cr>
 nnoremap <leader>ye :YcmShowDetailedDiagnostic<cr>
 nnoremap <leader>yh :YcmCompleter GetDoc<cr>
 nnoremap <leader>yf :YcmCompleter FixIt<cr>:ccl<cr>
 nnoremap <leader>yd :YcmDiags<cr>
+nnoremap <leader>yp <plug>(YCMHover)
 nnoremap <leader>sd :SyntasticSetLoclist<cr>:lopen<cr>
 nnoremap <leader>sc :w<cr>:SyntasticCheck<cr>
 nnoremap <leader>sr :SyntasticReset<cr>
 nnoremap <leader>T :TagbarToggle<cr>
-nnoremap <leader>g :Gstatus<cr>
+nnoremap <leader>g :Git<cr>
 " }}}
 
 " Abbreviations