Update 2020-12-26

2 files changed, 5 insertions, 57 deletions

diff --git a/vim/.vim/scripts.vim b/vim/.vim/scripts.vim
deleted file mode 100644
index 6221c55..0000000
--- a/vim/.vim/scripts.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Additional scripts' filetype detections
-
-" This file is called by an autocommand for every file that has just been
-" loaded into a buffer.  It checks if the type of file can be recognized by
-" the file contents.  The autocommand is in $VIMRUNTIME/filetype.vim.
-"
-" Note that the pattern matches are done with =~# to avoid the value of the
-" 'ignorecase' option making a difference.  Where case is to be ignored use
-" =~? instead.  Do not use =~ anywhere.
-
-" Only do the rest when the FileType autocommand has not been triggered yet.
-if did_filetype()
-  finish
-endif
-
-" Line continuation is used here, remove 'C' from 'cpoptions'
-let s:cpo_save = &cpo
-set cpo&vim
-
-let s:line1 = getline(1)
-if s:line1 =~# "^#!"
-  " A script that starts with "#!".
-  " Check for a line like "#!/usr/bin/env VAR=val bash".  Turn it into
-  " "#!/usr/bin/bash" to make matching easier.
-  if s:line1 =~# '^#!\s*\S*\<env\s'
-    let s:line1 = substitute(s:line1, '\S\+=\S\+', '', 'g')
-    let s:line1 = substitute(s:line1, '\<env\s\+', '', '')
-  endif
-
-  " Get the program name.
-  " Only accept spaces in PC style paths: "#!c:/program files/perl [args]".
-  " If the word env is used, use the first word after the space:
-  " "#!/usr/bin/env perl [path/args]"
-  " If there is no path use the first word: "#!perl [path/args]".
-  " Otherwise get the last word after a slash: "#!/usr/bin/perl [path/args]".
-  if s:line1 =~# '^#!\s*\a:[/\\]'
-    let s:name = substitute(s:line1, '^#!.*[/\\]\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!.*\<env\>'
-    let s:name = substitute(s:line1, '^#!.*\<env\>\s\+\(\i\+\).*', '\1', '')
-  elseif s:line1 =~# '^#!\s*[^/\\ ]*\>\([^/\\]\|$\)'
-    let s:name = substitute(s:line1, '^#!\s*\([^/\\ ]*\>\).*', '\1', '')
-  else
-    let s:name = substitute(s:line1, '^#!\s*\S*[/\\]\(\i\+\).*', '\1', '')
-  endif
-
-  " GNU Octave
-  if s:name =~# 'octave'
-    set ft=octave
-  endif
-  unlet s:name
-endif
-
-" Restore 'cpoptions'
-let &cpo = s:cpo_save
-unlet s:cpo_save s:line1
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index fce91f9..e72b9e4 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -35,6 +35,7 @@ augroup END
 
 let g:netrw_banner = 0
 let g:netrw_liststyle = 3
+let g:VM_Enabled = 1
 let g:srcery_italic = 1
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0
@@ -42,10 +43,12 @@ let g:jedi#show_call_signatures = 2
 let g:jedi#smart_auto_mappings = 0
 let g:polyglot_disabled = ['latex']
 
+packadd! python-jedi
 call plug#begin('~/.vim/plugged')
+Plug 'https://github.com/andrep/vimacs'
 Plug 'https://github.com/vim/killersheep'
-Plug 'https://github.com/francoiscabrol/ranger.vim'
 Plug 'https://github.com/sheerun/vim-polyglot'
+Plug 'https://github.com/francoiscabrol/ranger.vim'
 Plug 'https://github.com/srcery-colors/srcery-vim'
 Plug 'https://github.com/knsh14/vim-github-link'
 Plug 'https://github.com/lervag/vimtex', {'for': 'tex'}
@@ -55,10 +58,10 @@ Plug 'https://github.com/racer-rust/vim-racer', {'for': 'rust'}
 Plug 'https://github.com/rhysd/rust-doc.vim', {'for': 'rust'}
 Plug 'https://github.com/artur-shaik/vim-javacomplete2', {'for': 'java'}
 call plug#end()
-source /usr/share/doc/fzf/examples/fzf.vim
 
 set t_Co=256
 colorscheme srcery
 map Q gq
 command Q q
 command W w
+nmap W :w<CR>