Compare commits

..

No commits in common. "ae88f67228cf446e778c3185919c7ac6a4842abd" and "27fd7cc0a1c2b6f747a208eb986d5f709dc80ba9" have entirely different histories.

6 changed files with 2 additions and 12 deletions

View File

@ -1,2 +0,0 @@
/assign_reviewer @patrick.michl

View File

@ -7,10 +7,7 @@ cmp.setup {
require('luasnip').lsp_expand(args.body) require('luasnip').lsp_expand(args.body)
end, end,
}, },
window = { mapping = {
documentation = true
},
mapping = cmp.mapping.preset.insert({
['<C-p>'] = cmp.mapping.select_prev_item(), ['<C-p>'] = cmp.mapping.select_prev_item(),
['<C-n>'] = cmp.mapping.select_next_item(), ['<C-n>'] = cmp.mapping.select_next_item(),
['<C-d>'] = cmp.mapping.scroll_docs(-4), ['<C-d>'] = cmp.mapping.scroll_docs(-4),
@ -39,7 +36,7 @@ cmp.setup {
fallback() fallback()
end end
end, end,
}), },
sources = { sources = {
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },

View File

@ -11,7 +11,6 @@ key('n', 'gh', '/<c-r>=expand("<cword>")<CR><CR>N', {})
key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', {expr = true, silent = true}) key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', {expr = true, silent = true})
key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', {expr = true, silent = true}) key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', {expr = true, silent = true})
key('n','<leader>g',':lua require"telescope.builtin".live_grep{}<CR>', {}) key('n','<leader>g',':lua require"telescope.builtin".live_grep{}<CR>', {})
key('v', '<leader>c', ':w !xclip -sel c<CR><CR>', {silent = true})
-- Highlight on yank -- Highlight on yank
vim.api.nvim_exec( vim.api.nvim_exec(

View File

@ -46,7 +46,6 @@ local on_attach = function(client, bufnr)
underline = true underline = true
} }
) )
require "lsp_signature".on_attach({doc_lines = 0})
end end
-- nvim-cmp supports additional completion capabilities -- nvim-cmp supports additional completion capabilities

View File

@ -44,12 +44,10 @@ return require('packer').startup({function()
use 'xolox/vim-misc' use 'xolox/vim-misc'
use 'airblade/vim-gitgutter' use 'airblade/vim-gitgutter'
use 'akinsho/toggleterm.nvim' use 'akinsho/toggleterm.nvim'
-- LSP Setup -- LSP Setup
use 'neovim/nvim-lspconfig' use 'neovim/nvim-lspconfig'
use 'williamboman/nvim-lsp-installer' use 'williamboman/nvim-lsp-installer'
use 'nvim-lua/lsp_extensions.nvim' use 'nvim-lua/lsp_extensions.nvim'
use 'ray-x/lsp_signature.nvim'
use 'nvim-lua/completion-nvim' use 'nvim-lua/completion-nvim'
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
use { use {

View File

@ -7,7 +7,6 @@ cmd('syntax on')
cmd('set number') cmd('set number')
cmd('set completeopt=menuone,noinsert,noselect') cmd('set completeopt=menuone,noinsert,noselect')
cmd('set shortmess+=c') cmd('set shortmess+=c')
cmd("autocmd CursorHold,CursorHoldI *.rs :lua require'lsp_extensions'.inlay_hints{ only_current_line = true }")
o.startofline = true o.startofline = true
wo.cursorline = true wo.cursorline = true