Loads of changes

init.lua

@@ -12,219 +12,6 @@ require 'keymap'
 require 'autocmd'
 require 'lazy_init'
 
--- nnoremap <Leader>ev :tabedit $MYVIMRC<CR>
-
--- The line beneath this is called `modeline`. See `:help modeline`
--- vim: ts=2 sts=2 sw=2 et
-
--- " Mappings --- {{{
--- " Editing files - {{{
--- "Make it easy to edit the vimrc file
--- " }}}
---
--- "Changing unused ctrl bindings
--- "Turn on git blame
--- nnoremap <C-S-A> <CMD>Git blame<CR>
--- "List all tags in the current buffer (replaced pageup, use CTRL-u instead)
--- nnoremap <C-Q> <CMD>CocFzfList outline<CR>
--- "List all tags in directory
--- "nnoremap <C-S-B> <CMD>Tags<CR>
--- "List all the recently opened files (replaced scroll one line up, use "k")
--- nnoremap <C-E> <CMD>History<CR>
--- "Search within the current buffer (replaced pagedown, use CTRL-d instead)
--- "nnoremap <C-F> /
--- "Search within the whole project
--- nnoremap <C-F> <CMD>Rg<CR>
--- "Move line down (uses vim-unimpaired) (replaced move down, use "j")
--- nnoremap <C-J> <C-E>
--- "Move line up (uses vim-unimpaired) (replaced move up, use "k")
--- nnoremap <C-K> <C-Y>
--- "Does not work because of legacy reasons
--- " nnoremap <C-M>
--- "Search marks (replaced "j" clone)
--- nnoremap <C-N> <CMD>Marks<CR>
--- "Search version controlled files (replaced move up, use "k")
--- nnoremap <C-P> <CMD>GFiles<CR>
--- "Search all files in directory
--- nnoremap <C-S-P> <CMD>Files<CR>
--- "Toggle file draw
--- nnoremap <C-S-Q> <CMD>CHADopen<CR>
--- "Search all snippets (uses ultisnips)
--- nnoremap <C-S> <CMD>Snippets<CR>
--- "Search git history (replaced scroll one line up, use "k")
--- nnoremap <C-Y> <CMD>Commits<CR>
--- "Search git history within current buffer/selection
--- nnoremap <C-S-Y> <CMD>BCommits<CR>
---
--- "Turn on git blame
--- inoremap <C-S-A> <CMD>Git blame<CR>
--- "List all tags in the current buffer
--- inoremap <C-Q> <CMD>BTags<CR>
--- "List all tags in directory
--- inoremap <C-S-Q> <CMD>Tags<CR>
--- "List all the recently opened files (replaced inserting characters from below)
--- inoremap <C-E> <CMD>History<CR>
--- "Search within the current buffer
--- inoremap <C-F> <Esc>/
--- "Search within the whole project
--- inoremap <C-S-F> <CMD>Rg<CR>
--- "Move line down (uses vim-unimpaired) (replaced <CR> clone)
--- inoremap <C-J> <Esc>ddpi
--- "Move line up (uses vim-unimpaired) (replaced start digraph, use command instead)
--- inoremap <C-K> <Esc>ddkPi
--- "Does not work because of legacy reasons
--- " inoremap <C-M> <CMD>Marks<CR>
--- "Add line below (replaced execute single command in normal)
--- inoremap <C-O> <Esc>o
--- "Add line above
--- inoremap <C-S-O> <Esc>O
--- "Search version controlled files (replaced autocomplete reverse)
--- inoremap <C-P> <CMD>GFiles<CR>
--- "Search all files in directory
--- inoremap <C-S-P> <CMD>Files<CR>
--- "Toggle file draw (replaces CTRL-v clone)
--- inoremap <C-S-Q> <CMD>CHADopen<CR>
--- "Search all snippets (uses ultisnips)
--- inoremap <C-S> <CMD>Snippets<CR>
--- "Search git history (replaced inserting characters from above)
--- inoremap <C-Y> <CMD>Commits<CR>
--- "Search git history within current buffer/selection
--- inoremap <C-S-Y> <CMD>BCommits<CR>
---
--- "Add simple highlight removal
--- nnoremap <Leader><Space> :nohlsearch<CR>
---
--- "Convert tabs to spaces
--- nnoremap <Leader><Tab> :retab<CR>
---
--- "Git mappings
--- nnoremap ga :Git add %<CR>
--- nnoremap gb :Git blame<CR>
--- nnoremap gC :Git commit<CR>
--- nnoremap gp :Git push<CR>
--- nnoremap gP :Git pull<CR>
---
--- "Map movement keys to Escape
--- inoremap jj <Esc>
--- inoremap jk <Esc>
--- inoremap kk <Esc>
--- inoremap hh <Esc>
---
--- "Delete a line in insert mode
--- " inoremap <C-D> <Esc>ddi
---
--- "Use semicolon instead of colon for commands
--- nnoremap ; :
--- nnoremap : ;
---
--- "Append the line with a semicolon
--- inoremap <Leader>; <Esc>mzA;<Esc>`za
--- nnoremap <Leader>; mzA;<Esc>`za<Esc>
---
--- "Easily navigate items in the quickfix menu
--- nnoremap <Leader>] :cnext<CR>
--- nnoremap <Leader>[ :cprevious<CR>
---
--- "Indent arrays
--- nnoremap <Leader>{ mzF[`a<CR><Esc>``%i<CR><Esc>`z
--- nnoremap <Leader>} mzF[`a<CR><Esc>``%i<CR><Esc>`zvi[:s/,\s*/,\r/g<CR>vi[=<Esc>`z:nohlsearch<CR>
---
--- "A command to properly indent json code
--- command! FormatJSON %!python -m json.tool
---
--- " Allow saving of files as doas
--- command! W execute 'silent! w !doas /usr/bin/tee % >/dev/null' <BAR> edit!
--- command! X execute 'silent! x !doas /usr/bin/tee % >/dev/null' <BAR> edit!
---
--- " }}}
---
--- " Plugins --- {{{
---
--- " COC --- {{{
--- " Use tab for trigger completion with characters ahead and navigate
--- " NOTE: There's always complete item selected by default, you may want to enable
--- " no select by `"suggest.noselect": true` in your configuration file
--- " NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
--- " other plugin before putting this into your config
--- inoremap <silent><expr> <TAB>
---     \ coc#pum#visible() ? coc#pum#next(1) :
---     \ CheckBackspace() ? "\<Tab>" :
---     \ coc#refresh()
--- inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
---
--- " Make <CR> to accept selected completion item or notify coc.nvim to format
--- " <C-g>u breaks current undo, please make your own choice
--- inoremap <silent><expr> <CR> coc#pum#visible() ? coc#pum#confirm()
---                               \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
---
--- function! CheckBackspace() abort
---     let col = col('.') - 1
---     return !col || getline('.')[col - 1]  =~# '\s'
--- endfunction
---
--- if has('nvim')
---     inoremap <silent><expr> <c-space> coc#refresh()
--- else
---     inoremap <silent><expr> <c-@> coc#refresh()
--- endif
---
--- " Use `[g` and `]g` to navigate diagnostics
--- " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
--- nmap <silent> [g <Plug>(coc-diagnostic-prev)
--- nmap <silent> ]g <Plug>(coc-diagnostic-next)
---
--- " GoTo code navigation
--- nmap <silent> gd <Plug>(coc-definition)
--- nmap <silent> gy <Plug>(coc-type-definition)
--- nmap <silent> gi <Plug>(coc-implementation)
--- nmap <silent> gr <Plug>(coc-references)
---
--- " Use K to show documentation in preview window
--- nnoremap <silent> K :call ShowDocumentation()<CR>
---
--- function! ShowDocumentation()
---   if CocAction('hasProvider', 'hover')
---     call CocActionAsync('doHover')
---   else
---     call feedkeys('K', 'in')
---   endif
--- endfunction
---
--- " Highlight the symbol and its references when holding the cursor
--- autocmd CursorHold * silent call CocActionAsync('highlight')
---
--- " Symbol renaming
--- nmap <leader>rn <Plug>(coc-rename)
---
--- " Formatting selected code
--- xmap <leader>f  <Plug>(coc-format-selected)
--- nmap <leader>f  <Plug>(coc-format-selected)
---
--- augroup mygroup
---   autocmd!
---   " Setup formatexpr specified filetype(s)
---   autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
---   " Update signature help on jump placeholder
---   autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
--- augroup end
---
--- " Applying code actions to the selected code block
--- " Example: `<leader>aap` for current paragraph
--- xmap <leader>a  <Plug>(coc-codeaction-selected)
--- nmap <leader>a  <Plug>(coc-codeaction-selected)
---
--- " Remap keys for applying code actions at the cursor position
--- nmap <leader>ac  <Plug>(coc-codeaction-cursor)
--- " Remap keys for apply code actions affect whole buffer
--- nmap <leader>as  <Plug>(coc-codeaction-source)
--- " Apply the most preferred quickfix action to fix diagnostic on the current line
--- nmap <leader>qf  <Plug>(coc-fix-current)
---
--- " Remap keys for applying refactor code actions
--- nmap <silent> <leader>re <Plug>(coc-codeaction-refactor)
--- xmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
--- nmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
---
 -- " Run the Code Lens action on the current line
 -- nmap <leader>cl  <Plug>(coc-codelens-action)
 --
@@ -426,41 +213,6 @@ require 'lazy_init'
 --
 -- " Auto-Commands --- {{{
 --
--- "Automatically source the config files on save.
--- augroup autosourcing
---     autocmd!
---     autocmd BufWritePost $MYVIMRC source % "Source the vimrc file
--- augroup END
---
--- "Fold vimrc and zshrc files on open
--- augroup autofolding
---     autocmd!
---     autocmd BufReadPost $MYVIMRC :setlocal foldlevelstart=0
---     autocmd FileType vim setlocal foldmethod=marker
---     autocmd BufReadPost zsh :setlocal foldlevelstart=0
---     autocmd FileType zsh setlocal foldmethod=marker
--- augroup END
---
--- "Set commentary formats
--- function s:setcommentary()
---     if &commentstring =~ '/\*\s*%s\s*\*/'
---         let b:commentary_format="// %s"
---     endif
--- endfunction
---
--- augroup autocomment
---     autocmd!
---     autocmd FileType * call <SID>setcommentary()
--- augroup END
---
--- "Automatically save files
--- augroup autosaving
---     autocmd!
---     autocmd FocusLost * silent! wa "Save all files when moving away from the window
---     autocmd InsertLeave * silent! wa "Save all files when leaving insert mode
---     autocmd TextChanged * silent! wa "Save all files when text is changed
--- augroup END
---
 -- augroup modes
 --     autocmd!
 --     autocmd FocusLost * call feedkeys("\<Esc>") "Go to normal mode when moving away