diff --git a/bashrc b/bashrc index 9c3b4ce..e4da984 100644 --- a/bashrc +++ b/bashrc @@ -37,3 +37,6 @@ for fn in /usr/share/fzf/shell/key-bindings.bash /usr/share/fzf/key-bindings.bas break fi done + +# add Pulumi to the PATH +export PATH=$PATH:/home/gebner/.pulumi/bin diff --git a/vimrc b/vimrc index 32cb46d..b1cce61 100644 --- a/vimrc +++ b/vimrc @@ -112,7 +112,12 @@ Plug 'nvim-lua/plenary.nvim' " Plug 'nvim-treesitter/nvim-treesitter-textobjects' " Plug 'nvim-treesitter/playground' -Plug 'hrsh7th/nvim-compe' +Plug 'hrsh7th/cmp-nvim-lsp' +Plug 'hrsh7th/cmp-buffer' +Plug 'hrsh7th/cmp-path' +Plug 'hrsh7th/cmp-cmdline' +Plug 'hrsh7th/nvim-cmp' + if isdirectory(expand('~/lean.nvim')) Plug '~/lean.nvim' else @@ -177,7 +182,7 @@ let g:jellybeans_overrides = { " colors jellybeans " endif " colors monokai-nightasty -colors default +colors vim au syntax java setl ts=4 sts=4 sw=4 @@ -265,27 +270,37 @@ lua <'] = cmp.mapping.scroll_docs(-4), + [''] = cmp.mapping.scroll_docs(4), + [''] = cmp.mapping.complete(), + [''] = cmp.mapping.abort(), + [''] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items. + }); + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + -- { name = 'vsnip' }, -- For vsnip users. + -- { name = 'luasnip' }, -- For luasnip users. + -- { name = 'ultisnips' }, -- For ultisnips users. + -- { name = 'snippy' }, -- For snippy users. + }, { + { name = 'buffer' }, + }); } vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( @@ -365,12 +380,6 @@ hi Pmenu ctermfg=White ctermbg=Black guifg=#ffffff guibg=#000000 au syntax leaninfo setl scl=no -inoremap compe#complete() -inoremap compe#confirm('') -inoremap compe#close('') -inoremap compe#scroll({ 'delta': +4 }) -inoremap compe#scroll({ 'delta': -4 }) - nnoremap gD lua vim.lsp.buf.declaration() nnoremap gd lua vim.lsp.buf.definition() nnoremap K lua vim.lsp.buf.hover()