diff options
Diffstat (limited to 'dotvimrc')
| -rw-r--r-- | dotvimrc | 81 |
1 files changed, 47 insertions, 34 deletions
@@ -8,7 +8,7 @@ set maxmempattern=32000 " https://github.com/neovim/neovim/issues/6798 set guicursor= -set nocscopeverbose +set noautoread set ignorecase set smartcase set modeline @@ -16,7 +16,6 @@ set modelines=5 set wildmode=longest:full set wildmenu set hlsearch -set pastetoggle=<F10> set textwidth=120 set backspace=eol,indent,start set number @@ -59,6 +58,8 @@ Plug 'airblade/vim-gitgutter' Plug 'vim-scripts/git-time-lapse' Plug 'vim-scripts/ifdef-highlighting' Plug 'jparise/vim-graphql' +"Plug 'junegunn/fzf' +"Plug 'junegunn/fzf.vim' Plug 'ctrlpvim/ctrlp.vim' Plug 'rust-lang/rust.vim' Plug 'scrooloose/nerdtree' @@ -67,6 +68,11 @@ Plug 'vim-scripts/taglist.vim' Plug 'tpope/vim-fugitive' Plug 'https://gitlab.com/Nate_B/vim-adif' Plug 'hashivim/vim-terraform' +"Plug 'airblade/vim-tailwind' +Plug 'https://gitlab.com/spade-lang/spade-vim' +Plug 'https://git.sr.ht/~sotirisp/vim-tsv' + +Plug 'prettier/vim-prettier' if has("nvim") Plug 'neovim/nvim-lspconfig' @@ -103,39 +109,49 @@ if has("nvim") -- Mappings. local opts = { noremap=true, silent=true } - -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts) - buf_set_keymap('n', '<Leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts) - buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts) - buf_set_keymap('n', 'gK', '<cmd>lua vim.lsp.buf.hover()<CR>', opts) - buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts) - buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts) - --buf_set_keymap('n', '<Leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) - --buf_set_keymap('n', '<Leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) - --buf_set_keymap('n', '<Leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) - buf_set_keymap('n', '<F2>', '<cmd>lua vim.lsp.buf.rename()<CR>', opts) - buf_set_keymap('n', '<Leader>c', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts) - buf_set_keymap('n', '<Leader>r', '<cmd>lua vim.lsp.buf.references()<CR>', opts) - buf_set_keymap('n', '<Leader>e', '<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>', opts) - buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts) - buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) - buf_set_keymap('n', '<Leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) - buf_set_keymap('n', '<Leader>F', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts) - end + -- See `:help vim.lsp.*` for documentation on any of the below functions + --buf_set_keymap('n', '<Leader>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts) + --buf_set_keymap('n', '<Leader>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts) + --buf_set_keymap('n', '<Leader>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts) + -- Use a loop to conveniently call 'setup' on multiple servers and -- map buffer local keybindings when the language server attaches - local servers = { 'clangd', 'rust_analyzer', 'pylsp', 'tsserver' } + local servers = { 'clangd', 'rust_analyzer', 'pyright', 'ts_ls', 'verible', 'csharp_ls', 'bashls' } for _, lsp in ipairs(servers) do - nvim_lsp[lsp].setup { - on_attach = on_attach, - flags = { - debounce_text_changes = 150, - } - } + vim.lsp.config(lsp, { + settings = { + [lsp] = {} + } + }) + vim.lsp.enable(lsp) + --nvim_lsp[lsp].setup { + -- on_attach = on_attach, + -- flags = { + -- debounce_text_changes = 150, + -- } + --} end EOF + +noremap gD :lua vim.lsp.buf.declaration()<CR> +noremap <Leader>D :lua vim.lsp.buf.type_definition()<CR> +noremap gd :lua vim.lsp.buf.definition()<CR> +noremap gK :lua vim.lsp.buf.hover()<CR> +noremap gi :lua vim.lsp.buf.implementation()<CR> +noremap <C-k> :lua vim.lsp.buf.signature_help()<CR> +noremap <F2> :lua vim.lsp.buf.rename()<CR> +noremap <Leader>c :lua vim.lsp.buf.code_action()<CR> +noremap <Leader>r :lua vim.lsp.buf.references()<CR> +noremap <Leader>d :lua vim.diagnostic.open_float()<CR> +"noremap [d :lua vim.lsp.diagnostic.goto_prev()<CR> +"noremap ]d :lua vim.lsp.diagnostic.goto_next()<CR> +noremap <Leader>q :lua vim.lsp.diagnostic.set_loclist()<CR> +noremap <Leader>F :lua vim.lsp.buf.formatting()<CR> + +else + set pastetoggle=<F10> endif @@ -146,26 +162,23 @@ elseif executable('ag') let g:ackprg = 'ag -u --vimgrep' endif -noremap <Leader>a :LAck! -t rust -t cpp -t c -t py <cword><CR> +noremap <Leader>a :LAck! -t rust -t cpp -t c -t py -t ts -t cs -t js <cword><CR> noremap <Leader>A :LAck! <cword><CR> +noremap <Leader>p :%!prettier %<CR> "Show + - ~ in the margin for vim modification let g:gitgutter_eager = 0 " only update on read/write " Also search tags let g:ctrlp_extensions = ['tag'] -noremap <Leader>p :CtrlP<CR> noremap <Leader>b :CtrlPBuffer<CR> "let g:ctrlp_working_path_mode = 'a' -" Ignore some folders and files for CtrlP indexing -let g:ctrlp_custom_ignore = { 'dir': '\.git$\|\CODENAME_Data' } - "rust-lang/rust.vim let g:rust_recommended_style = 0 au FileType rust nmap <Leader>m :make build<CR> -au FileType rust nmap <Leader>c :Cargo check<CR> +au FileType rust nmap <Leader>C :Cargo check<CR> noremap <Leader>t :TagbarToggle<CR> |