reworked config completely

master
Polaris 2021-11-05 01:42:59 +00:00
parent 9aa28f5426
commit c9d8d349e2
4 changed files with 67 additions and 46 deletions

View File

@ -22,7 +22,6 @@ call plug#begin('~/.vim/plugged')
Plug 'phanviet/vim-monokai-pro'
Plug 'neovim/nvim-lspconfig'
Plug 'neovim/nvim-lsp'
Plug 'nvim-lua/completion-nvim'
Plug 'preservim/nerdcommenter'
Plug 'preservim/nerdtree'
Plug 'OmniSharp/omnisharp-vim'
@ -31,12 +30,19 @@ Plug 'junegunn/fzf.vim'
Plug 'airblade/vim-rooter'
Plug 'nvim-treesitter/nvim-treesitter'
Plug 'nvim-lualine/lualine.nvim'
Plug 'mfussenegger/nvim-jdtls'
Plug 'hrsh7th/nvim-compe'
call plug#end()
colorscheme monokai_pro
highlight Normal guibg=none
highlight EndOfBuffer guibg=none
source ~/.config/nvim/vim/keybinds.vim
luafile ~/.config/nvim/lua/completion.lua
luafile ~/.config/nvim/lua/languages.lua
lua <<EOF
require'lualine'.setup {
@ -45,7 +51,6 @@ require'lualine'.setup {
}
}
require'nvim-treesitter.configs'.setup {
ensure_installed = "maintained",
highlight = {
@ -53,51 +58,8 @@ require'nvim-treesitter.configs'.setup {
}
}
local nvim_lsp = require'lspconfig'
local pid = vim.fn.getpid()
local omnisharp_bin = "/usr/bin/omnisharp"
local attach_callback = require'completion'.on_attach
nvim_lsp.rust_analyzer.setup({ on_attach=attach_callback })
nvim_lsp.clangd.setup({ on_attach=attach_callback })
nvim_lsp.omnisharp.setup{
cmd = { omnisharp_bin, "--languageserver" , "--hostPID", tostring(pid) };
on_attach=attach_callback
}
nvim_lsp.cmake.setup{ on_attach=attach_callback }
vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(
vim.lsp.diagnostic.on_publish_diagnostics, {
virtual_text = true,
signs = true,
update_in_insert = true,
}
)
require'lspconfig'.clangd.setup{}
EOF
" ====== KEYBINDS ======
let mapleader = " "
" lsp
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
nnoremap <silent> <leader>h <cmd>lua vim.lsp.buf.hover()<CR>
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
nnoremap <silent> <leader>r <cmd>lua vim.lsp.buf.references()<CR>
nnoremap <silent> <leader>d <cmd>lua vim.lsp.buf.declaration()<CR>
nnoremap <silent> <leader>a <cmd>lua vim.lsp.buf.code_action()<CR>
nnoremap <silent> <leader>[ <cmd>lua vim.lsp.diagnostic.goto_prev()<CR>
nnoremap <silent> <leader>] <cmd>lua vim.lsp.diagnostic.goto_next()<CR>
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
" nerd commenter
nnoremap <silent> <leader>cc <cmd>NERDCommenterComment<CR>
nnoremap <silent> <leader>cu <cmd>NERDCommenterUncomment<CR>
" nerd tree
nnoremap <silent> <leader>t <cmd>NERDTreeToggle<CR>
" fzf
nnoremap <silent> <leader>f <cmd>:Files<CR>
nnoremap <silent> <leader>gf <cmd>:GFiles<CR>
nnoremap <silent> <leader>gl <cmd>:GFiles?<CR>
nnoremap <silent> <leader>rg <cmd>:Rg<CR>

25
lua/completion.lua Normal file
View File

@ -0,0 +1,25 @@
vim.o.completeopt = "menuone,noselect"
require'compe'.setup {
enabled = true;
autocomplete = true;
debug = false;
min_length = 1;
preselect = 'enable';
throttle_time = 80;
source_timeout = 200;
incomplete_delay = 400;
max_abbr_width = 100;
max_kind_width = 100;
max_menu_width = 100;
documentation = false;
source = {
path = true;
buffer = true;
calc = true;
nvim_lsp = true;
nvim_lua = true;
treesitter = true;
};
}

8
lua/languages.lua Normal file
View File

@ -0,0 +1,8 @@
local lsp = require'lspconfig'
local omnisharp = "/usr/bin/omnisharp"
local jdtls = "/home/atomic/jdtls/launch"
lsp.clangd.setup{}
lsp.rust_analyzer.setup{}
lsp.omnisharp.setup{cmd={omnisharp, "--languageserver", "--hostPID", tostring(vim.fn.getpid())}}
lsp.jdtls.setup{cmd={jdtls}}

26
vim/keybinds.vim Normal file
View File

@ -0,0 +1,26 @@
let mapleader = " "
" lsp
nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
nnoremap <silent> <leader>h <cmd>lua vim.lsp.buf.hover()<CR>
nnoremap <silent> gD <cmd>lua vim.lsp.buf.implementation()<CR>
nnoremap <silent> <leader>r <cmd>lua vim.lsp.buf.references()<CR>
nnoremap <silent> <leader>d <cmd>lua vim.lsp.buf.declaration()<CR>
nnoremap <silent> <leader>a <cmd>lua vim.lsp.buf.code_action()<CR>
nnoremap <silent> <leader>[ <cmd>lua vim.lsp.diagnostic.goto_prev()<CR>
nnoremap <silent> <leader>] <cmd>lua vim.lsp.diagnostic.goto_next()<CR>
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
" nerd commenter
nnoremap <silent> <leader>cc <cmd>NERDCommenterComment<CR>
nnoremap <silent> <leader>cu <cmd>NERDCommenterUncomment<CR>
" nerd tree
nnoremap <silent> <leader>t <cmd>NERDTreeToggle<CR>
" fzf
nnoremap <silent> <leader>f <cmd>:Files<CR>
nnoremap <silent> <leader>gf <cmd>:GFiles<CR>
nnoremap <silent> <leader>gl <cmd>:GFiles?<CR>
nnoremap <silent> <leader>rg <cmd>:Rg<CR>