1
0
Fork 0

further tweaks, completion seems broken

This commit is contained in:
Vivianne 2022-07-03 15:01:05 -07:00
parent ecac56d052
commit 662cf5b04b
2 changed files with 57 additions and 49 deletions

View File

@ -1,6 +1,8 @@
let $CONFIG = stdpath('config')
let $SCR_PLUGINS = $CONFIG . '/lua/plugins.lua'
let $SCR_INIT = $CONFIG . '/init.vim'
let $PORTAGE = '/etc/portage'
let $PORTAGE_MAKE_CONFIG = $PORTAGE . '/make.conf'
if has('win32')
source $VIMRUNTIME/mswin.vim
@ -24,6 +26,8 @@ set listchars=tab:➫\ ,trail:░
hi EoLSpace ctermbg=238 guibg=#333333
match EoLSpace /\s\+$/
set completeopt=menu,menuone,noselect,preview
set fillchars+=vert:\
set wrap breakindent
set encoding=utf-8
@ -94,6 +98,7 @@ let g:scrollview_current_only = 1
nnoremap <leader>vv <cmd>e $SCR_INIT<CR>
nnoremap <leader>vp <cmd>e $SCR_PLUGINS<CR>
nnoremap <leader>ve <cmd>e $PORTAGE<CR>
" Telescope binds
nnoremap <leader>F <cmd>Telescope resume<cr>

View File

@ -202,15 +202,18 @@ return require('packer').startup(function(use)
-- vim.g.suda_smart_edit = 1
-- end)
require('lspconfig').gdscript.setup{
on_attach = on_attach,
}
require('lspconfig').clangd.setup{
on_attach = on_attach,
}
local servers = {'gdscript', 'clangd', 'zls' };
for _, lsp in ipairs(servers) do
require('lspconfig')[lsp].setup {
on_attach = on_attach,
}
end
end
}
use {
'ms-jpq/coq_nvim',
branch = 'coq',
}
use {
'nvim-treesitter/nvim-treesitter',
run = function()
@ -236,52 +239,52 @@ return require('packer').startup(function(use)
end
}
use 'lepture/vim-jinja'
use {
'neoclide/coc.nvim',
branch = 'release',
enabled = false,
config = function()
vim.g.coc_global_extensions = {
'coc-cmake',
'coc-css',
'coc-docker',
'coc-git',
'coc-html',
'coc-json',
'coc-rls',
'coc-sql',
'coc-toml',
'coc-tsserver',
'coc-yaml',
'coc-zig'
}
--use {
-- 'neoclide/coc.nvim',
-- branch = 'release',
-- enabled = false,
-- config = function()
-- vim.g.coc_global_extensions = {
-- 'coc-cmake',
-- 'coc-css',
-- 'coc-docker',
-- 'coc-git',
-- 'coc-html',
-- 'coc-json',
-- 'coc-rls',
-- 'coc-sql',
-- 'coc-toml',
-- 'coc-tsserver',
-- 'coc-yaml',
-- 'coc-zig'
-- }
vim.api.nvim_exec(
[[
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~# '\s'
endfunction
-- vim.api.nvim_exec(
-- [[
-- function! s:check_back_space() abort
-- let col = col('.') - 1
-- return !col || getline('.')[col - 1] =~# '\s'
-- endfunction
inoremap <silent><expr> <Tab>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<Tab>" :
\ coc#refresh()
-- inoremap <silent><expr> <Tab>
-- \ pumvisible() ? "\<C-n>" :
-- \ <SID>check_back_space() ? "\<Tab>" :
-- \ coc#refresh()
nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
elseif (coc#rpc#ready())
call CocActionAsync('doHover')
else
execute '!' . &keywordprg . " " . expand('<cword>')
endif
endfunction
]], true)
-- nnoremap <silent> K :call <SID>show_documentation()<CR>
-- function! s:show_documentation()
-- if (index(['vim','help'], &filetype) >= 0)
-- execute 'h '.expand('<cword>')
-- elseif (coc#rpc#ready())
-- call CocActionAsync('doHover')
-- else
-- execute '!' . &keywordprg . " " . expand('<cword>')
-- endif
-- endfunction
-- ]], true)
end
}
-- end
--}
use 'editorconfig/editorconfig-vim'
use {
'gentoo/gentoo-syntax',