From 3079e935c793a9aa1831fd165e28636eb7a87dae Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Thu, 29 Jul 2021 23:39:08 +0200 Subject: vim: cleanup config --- .vim/lua/plugins/_colorizer.lua | 8 -- .vim/lua/plugins/_completion.lua | 53 ----------- .vim/lua/plugins/_git-messenger.lua | 4 - .vim/lua/plugins/_goyo.lua | 12 --- .vim/lua/plugins/_indent-guides.lua | 4 - .vim/lua/plugins/_lightbulb.lua | 19 ---- .vim/lua/plugins/_limelight.lua | 7 -- .vim/lua/plugins/_lsp.lua | 176 ------------------------------------ .vim/lua/plugins/_markdown.lua | 12 --- .vim/lua/plugins/_neuron.lua | 15 --- .vim/lua/plugins/_signify.lua | 10 -- .vim/lua/plugins/_telescope.lua | 114 ----------------------- .vim/lua/plugins/_treesitter.lua | 24 ----- .vim/lua/plugins/_ultisnips.lua | 4 - .vim/lua/plugins/_vimtex.lua | 8 -- 15 files changed, 470 deletions(-) delete mode 100644 .vim/lua/plugins/_colorizer.lua delete mode 100644 .vim/lua/plugins/_completion.lua delete mode 100644 .vim/lua/plugins/_git-messenger.lua delete mode 100644 .vim/lua/plugins/_goyo.lua delete mode 100644 .vim/lua/plugins/_indent-guides.lua delete mode 100644 .vim/lua/plugins/_lightbulb.lua delete mode 100644 .vim/lua/plugins/_limelight.lua delete mode 100644 .vim/lua/plugins/_lsp.lua delete mode 100644 .vim/lua/plugins/_markdown.lua delete mode 100644 .vim/lua/plugins/_neuron.lua delete mode 100644 .vim/lua/plugins/_signify.lua delete mode 100644 .vim/lua/plugins/_telescope.lua delete mode 100644 .vim/lua/plugins/_treesitter.lua delete mode 100644 .vim/lua/plugins/_ultisnips.lua delete mode 100644 .vim/lua/plugins/_vimtex.lua (limited to '.vim/lua/plugins') diff --git a/.vim/lua/plugins/_colorizer.lua b/.vim/lua/plugins/_colorizer.lua deleted file mode 100644 index 7b6f678..0000000 --- a/.vim/lua/plugins/_colorizer.lua +++ /dev/null @@ -1,8 +0,0 @@ -require('colorizer').setup(nil, { - name = true; - RRGGBB = true; - RRGGBBAA = false; - rgb_fn = true; - hsl_fn = true; - mode = 'background'; -}) diff --git a/.vim/lua/plugins/_completion.lua b/.vim/lua/plugins/_completion.lua deleted file mode 100644 index 5497c4b..0000000 --- a/.vim/lua/plugins/_completion.lua +++ /dev/null @@ -1,53 +0,0 @@ -local g = vim.g -local u = require('utils') -local inoremap = require('astronauta.keymap').inoremap - -g.completion_enable_auto_popup = true -g.completion_enable_auto_signature = true -g.completion_enable_auto_paren = false -g.completion_enable_auto_hover = true -g.completion_trigger_on_delete = true -g.completion_confirm_key = '' -g.completion_enable_snippet = 'UltiSnips' --- g.completion_matching_ignore_case = false -g.completion_matching_smart_case = true -g.completion_matching_strategy_list = {'exact', 'substring', 'fuzzy', 'all'} -g.completion_sorting = 'length' -- or: alphabet, none - -g.completion_auto_change_source = true -g.completion_chain_complete_list = { - {complete_items = {'lsp', 'snippet', 'path', 'buffers', 'ts'}}, - -- {mode = ''}, - -- {mode = ''}, - {mode = 'file'}, - {mode = 'spel'}, -} - -u.augroup2 { - completion_user = {{'BufEnter', '*', 'lua require("completion").on_attach()'}} -} - -inoremap { '', require('completion').smart_tab} -inoremap { '', require('completion').smart_s_tab } -inoremap { '', require('completion.source').nextCompletion } -inoremap { '', require('completion.source').prevCompletion } - --- inoremap { '', function() --- if vim.fn.pumvisible() == 1 then --- vim.api.nvim_feedkeys('') --- else --- require('completion').triggerCompletion() --- end --- end } - --- inoremap { '', function() --- if vim.fn.pumvisible() == 1 then --- vim.api.nvim_feedkeys('') --- else --- require('completion').triggerCompletion() --- end --- end } - --- require('utils').map('i', '', 'pumvisible() ? "\\" : completion#trigger_completion()', { expr = true }) --- require('utils').map('i', '', 'pumvisible() ? "\\" : completion#trigger_completion()', { expr = true }) - diff --git a/.vim/lua/plugins/_git-messenger.lua b/.vim/lua/plugins/_git-messenger.lua deleted file mode 100644 index dceadeb..0000000 --- a/.vim/lua/plugins/_git-messenger.lua +++ /dev/null @@ -1,4 +0,0 @@ --- vim.g.git_messenger_include_diff = false -vim.g.git_messenger_always_into_popup = true -vim.g.git_messenger_close_on_cursor_moved = true -vim.g.git_messenger_no_default_mappings = true diff --git a/.vim/lua/plugins/_goyo.lua b/.vim/lua/plugins/_goyo.lua deleted file mode 100644 index 538712d..0000000 --- a/.vim/lua/plugins/_goyo.lua +++ /dev/null @@ -1,12 +0,0 @@ -vim.g.goyo_width = 120 -vim.g.goyo_height = 90 -vim.g.goyo_linenr = false - -require('utils').augroup2 { - goyo_hooks = { - {'User', 'GoyoEnter', 'set laststatus=0 scrolloff=999'}, - {'User', 'GoyoEnter', 'Limelight'}, - {'User', 'GoyoLeave', 'set laststatus=2 scrolloff=5'}, - {'User', 'GoyoLeave', 'Limelight!'}, - } -} diff --git a/.vim/lua/plugins/_indent-guides.lua b/.vim/lua/plugins/_indent-guides.lua deleted file mode 100644 index eb3c4aa..0000000 --- a/.vim/lua/plugins/_indent-guides.lua +++ /dev/null @@ -1,4 +0,0 @@ -vim.g.indent_guides_enable_on_vim_startup = false -vim.g.indent_guides_start_level = 2 -vim.g.indent_guides_color_change_percent = 2 -vim.g.indent_guides_guide_size = 1 diff --git a/.vim/lua/plugins/_lightbulb.lua b/.vim/lua/plugins/_lightbulb.lua deleted file mode 100644 index cc3f941..0000000 --- a/.vim/lua/plugins/_lightbulb.lua +++ /dev/null @@ -1,19 +0,0 @@ - -require('nvim-lightbulb').update_lightbulb { - sign = { - enabled = true, - priority = 10, - }, - float = { - enabled = true, - text = '󱉵', - win_opts = {}, - }, - virtual_test = { - enabled = false - } -} - -require('utils').augroup('lightbulb', { - {'CursorHold,CursorHoldI', '*', "lua require'nvim-lightbulb'.update_lightbulb()"} -}) diff --git a/.vim/lua/plugins/_limelight.lua b/.vim/lua/plugins/_limelight.lua deleted file mode 100644 index b77fdfc..0000000 --- a/.vim/lua/plugins/_limelight.lua +++ /dev/null @@ -1,7 +0,0 @@ -vim.g.limelight_conceal_ctermfg = 'gray' -vim.g.limelight_conceal_ctermbg = 'none' -vim.g.limelight_conceal_guifg = '#828282' -vim.g.limelight_conceal_guibg = 'none' -vim.g.limelight_default_coefficient = 0.5 -vim.g.limelight_paragraph_span = 1 -vim.g.limelight_priority = -1 diff --git a/.vim/lua/plugins/_lsp.lua b/.vim/lua/plugins/_lsp.lua deleted file mode 100644 index 39a10b9..0000000 --- a/.vim/lua/plugins/_lsp.lua +++ /dev/null @@ -1,176 +0,0 @@ --- lsp config - -local lsp = require('lspconfig') -local util = require('lspconfig.util') -local u = require('utils') -local nnoremap = require('astronauta.keymap').nnoremap - -local M = {} -local my_attach = function(client) - -- attach completion - require 'completion'.on_attach(client) - - -- lsp mappings - nnoremap { 'K' , vim.lsp.buf.hover } - nnoremap { '' , vim.lsp.buf.definition } - nnoremap { 'gd' , vim.lsp.buf.definition } - nnoremap { 'grr' , vim.lsp.buf.rename } - nnoremap { '' , vim.lsp.buf.signature_help } - nnoremap { ']d' , vim.lsp.diagnostic.goto_next } - nnoremap { '[d' , vim.lsp.diagnostic.goto_prev } - - nnoremap { 'f' , vim.lsp.buf.formatting } - -- nnoremap { 'g0', vim.lsp.buf.document_symbol } - nnoremap { 'gR' , vim.lsp.buf.references } - nnoremap { 'gW' , vim.lsp.buf.workspace_symbol } - nnoremap { 'gD' , vim.lsp.buf.declaration } - nnoremap { 'gT' , vim.lsp.buf.type_definition } - nnoremap { 'gI' , vim.lsp.buf.implementation } - - -- nnoremap ;s lua vim.lsp.buf.signature_help() - nnoremap { 'd' , vim.lsp.diagnostic.show_line_diagnostics } - - u.augroup2 { - lsp_user = { - {'BufWritePre' , '*' , 'lua vim.lsp.buf.formatting_sync(nil, 1000)'}, - {'BufWritePre' , '*.go' , 'lua vim.lsp.buf.code_action({ source = { organizeImports = true } })'}, - -- {'CursorHold' , '*' , 'lua vim.lsp.diagnostic.show_line_diagnostics()'}, - } - } -end - --- handler overwrites --- configure builtin diagnositcs -vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with( -- {{{ - vim.lsp.diagnostic.on_publish_diagnostics, { - virtual_text = false, - signs = true, - underline = true, - update_in_insert = false, - } -) --- }}} - --- overwrite codeAction handler to not ask for confirmation if only a single --- action is given -vim.lsp.handlers["textDocument/codeAction"] = function(_, _, actions) -- {{{ - if actions == nil or vim.tbl_isempty(actions) then - -- skip printing 'no code actions available' - return - end - - local action_cosen - if #actions == 1 then - action_chosen = actions[1] - else - local option_strings = {"Code Actions:"} - for i, action in ipairs(actions) do - local title = action.title:gsub('\r\n', '\\r\\n') - title = title:gsub('\n', '\\n') - table.insert(option_strings, string.format("%d. %s", i, title)) - end - - local choice = vim.fn.inputlist(option_strings) - if choice < 1 or choice > #actions then - return - end - action_chosen = actions[choice] - end - - if action_chosen.edit or type(action_chosen.command) == "table" then - if action_chosen.edit then - vim.lsp.util.apply_workspace_edit(action_chosen.edit) - end - if type(action_chosen.command) == "table" then - vim.lsp.buf.execute_command(action_chosen.command) - end - else - vim.lsp.buf.execute_command(action_chosen) - end -end --- }}} - --- configure signs {{{ -vim.fn.sign_define("LspDiagnosticsSignError", {text="⚡", numhl="Error"}) -vim.fn.sign_define("LspDiagnosticsSignWarning", {text="⯈", numhl="Warning"}) -vim.fn.sign_define("LspDiagnosticsSignInformation", {text="≈"}) -vim.fn.sign_define("LspDiagnosticsSignHint", {text="🞶"}) --- }}} - --- lsp.ccls.setup{ --- on_attach = my_attach, --- } - -lsp.gopls.setup{ - on_attach = my_attach, - -- root_dir = util.root_pattern('go.mod', '.git'), - settings = { - gopls = { - -- analyses = { - -- composites = false - -- }, - codelenses = { - test = true, - tidy = true, - }, - gofumpt = true, - } - } -} - -lsp.sumneko_lua.setup{ - on_attach = my_attach; - cmd = { 'lua-language-server' }; - settings = { - Lua = { - runtime = { - version = 'LuaJIT', - }, - diagnostics = { - globals = {'vim'}, - }, - workspace = { - library = { - [vim.fn.expand('$VIMRUNTIME/lua')] = true, - [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, - } - } - } - } -} - -lsp.rust_analyzer.setup{ - on_attach = my_attach, - cmd = { 'env', 'CARGO_TARGET_DIR=/tmp', 'rust-analyzer' }, -} - -lsp.efm.setup{ - on_attach = my_attach, - root_dir = util.root_pattern('.git', '.editorconfig'), - init_options = { documentFormatting = true }, - -- filetypes = { "sh", "c" }, - settings = { - -- rootMarkers = {".git/"}, - languages = { - sh = { - { - lintCommand = 'shellcheck -f gcc -x', - lintSource = 'shellcheck', - lintFormats = { - '%f:%l:%c: %trror: %m', - '%f:%l:%c: %tarning: %m', - '%f:%l:%c: %tote: %m', - }, - formatCommand = 'shfmt -ci -s -bn', - formatStdin = true, - } - } - } - } -} - -lsp.zls.setup{ - on_attach = my_attach -} - -return M diff --git a/.vim/lua/plugins/_markdown.lua b/.vim/lua/plugins/_markdown.lua deleted file mode 100644 index e02e160..0000000 --- a/.vim/lua/plugins/_markdown.lua +++ /dev/null @@ -1,12 +0,0 @@ -vim.g.vim_markdown_folding_disabled = true -vim.g.vim_markdown_math = true -vim.g.vim_markdown_frontmatter = true -vim.g.vim_markdown_json_frontmatter = true -vim.g.vim_markdown_toml_frontmatter = true -vim.g.vim_markdown_yaml_frontmatter = true --- vim.g.vim_markdown_folding_level = 2 -vim.g.vim_markdown_strikethrough = true -vim.g.vim_markdown_auto_insert_bullets = true -vim.g.vim_markdown_new_list_item_indent = false -vim.g.vim_markdown_conceal = true -vim.g.vim_markdown_conceal_code_blocks = true diff --git a/.vim/lua/plugins/_neuron.lua b/.vim/lua/plugins/_neuron.lua deleted file mode 100644 index d99a13f..0000000 --- a/.vim/lua/plugins/_neuron.lua +++ /dev/null @@ -1,15 +0,0 @@ - -local def = require('utils').def - -require('neuron').setup { - virtual_titles = true, - mappings = true, - run = nil, - neuron_dir = "~/.zk", - leader = "gz", -} - -def("NeuronServe", [[ lua require('neuron').rib {address = "127.0.0.1:8200", verbose = true} ]]) -def("NeuronZettels", [[ lua require('neuron/telescope').find_zettels {insert = false} ]]) -def("NeuronZettelsInsert", [[ lua require('neuron/telescope').find_zettels {insert = true} ]]) -def("NeuronTags", [[ lua require('neuron/telescope').find_tags() ]]) diff --git a/.vim/lua/plugins/_signify.lua b/.vim/lua/plugins/_signify.lua deleted file mode 100644 index 41ced80..0000000 --- a/.vim/lua/plugins/_signify.lua +++ /dev/null @@ -1,10 +0,0 @@ -local def = require('utils').def -local nnoremap = require('astronauta.keymap').nnoremap - -vim.g.signify_sign_change = '~' - -nnoremap { ']h', function() vim.fn['sy#jump#next_hunk'](1) end } -nnoremap { '[h', function() vim.fn['sy#jump#prev_hunk'](1) end } - -def("SignifyNextHunk", [[ call sy#jump#next_hunk(1) ]]) -def("SignifyPrevHunk", [[ call sy#jump#prev_hunk(1) ]]) diff --git a/.vim/lua/plugins/_telescope.lua b/.vim/lua/plugins/_telescope.lua deleted file mode 100644 index 44931fa..0000000 --- a/.vim/lua/plugins/_telescope.lua +++ /dev/null @@ -1,114 +0,0 @@ --- telescope.nvim et al config - -local nnoremap = require('astronauta.keymap').nnoremap - -local M = {} - --- TELESCOPE config -- {{{ -require('telescope').setup{ - defaults = { - initial_mode = 'normal', - prompt_prefix = '> ', - selection_caret = '* ', - - -- copied from dropdown theme - sorting_strategy = 'ascending', - layout_strategy = 'center', - results_title = false, - preview_title = 'P', - preview_cutoff = 1, - width = 0.88, - results_height = 15, - borderchars = { - { '─', '│', '─', '│', '┌', '┐', '┘', '└'}, - prompt = {'─', '│', ' ', '│', '┌', '┐', '│', '│'}, - results = {'─', '│', '─', '│', '├', '┤', '┘', '└'}, - preview = { '─', '│', '─', '│', '┌', '┐', '┘', '└'}, - }, - - file_previewer = require('telescope.previewers').vim_buffer_cat.new, - grep_previewer = require('telescope.previewers').vim_buffer_vimgrep.new, - qflist_previewer = require('telescope.previewers').vim_buffer_qflist.new, - - extensions = { - fzf_writer = { - use_highlighter = true, - minimum_grep_characters = 4, - shorten_path = true, - } - } - } -} --- }}} - --- MAPPINGS -- {{{ - -nnoremap { ';g', function() - require('telescope').extensions.fzf_writer.staged_grep() -end } - -nnoremap { ';w', function() - require('telescope.builtin').find_files({ - prompt_title = 'workspace', - previewer = false, - cwd = vim.lsp.buf.list_workspace_folders()[1] or require('lspconfig.util').root_pattern('.git')(vim.fn.expand('%:p')), - }) -end } - -nnoremap { ';q', function() - local ids = vim.fn.getqflist({winid = 1}) - if ids and not (ids.winid == 0) then - vim.api.nvim_win_close(ids.winid, true) - end - require('telescope.builtin').quickfix() -end } - -nnoremap { ';l', function() - local ids = vim.fn.getloclist(0, {winid = 1}) - if ids and not (ids.winid == 0) then - vim.api.nvim_win_close(ids.winid, true) - end - require('telescope.builtin').loclist() -end } - -nnoremap { ';f', function() - require('telescope.builtin').fd() -end } - -nnoremap { ';b', function() - require('telescope.builtin').buffers() -end } - -nnoremap { ';t', function() - require('telescope.builtin').tags() -end } - -nnoremap { ';h', function() - require('telescope.builtin').command_history() -end } - -nnoremap { ';c', function() - require('telescope.builtin').commands() -end } - --- LSP stuff - -nnoremap { 'gA', function() - require('telescope.builtin').lsp_code_actions() -end } - -nnoremap { 'gA', function() - require('telescope.builtin').lsp_code_actions() -end } - -nnoremap { 'g0', function() - require('telescope.builtin').lsp_document_symbols() -end } - -nnoremap { 'gr', function() - require('telescope.builtin').lsp_references() -end } - --- }}} - -return M diff --git a/.vim/lua/plugins/_treesitter.lua b/.vim/lua/plugins/_treesitter.lua deleted file mode 100644 index c5225bc..0000000 --- a/.vim/lua/plugins/_treesitter.lua +++ /dev/null @@ -1,24 +0,0 @@ - -require('nvim-treesitter.configs').setup { - ensure_installed = { "c", "c_sharp", "lua", "bash" }, - highlight = { - enable = false, - }, - indent = { - enable = true, - }, - refactor = { - navigation = { - enable = true, - keymaps = { - goto_definition = "", - }, - }, - smart_rename = { - enable = true, - keymaps = { - smart_rename = "grr", - }, - }, - }, -} diff --git a/.vim/lua/plugins/_ultisnips.lua b/.vim/lua/plugins/_ultisnips.lua deleted file mode 100644 index cd077d2..0000000 --- a/.vim/lua/plugins/_ultisnips.lua +++ /dev/null @@ -1,4 +0,0 @@ --- vim.g.UltiSnipsListSnippets = "" -vim.g.UltiSnipsExpandTrigger = vim.g.completion_confirm_key -vim.g.UltiSnipsJumpForwardTrigger = "" -vim.g.UltiSnipsJumpBackwardTrigger = "" diff --git a/.vim/lua/plugins/_vimtex.lua b/.vim/lua/plugins/_vimtex.lua deleted file mode 100644 index 2a3d550..0000000 --- a/.vim/lua/plugins/_vimtex.lua +++ /dev/null @@ -1,8 +0,0 @@ -vim.g.tex_flavor = 'latex' -vim.g.vimtex_compiler_enabled = 1 -vim.g.vimtex_compiler_method = 'tectonic' -vim.g.vimtex_compiler_tectonic = "{'executable': 'tectonic'}" -vim.g.vimtex_view_method = 'zathura' --- vim.g.vimtex_view_zathura_check_libsynctex = false --- vim.g.vimtex_view_use_temp_files = true --- vim.g.vimtex_view_forward_search_on_start = false -- cgit 1.4.1