better coc config

lua/coc/lua.lua

@@ -0,0 +1,145 @@
+vim.api.nvim_exec([[
+" Use tab for trigger completion with characters ahead and navigate.
+" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+" Use <c-space> to trigger completion.
+inoremap <silent><expr> <c-space> coc#refresh()
+
+" Use <cr> to confirm completion, `<C-g>u` means break undo chain at current position.
+" Coc only does snippet and additional edit on confirm.
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
+" Use `[c` and `]c` to navigate diagnostics
+nmap <silent> [c <Plug>(coc-diagnostic-prev)
+nmap <silent> ]c <Plug>(coc-diagnostic-next)
+
+" Remap keys for gotos
+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 <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Highlight symbol under cursor on CursorHold
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" Remap for rename current word
+nmap <leader>rn <Plug>(coc-rename)
+
+" Remap for format selected region
+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
+
+" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
+xmap <leader>a  <Plug>(coc-codeaction-selected)
+nmap <leader>a  <Plug>(coc-codeaction-selected)
+
+" Remap for do codeAction of current line
+nmap <leader>ac  <Plug>(coc-codeaction)
+" Fix autofix problem of current line
+nmap <leader>qf  <Plug>(coc-fix-current)
+
+" Use <tab> for select selections ranges, needs server support, like: coc-tsserver, coc-python
+nmap <silent> <TAB> <Plug>(coc-range-select)
+xmap <silent> <TAB> <Plug>(coc-range-select)
+xmap <silent> <S-TAB> <Plug>(coc-range-select-backword)
+
+" Use `:Format` to format current buffer
+command! -nargs=0 Format :call CocAction('format')
+
+" Use `:Fold` to fold current buffer
+command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+
+" use `:OR` for organize import of current buffer
+command! -nargs=0 OR   :call     CocAction('runCommand', 'editor.action.organizeImport')
+
+" Add status line support, for integration with other plugin, checkout `:h coc-status`
+set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}
+
+" Using CocList
+" Show all diagnostics
+nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
+" Manage extensions
+nnoremap <silent> <space>e  :<C-u>CocList extensions<cr>
+" Show commands
+nnoremap <silent> <space>c  :<C-u>CocList commands<cr>
+" Find symbol of current document
+nnoremap <silent> <space>o  :<C-u>CocList outline<cr>
+" Search workspace symbols
+nnoremap <silent> <space>s  :<C-u>CocList -I symbols<cr>
+" Do default action for next item.
+nnoremap <silent> <space>j  :<C-u>CocNext<CR>
+" Do default action for previous item.
+nnoremap <silent> <space>k  :<C-u>CocPrev<CR>
+" Resume latest coc list
+nnoremap <silent> <space>p  :<C-u>CocListResume<CR>
+
+function! GetHighlightGroup()
+   let l:s = synID(line('.'), col('.'), 1)                                       
+   echo synIDattr(l:s, 'name') . ' -> ' . synIDattr(synIDtrans(l:s), 'name')
+  endfunction
+
+nnoremap gA :call GetHighlightGroup()<CR>
+
+set fillchars=eob:\ 
+
+tnoremap <Esc> <C-\><C-n>
+" start terminal in insert mode
+au BufEnter * if &buftype == 'terminal' | :startinsert | endif
+
+" open terminal on the bottom 
+function! OpenTerminal()
+  split term://bash
+  resize 10
+endfunction
+nnoremap <c-x> :call OpenTerminal()<CR>
+nnoremap <c-b> :vnew term://bash<CR>
+
+set ignorecase 
+set noswapfile 
+set title
+set shortmess+=c
+set updatetime=250 "for gitsigns"
+
+" new tab and switching between em 
+
+nnoremap <c-e> : tabnew<CR>
+nnoremap <c-w> : tabp <CR>
+nnoremap <c-u> : tabn <CR>
+
+map <C-k> <C-w>k
+map <C-j> <C-w>j
+map <C-l> <C-w>l
+map <C-h> <C-w>h
+
+inoremap kk <ESC>
+
+]])

lua/statusline/lua.lua

@@ -24,7 +24,7 @@ local colors = {
 gls.left[1] = {
   leftRounded = {
     provider = function() return '' end,
-    highlight = { colors.green, colors.bg }
+    highlight = { colors.nord, colors.bg }
   },
 }
 
@@ -33,7 +33,7 @@ gls.left[2] = {
     provider = function()
       return ' 󰀘  '
     end,
-    highlight = {colors.bg,colors.green},
+    highlight = {colors.bg,colors.nord},
      separator = ' ',
   separator_highlight = {colors.lightbg,colors.lightbg},
   },
@@ -63,22 +63,6 @@ gls.left[5] = {
   },
 }
 
-gls.left[6] = {
-  GitIcon = {
-    provider = function() return '   ' end,
-    condition = require('galaxyline.provider_vcs').check_git_workspace,
-    highlight = {colors.red,colors.line_bg},
-  }
-}
-
-gls.left[7] = {
-  GitBranch = {
-    provider = 'GitBranch',
-    condition = require('galaxyline.provider_vcs').check_git_workspace,
-    highlight = {colors.red,colors.line_bg,'bold'},
-  }
-}
-
 local checkwidth = function()
   local squeeze_width  = vim.fn.winwidth(0) / 2
   if squeeze_width > 40 then
@@ -87,7 +71,7 @@ local checkwidth = function()
   return false
 end
 
-gls.left[8] = {
+gls.left[6] = {
   DiffAdd = {
     provider = 'DiffAdd',
     condition = checkwidth,
@@ -96,7 +80,7 @@ gls.left[8] = {
   }
 }
 
-gls.left[9] = {
+gls.left[7] = {
   DiffModified = {
     provider = 'DiffModified',
     condition = checkwidth,
@@ -105,7 +89,7 @@ gls.left[9] = {
   }
 }
 
-gls.left[10] = {
+gls.left[8] = {
   DiffRemove = {
     provider = 'DiffRemove',
     condition = checkwidth,
@@ -114,7 +98,7 @@ gls.left[10] = {
   }
 }
 
-gls.left[10] = {
+gls.left[9] = {
   LeftEnd = {
     provider = function() return ' ' end,
     separator = ' ',
@@ -123,7 +107,7 @@ gls.left[10] = {
   }
 }
 
-gls.left[11] = {
+gls.left[10] = {
   DiagnosticError = {
     provider = 'DiagnosticError',
     icon = '  ',
@@ -131,14 +115,14 @@ gls.left[11] = {
   }
 }
 
-gls.left[12] = {
+gls.left[11] = {
   Space = {
     provider = function () return ' ' end,
      highlight = {colors.line_bg,colors.line_bg}
   }
 }
 
-gls.left[13] = {
+gls.left[12] = {
   DiagnosticWarn = {
     provider = 'DiagnosticWarn',
     icon = '  ',
@@ -147,31 +131,59 @@ gls.left[13] = {
 }
 
 gls.right[1] = {
+  GitIcon = {
+    provider = function() return '   ' end,
+    condition = require('galaxyline.provider_vcs').check_git_workspace,
+    highlight = {colors.green,colors.line_bg},
+  }
+}
+
+gls.right[2] = {
+  GitBranch = {
+    provider = 'GitBranch',
+    condition = require('galaxyline.provider_vcs').check_git_workspace,
+    highlight = {colors.green,colors.line_bg},
+  }
+}
+
+gls.right[3] = {
   right_LeftRounded = {
     provider = function() return '' end,
-    highlight = { colors.nord, colors.bg }
+    separator = ' ',
+    separator_highlight = {colors.bg,colors.bg},
+    highlight = { colors.red, colors.bg }
+  },
+}
+
+gls.right[4] = {
+  SiMode = {
+    provider = function()
+      local alias = {
+        n = 'NORMAL',
+        i = 'INSERT',
+        c = 'COMMAND',
+        V = 'VISUAL',
+        [''] = 'VISUAL',
+        v = 'VISUAL',
+        R = 'REPLACE',
+      }
+      return alias[vim.fn.mode()]
+    end,
+    highlight = { colors.bg, colors.red },
   },
 }
 
 
-gls.right[2]= {
+gls.right[5] = {
-  FileFormat = {
-    provider = 'FileFormat',
-    highlight = {colors.bg,colors.nord},
-  }
-}
-
-
-gls.right[3] = {
   PerCent = {
     provider = 'LinePercent',
     separator = ' ',
-    separator_highlight = {colors.nord,colors.nord},
+    separator_highlight = {colors.red,colors.red},
     highlight = {colors.bg,colors.fg},
   }
 }
 
-gls.right[4] = {
+gls.right[6] = {
   rightRounded = {
     provider = function() return '' end,
     highlight = { colors.fg, colors.bg }