|
@@ -32,11 +32,16 @@ call plug#begin('~/.vim/plugged')
|
|
Plug 'tpope/vim-fugitive' " Git for Vim
|
|
Plug 'tpope/vim-fugitive' " Git for Vim
|
|
Plug 'zah/nim.vim' " Nim Plugin
|
|
Plug 'zah/nim.vim' " Nim Plugin
|
|
Plug 'neovim/nvim-lspconfig' " Official Language Server Protocol
|
|
Plug 'neovim/nvim-lspconfig' " Official Language Server Protocol
|
|
- Plug 'nvim-lua/completion-nvim'
|
|
|
|
|
|
+ " All the lua completion plugins
|
|
|
|
+ Plug 'hrsh7th/nvim-cmp', {'branch': 'main'}
|
|
|
|
+ Plug 'hrsh7th/cmp-nvim-lsp', {'branch': 'main'}
|
|
|
|
+ Plug 'hrsh7th/cmp-buffer', {'branch': 'main'}
|
|
|
|
+ Plug 'hrsh7th/cmp-path', {'branch': 'main'}
|
|
|
|
+
|
|
Plug 'nvim-lua/plenary.nvim'
|
|
Plug 'nvim-lua/plenary.nvim'
|
|
Plug 'nvim-telescope/telescope.nvim'
|
|
Plug 'nvim-telescope/telescope.nvim'
|
|
Plug 'catppuccin/nvim', {'as': 'catppuccin', 'branch':'main'}
|
|
Plug 'catppuccin/nvim', {'as': 'catppuccin', 'branch':'main'}
|
|
- Plug 'neoclide/coc.nvim', {'branch': 'release'} " Testing
|
|
|
|
|
|
+ "Plug 'neoclide/coc.nvim', {'branch': 'release'} " Testing
|
|
Plug 'chriskempson/base16-vim'
|
|
Plug 'chriskempson/base16-vim'
|
|
|
|
|
|
call plug#end()
|
|
call plug#end()
|
|
@@ -49,7 +54,6 @@ lua require('init')
|
|
|
|
|
|
" Color Settings
|
|
" Color Settings
|
|
colorscheme wal " using the wal colorscheme
|
|
colorscheme wal " using the wal colorscheme
|
|
-"colorscheme catppuccin " using the wal colorscheme
|
|
|
|
set mouse=a " for moving splits with the mouse
|
|
set mouse=a " for moving splits with the mouse
|
|
|
|
|
|
" Encoding
|
|
" Encoding
|
|
@@ -148,29 +152,16 @@ let g:lightline = {
|
|
\ }
|
|
\ }
|
|
|
|
|
|
" FZF - Best Tool ever
|
|
" FZF - Best Tool ever
|
|
-nnoremap <C-t> :Tags<CR>
|
|
|
|
nnoremap <C-b> :Telescope buffers<CR>
|
|
nnoremap <C-b> :Telescope buffers<CR>
|
|
nnoremap <C-n> :Telescope find_files<CR>
|
|
nnoremap <C-n> :Telescope find_files<CR>
|
|
|
|
|
|
-" Nerdtree (tmp replacement with Vifm
|
|
|
|
-nnoremap <C-t> :NERDTreeToggle<CR>
|
|
|
|
-
|
|
|
|
" Map the Python Evaluation into the vim-expression command(Q)
|
|
" Map the Python Evaluation into the vim-expression command(Q)
|
|
nnoremap Q :EvalPython <CR>
|
|
nnoremap Q :EvalPython <CR>
|
|
let g:il_append=1
|
|
let g:il_append=1
|
|
let g:il_use_nextline=0
|
|
let g:il_use_nextline=0
|
|
|
|
|
|
|
|
|
|
-" UltiSnips (Ancient, but could come in handy at some day)
|
|
|
|
-"let g:UltiSnipsExpandTrigger = '<tab>'
|
|
|
|
-let g:UltiSnipsExpandTrigger = '<c-s>'
|
|
|
|
-let g:UltiSnipsJumpForwardTrigger = '<tab>'
|
|
|
|
-let g:UltiSnipsJumpBackwardTrigger = '<s-tab>'
|
|
|
|
-let g:UltiSnipsSnippetsDir='~/.vim/UltiSnips/'
|
|
|
|
-
|
|
|
|
-
|
|
|
|
" Goyo Configuration
|
|
" Goyo Configuration
|
|
-
|
|
|
|
let g:goyo_width=100
|
|
let g:goyo_width=100
|
|
let g:goyo_height=100
|
|
let g:goyo_height=100
|
|
|
|
|
|
@@ -276,33 +267,9 @@ endif
|
|
|
|
|
|
" -----[ Completion ]----- "
|
|
" -----[ Completion ]----- "
|
|
|
|
|
|
-" Use <Tab> and <S-Tab> to navigate through popup menu
|
|
|
|
-"inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
|
|
|
|
-"inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
|
|
|
|
-" imap <silent> <c-space> :<Plug>(completion_trigger)
|
|
|
|
-
|
|
|
|
-" Set completeopt to have a better completion experience
|
|
|
|
-set completeopt=menuone,noinsert,noselect
|
|
|
|
-
|
|
|
|
-" Avoid showing message extra message when using completion
|
|
|
|
-set shortmess+=c
|
|
|
|
-let g:completion_trigger_character = ['.', '::']
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-
|
|
|
|
-" -----[ COC ]----- "
|
|
|
|
-set signcolumn=number
|
|
|
|
-
|
|
|
|
-" use <tab> for trigger completion and navigate to the next complete item
|
|
|
|
-function! CheckBackspace() abort
|
|
|
|
- let col = col('.') - 1
|
|
|
|
- return !col || getline('.')[col - 1] =~# '\s'
|
|
|
|
-endfunction
|
|
|
|
|
|
+" --> Completion is handled in `init.lua`
|
|
|
|
|
|
-inoremap <silent><expr> <Tab>
|
|
|
|
- \ coc#pum#visible() ? coc#pum#next(1) :
|
|
|
|
- \ CheckBackspace() ? "\<Tab>" :
|
|
|
|
- \ coc#refresh()
|
|
|
|
|
|
+" LSP / Completion Stuff
|
|
|
|
+" keep the left column for hinte.g. structs in nim)
|
|
|
|
+set signcolumn=yes
|
|
|
|
|
|
-inoremap <expr> <Tab> coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"
|
|
|
|
-inoremap <expr> <S-Tab> coc#pum#visible() ? coc#pum#prev(1) : "\<S-Tab>"
|
|
|