updates

1 files changed, 34 insertions, 33 deletions

diff --git a/nvim/init.vim b/nvim/init.vim
index 95a1410..69fe338 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,13 +1,18 @@
+"line numbers
 set nu
+"unix newlines
 set ff=unix
+"set the highlight column at 80
 set colorcolumn=80
+" displace spaces, tabs, and newlines
 set list
 set listchars=tab:→\ ,space:·,nbsp:␣,trail:•,eol:¶,precedes:«,extends:»
+"2 lines of cmd, needed for echodoc
 set cmdheight=2
 if has('win32')
 	source $VIMRUNTIME/mswin.vim
 endif
-"let g:python3_host_prog='D:/Progams/Python/python.exe'
+let g:python3_host_prog='python3'
 
 call plug#begin('~/.vim/plugged')
 
@@ -39,11 +44,11 @@ Plug 'raimon49/requirements.txt.vim'
 Plug 'chrisbra/csv.vim'
 
 " Lua, Moonscript, Teal
-"Plug 'xolox/vim-misc'
-"Plug 'xolox/vim-lua-ftplugin'
-"Plug 'VaiN474/vim-etlua'
-"Plug 'leafo/moonscript-vim'
-"Plug 'teal-language/vim-teal'
+Plug 'xolox/vim-misc'
+Plug 'xolox/vim-lua-ftplugin'
+Plug 'VaiN474/vim-etlua'
+Plug 'leafo/moonscript-vim'
+Plug 'teal-language/vim-teal'
 
 "Plug 'whonore/Coqtail'
 
@@ -63,7 +68,6 @@ Plug 'henrynewcomer/vim-theme-papaya'
 Plug 'sainnhe/edge'
 Plug 'kjssad/quantum.vim'
 Plug 'kyoz/purify'
-Plug 'sainnhe/vim-color-atlantis'
 Plug 'jonathanfilip/vim-lucius'
 Plug 'joshdick/onedark.vim'
 Plug 'cocopon/iceberg.vim'
@@ -71,7 +75,6 @@ Plug 'wolf-dog/sceaduhelm.vim'
 Plug 'danilo-augusto/vim-afterglow'
 Plug 'kamwitsta/mythos'
 Plug 'softmotions/vim-dark-frost-theme'
-Plug 'sainnhe/vim-color-grimoire'
 Plug 'ghifarit53/tokyonight-vim'
 
 " Terraform
@@ -82,8 +85,12 @@ colorscheme onedark
 
 "deoplete
 let g:deoplete#enable_at_startup = 1
-inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
-"autocmd CompleteDone * if pumvisible() == 0 | silent! pclose | endif
+inoremap <silent><expr> <TAB> pumvisible() ? "\<C-n>" : <SID>check_back_space() ? "\<TAB>" : deoplete#manual_complete()
+function s:check_back_space() abort "{{{
+	let col = col('.') - 1
+	return !col || getline('.')[col-1] =~ '\s'
+endfunction"}}}
+autocmd CompleteDone * if pumvisible() == 0 | silent! pclose | endif
 
 " echodoc
 let g:echodoc#enable_at_startup=1
@@ -91,16 +98,17 @@ let g:echodoc#type="floating"
 highlight link EchoDocFloat Pmenu
 
 "python
-"let g:deoplete#sources#jedi#python_path='python3'
+let g:deoplete#sources#jedi#python_path='python3'
 let g:deoplete#sources#jedi#enable_short_types=1
 let g:deoplete#sources#jedi#show_docstring=1
 call deoplete#custom#source('jedi','max_info_width',0)
-"set completeopt-=preview
+set completeopt-=preview
 
 "lua
 let g:lua_compiler_name='lua'
 "let g:lua_compiler_name='lua'
 let g:lua_complete_dynamic=1
+let g:lua_complete_keywords=0
 au BufReadPost *.busted set syntax=lua
 au BufReadPost *.spec set syntax=lua
 au BufReadPost *.etlua set syntax=html
@@ -129,15 +137,8 @@ nnoremap <C-/> :call NERDComment('x', 'toggle')<CR>
 
 "Fuzzy file search
 let g:fzf_layout = { 'window': {'width': 0.9, 'height': 0.6} }
-noremap π :call fzf#run(fzf#wrap({'sink': 'tabe', 'left': '20%', 'source': 'git ls-files'}))<Cr>
+noremap <A-p> :call fzf#run(fzf#wrap({'sink': 'tabe', 'left': '20%', 'source': 'git ls-files'}))<Cr>
 noremap <C-p> :call fzf#run(fzf#wrap({'sink': 'vsplit', 'left': '50%', 'source': 'git ls-files'}))<Cr>
-noremap å :call fzf#run(fzf#wrap({'sink':'tabe', 'left': '20%', 'source': 'git ls-files'}))<Cr>
-command! -bang -nargs=* GAg
- \ call fzf#vim#ag(
- \  <q-args>,
- \  fzf#vim#with_preview(),
- \  <bang>0
- \)
 
 "Fuzzy git checkout branch
 noremap <C-c> :call fzf#run(fzf#wrap({'sink': 'Git checkout', 'left':'20%', 'source': 'git branch --format "%(refname:short)"'}))<Cr>
@@ -173,15 +174,15 @@ nnoremap H 5h
 nnoremap L 5l
 
 "Navigate splits
-tnoremap ˙ <C-\><C-n><C-w>h
-tnoremap ∆ <C-\><C-n><C-w>j
-tnoremap ˚ <C-\><C-n><C-w>k
-tnoremap ¬ <C-\><C-n><C-w>l
+tnoremap <A-h> <C-\><C-n><C-w>h
+tnoremap <A-j> <C-\><C-n><C-w>j
+tnoremap <A-k> <C-\><C-n><C-w>k
+tnoremap <A-l> <C-\><C-n><C-w>l
 
-nnoremap ˙ <C-\><C-n><C-w>h
-nnoremap ∆ <C-\><C-n><C-w>j
-nnoremap ˚ <C-\><C-n><C-w>k
-nnoremap ¬ <C-\><C-n><C-w>l
+nnoremap <A-h> <C-\><C-n><C-w>h
+nnoremap <A-j> <C-\><C-n><C-w>j
+nnoremap <A-k> <C-\><C-n><C-w>k
+nnoremap <A-l> <C-\><C-n><C-w>l
 
 "Resize splits
 "noremap <C-h> :vertical resize -5<Cr>
@@ -216,14 +217,14 @@ nnoremap <C-k> :call <SID>PushResize('k',5)<CR>
 nnoremap <C-l> :call <SID>PushResize('l',5)<CR>
 
 "Navigate tabs
-noremap ‘ gt
-noremap “ gT
+noremap <C-]> gt
+noremap <C-[> gT
 
 "Add a semicolon at the end of the line
 vnoremap <C-;> :'<,'>s/\([^;]\)$/\1;/g<Cr>
 
-"Build in a vertical split
-noremap <C-b> :vsplit term://make<Cr>
+"Vertical split and make
+noremap <C-b> :vsplit term://make all<Cr>
 
 "Start a terminal
 noremap <C-t> :vsplit<CR>:terminal<CR>
@@ -232,7 +233,7 @@ noremap <C-t> :vsplit<CR>:terminal<CR>
 noremap <C-f> :Ag<Cr>
 
 "Restart vim (alt+1)
-noremap ¡ :source ~/.config/nvim/init.vim \| :PlugInstall<Cr>
+noremap <A-1> :source $MYVIMRC \| :PlugInstall<Cr>
 
 filetype plugin indent on
 syntax enable