Merge branch 'main' into server

nvim/init.vim

@@ -2,61 +2,65 @@ set nocompatible
 filetype off
 
 " Plugins
-set rtp+=~/.config/nvim/bundle/Vundle.vim
-call vundle#begin("~/.config/nvim/bundle")
-
-Plugin 'VundleVim/Vundle.vim'
-
+let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
+if empty(glob(data_dir . '/autoload/plug.vim'))
+  silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs  https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
+endif
+call plug#begin()
 " Powerline replacement
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
 
 " Tags
-Plugin 'xolox/vim-misc'
+Plug 'xolox/vim-misc'
 "Plugin 'ludovicchabant/vim-gutentags'
-Plugin 'majutsushi/tagbar'
+Plug 'majutsushi/tagbar'
 
 " Templates
-Plugin 'aperezdc/vim-template'
+Plug 'aperezdc/vim-template'
 
 " Selection expand
-Plugin 'terryma/vim-expand-region'
-Plugin 'kana/vim-textobj-user'
-Plugin 'kana/vim-textobj-line'
-Plugin 'kana/vim-submode'
+Plug 'terryma/vim-expand-region'
+Plug 'kana/vim-textobj-user'
+Plug 'kana/vim-textobj-line'
+Plug 'kana/vim-submode'
 
 " Better Pasting
-Plugin 'ConradIrwin/vim-bracketed-paste'
+Plug 'ConradIrwin/vim-bracketed-paste'
 
 " Tmux navigation
-Plugin 'christoomey/vim-tmux-navigator'
+Plug 'christoomey/vim-tmux-navigator'
 
 " Git
-Plugin 'tpope/vim-fugitive'
+Plug 'tpope/vim-fugitive'
 
 " Comments
-Plugin 'scrooloose/nerdcommenter'
+Plug 'scrooloose/nerdcommenter'
 
 " Surround
-Plugin 'tpope/vim-surround'
+Plug 'tpope/vim-surround'
 
 " Snippets
 " Track the engine.
-Plugin 'SirVer/ultisnips'
+Plug 'SirVer/ultisnips'
 " Snippets are separated from the engine. Add this if you want them:
-Plugin 'honza/vim-snippets'
-Plugin 'ervandew/supertab'
+Plug 'honza/vim-snippets'
+Plug 'ervandew/supertab'
 
 " Highlight matching xml tags
-Plugin 'Valloric/MatchTagAlways'
+Plug 'Valloric/MatchTagAlways'
 
 "Javascript
-Plugin 'pangloss/vim-javascript'
+Plug 'pangloss/vim-javascript'
+
+" Tex
+Plug 'lervag/vimtex'
 
 "Go
-Plugin 'fatih/vim-go'
+Plug 'fatih/vim-go'
 
-call vundle#end()
+call plug#end()
 filetype plugin indent on
 set cinkeys-=0#
 
@@ -181,7 +185,7 @@ nmap <C-]> <C-w><C-]><C-w>T
 let g:ycm_collect_identifiers_from_tags_files = 1 " Read from tag files
 let g:ycm_global_ycm_extra_conf = '~/.config/nvim/.ycm_extra_conf.py' " Standard conf
 let g:ycm_enable_diagnostic_signs = 0 " Do not show semantic error bar
-let g:ycm_server_python_interpreter = 'python'
+let g:ycm_server_python_interpreter = 'python3'
 let g:ycm_key_list_select_completion   = ['<C-j>', '<C-n>', '<Down>']
 let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']
 
@@ -189,14 +193,14 @@ let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']
 let g:easytags_async = 1
 
 " make
-autocmd QuickFixCmdPre make set cmdheight=2
+set switchbuf=split
+"autocmd QuickFixCmdPre make set cmdheight=2
 "autocmd QuickFixCmdPost make nested cwindow "Open the quickfix window
 "autocmd QuickFixCmdPost make nested lwindow "Change to the quickfix window
-set switchbuf=split
-nmap <F9> :silent! make<CR>:redraw!<CR>
-nmap <Leader>m :silent! make<CR>:redraw!<CR>
-nmap <Leader>x :silent! make ex<CR>:redraw!<CR>
-imap <F9> <ESC>:make<CR>:redraw!<CR>i
+"nmap <F9> :silent! make<CR>:redraw!<CR>
+"nmap <Leader>m :silent! make<CR>:redraw!<CR>
+"nmap <Leader>x :silent! make ex<CR>:redraw!<CR>
+"imap <F9> <ESC>:make<CR>:redraw!<CR>i
 
 " vim-templates config-file
 try
@@ -219,6 +223,18 @@ let g:UltiSnipsJumpBackwardTrigger="<s-tab>"
 let g:UltiSnipsEditSplit="vertical"
 set rtp+=~/.config/nvim/my-snippets
 
+" Folding
+set foldmethod=syntax
+set foldlevel=100
+" Use F9 to toggle folding
+inoremap <F9> <C-O>za
+nnoremap <F9> za
+onoremap <F9> <C-C>za
+vnoremap <F9> zf
+nnoremap <Leader>a za
+onoremap <Leader>a <C-C>za
+vnoremap <Leader>a zf
+
 try
     source ~/.config/nvim/.vimrc_config_expand_region
 catch
@@ -233,3 +249,8 @@ catch
 endtry
 let g:tex_flavor = "latex"
 autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+
+if has("macunix")
+    " Required for virtualenvs
+    let g:python3_host_prog="/usr/local/bin/python3"
+endif