diff options
Diffstat (limited to 'init.vim')
| -rw-r--r-- | init.vim | 40 |
1 files changed, 20 insertions, 20 deletions
@@ -16,13 +16,14 @@ if filereadable(printf('%s/.config/nvim/local-plug.vim', $HOME)) exec "source " . printf('%s/.config/nvim/local-plug.vim', $HOME) endif -Plug 'lukas-reineke/virt-column.nvim' -Plug 'dylnmc/synstack.vim' +Plug 'nvim-lua/lsp-status.nvim' +Plug 'bfrg/vim-jq' Plug 'folke/trouble.nvim' Plug 'git@git.josher.dev:bulletjava.vim.git' -Plug 'git@git.josher.dev:nvim-warp.git' Plug 'git@git.josher.dev:fieldmarshal.vim.git' Plug 'git@git.josher.dev:nvim-color-picker.git' +Plug 'git@git.josher.dev:nvim-warp.git' +Plug 'git@git.josher.dev:meltdown.git' Plug 'google/vim-codefmt' Plug 'google/vim-glaive' Plug 'google/vim-maktaba' @@ -34,8 +35,7 @@ Plug 'hrsh7th/cmp-vsnip' Plug 'hrsh7th/nvim-cmp' Plug 'hrsh7th/vim-vsnip' Plug 'kyazdani42/nvim-web-devicons' -Plug 'linrongbin16/lsp-progress.nvim' -Plug 'nanozuki/tabby.nvim' +Plug 'lukas-reineke/virt-column.nvim' Plug 'nanozuki/tabby.nvim' Plug 'neovim/nvim-lspconfig' Plug 'nvim-lua/plenary.nvim' @@ -69,9 +69,15 @@ set scrolloff=8 set number set relativenumber set pumheight=20 +set updatetime=1000 let mapleader=" " +function! Jump(...) + normal! '[ +endfunction +noremap <silent> g. <cmd>set operatorfunc=Noop<cr>g@ + " Make splitting more congruent with how Tmux does it. noremap <C-w>% <C-w>v noremap <C-w>" <C-w>s @@ -127,6 +133,9 @@ augroup InitVim autocmd TextYankPost * \ lua require'vim.highlight'.on_yank( \ { higroup = "IncSearch", timeout = 100 }); + autocmd CursorHold * lua vim.lsp.buf.document_highlight() + autocmd CursorHoldI * lua vim.lsp.buf.document_highlight() + autocmd CursorMoved * lua vim.lsp.buf.clear_references() augroup END " Local configuration that can be set by hostname or just a local configuration. @@ -170,15 +179,14 @@ nnoremap <M-h> <cmd>bprev<cr> noremap <C-g> <cmd>lua vim.diagnostic.open_float()<cr> +noremap <leader><C-f> <cmd>WarpFull<cr> + noremap <C-f> <cmd>WarpGrid<cr> onoremap <C-f> v<cmd>WarpGrid<cr> noremap <leader>w <cmd>WarpWords<cr> onoremap <leader>w v<cmd>WarpWords<cr> -noremap <M-w> <cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr> -onoremap <M-w> v<cmd>lua require('warp').run(require('warp.strategy.words').words_strategy)<cr> - nmap œ <leader>k nmap ï <leader>j omap œ <leader>k @@ -222,10 +230,6 @@ command! TERM exec "term sh -c " . shellescape(printf("cd %s && exec ", shellesc " W = w. I often click when typing :w command! W w -augroup lualine_augroup - autocmd! - autocmd User LspProgressStatusUpdated lua require("lualine").refresh() -augroup END let g:loaded_netrw = 1 let g:loaded_netrwPlugin = 1 @@ -237,6 +241,9 @@ augroup UseTerminal augroup END +let g:jq_highlight_objects = 1 +let g:jq_highlight_function_calls = 1 + lua << EOF function open_terminal_on_directory() @@ -270,14 +277,6 @@ lua << EOF -- CiderLSP vim.opt.completeopt = { "menu", "menuone", "noselect" } - require("lualine").setup({ - sections = { - lualine_a = { "mode" }, - lualine_b = { "filename" }, - lualine_c = { - } - } - }) require("lsp") require("lspconfig") require("tabby") @@ -288,6 +287,7 @@ lua << EOF hijack_directories = {auto_open = false} }) require("treesitter-textobjects-setup") + require("lualinesetup") require('telescope').setup({ defaults = { |