From 1996ef15613f2d4773017128bba1a719a1b63a19 Mon Sep 17 00:00:00 2001 From: Robert Günzler Date: Sat, 20 Feb 2021 21:27:26 +0100 Subject: Move to lua based vimrc --- .vim/lua/conf/diagnostic.lua | 21 +++++++------ .vim/lua/conf/lsp.lua | 51 ------------------------------ .vim/lua/conf/telescope.lua | 75 -------------------------------------------- .vim/lua/conf/treesitter.lua | 24 -------------- 4 files changed, 12 insertions(+), 159 deletions(-) delete mode 100644 .vim/lua/conf/lsp.lua delete mode 100644 .vim/lua/conf/telescope.lua delete mode 100644 .vim/lua/conf/treesitter.lua (limited to '.vim/lua/conf') diff --git a/.vim/lua/conf/diagnostic.lua b/.vim/lua/conf/diagnostic.lua index 4fd5047..fe80fff 100644 --- a/.vim/lua/conf/diagnostic.lua +++ b/.vim/lua/conf/diagnostic.lua @@ -1,9 +1,12 @@ -vim.g.diagnostic_enable_virtual_text = 1 -vim.g.diagnostic_trimmed_virtual_text = '40' -vim.g.diagnostic_insert_delay = 1 -vim.api.nvim_command('nnoremap c[ PrevDiagnosticCycle') -vim.api.nvim_command('nnoremap c] NextDiagnosticCycle') +local g = vim.g +local cmd = vim.api.nvim_command + +g.diagnostic_enable_virtual_text = 1 +g.diagnostic_trimmed_virtual_text = '40' +g.diagnostic_insert_delay = 1 +cmd('nnoremap c[ PrevDiagnosticCycle') +cmd('nnoremap c] NextDiagnosticCycle') vim.fn.sign_define("LspDiagnosticsErrorSign", {text="✘", texthl="LspDiagnosticsError"}) @@ -11,7 +14,7 @@ vim.fn.sign_define("LspDiagnosticsWarningSign", {text="‼", texthl="LspDiagnost vim.fn.sign_define("LspDiagnosticsInformationSign", {text="i", texthl="LspDiagnosticsInformation"}) vim.fn.sign_define("LspDiagnosticsHintSign", {text="☛",texthl="LspDiagnosticsHint"}) -vim.api.nvim_command('highlight link LspDiagnosticsError Error') -vim.api.nvim_command('highlight link LspDiagnosticsWarning WarningMsg') -vim.api.nvim_command('highlight link LspDiagnosticsInformation Todo') -vim.api.nvim_command('highlight link LspDiagnosticsHint Question') +cmd('highlight link LspDiagnosticsError Error') +cmd('highlight link LspDiagnosticsWarning WarningMsg') +cmd('highlight link LspDiagnosticsInformation Todo') +cmd('highlight link LspDiagnosticsHint Question') diff --git a/.vim/lua/conf/lsp.lua b/.vim/lua/conf/lsp.lua deleted file mode 100644 index 4249de5..0000000 --- a/.vim/lua/conf/lsp.lua +++ /dev/null @@ -1,51 +0,0 @@ --- lsp config - -local lsp = require 'lspconfig' -local util = require 'lspconfig.util' - -local function my_attach(client) - -- attach completion - require 'completion'.on_attach(client) - - -- do lsp mappings - vim.fn.nvim_buf_set_keymap(0, 'n', 'K', 'lua vim.lsp.buf.hover()', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'n', '', 'lua vim.lsp.buf.definition()', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'n', 'grr', 'lua vim.lsp.buf.rename()', - {noremap=true, silent=true}) - vim.fn.nvim_buf_set_keymap(0, 'i', '', 'lua vim.lsp.buf.signature_help()', - {noremap=true, silent=true}) - - -- nnoremap gD lua vim.lsp.buf.declaration() - -- nnoremap gd lua vim.lsp.buf.definition() - -- nnoremap gT lua vim.lsp.buf.type_definition() - -- nnoremap gI lua vim.lsp.buf.implementation() - -- nnoremap gr lua vim.lsp.buf.references() - -- nnoremap g0 lua vim.lsp.buf.document_symbol() - -- nnoremap gW lua vim.lsp.buf.workspace_symbol() - -- nnoremap ;h lua vim.lsp.buf.hover() - -- nnoremap ;s lua vim.lsp.buf.signature_help() -end - --- lsp.ccls.setup{ --- on_attach = my_attach, --- } - -lsp.gopls.setup{ - on_attach = my_attach, - root_dir = util.root_pattern('go.mod', '.git'), - -- NOTE: this is done to avoid the gopls warning about being outside gopath - -- message_level = vim.lsp.protocol.MessageType.Error, -} - -lsp.sumneko_lua.setup{ - cmd = { 'lua-language-server' }; - on_attach = my_attach; -} - -lsp.rust_analyzer.setup{ - cmd = { 'env', 'CARGO_TARGET_DIR=/tmp', 'rust-analyzer' }, - on_attach = my_attach, - -} diff --git a/.vim/lua/conf/telescope.lua b/.vim/lua/conf/telescope.lua deleted file mode 100644 index e1145c2..0000000 --- a/.vim/lua/conf/telescope.lua +++ /dev/null @@ -1,75 +0,0 @@ --- config for telescope.nvim -local telescope = require('telescope') -local finders = require('telescope.finders') -local pickers = require('telescope.pickers') -local previewers = require('telescope.previewers') -local make_entry = require('telescope.make_entry') -local sorters = require('telescope.sorters') - -telescope.setup{ - defaults = { - borderchars = {'─', '│', '─', '│', '┌', '┐', '┘', '└'}, - winblend = 3, - layout_strategy = 'flex', - } -} - -vim.api.nvim_set_keymap('n', ';f', "lua require'telescope.builtin'.find_files{}", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';g', "lua require'telescope.builtin'.live_grep{}", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';r', "lua require'telescope.builtin'.lsp_references{}", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';q', "lua require'telescope.builtin'.quickfix{}", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';l', "lua require'telescope.builtin'.loclist{}", - {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';b', "lua require'telescope.builtin'.buffers{}", - {noremap=true, silent=true}) --- vim.api.nvim_set_keymap('n', ';h', "lua require'conf.telescope'.home{}", --- {noremap=true, silent=true}) -vim.api.nvim_set_keymap('n', ';w', "lua require'conf.telescope'.wiki{}", - {noremap=true, silent=true}) - -local M = {} -M.fzf = function(opts) - opts = opts or {} - if opts.cwd then - opts.cwd = vim.fn.expand(opts.cwd) - end - local cmd = {'fd', '--type', 'f', '--no-ignore', '--absolute-path'} - if opts.extensions then - for _, ext in ipairs(opts.extensions) do - table.insert(cmd, '--extension') - table.insert(cmd, ext) - end - end - if opts.exclude then - for _, excl in ipairs(opts.exclude) do - table.insert(cmd, '--exclude') - table.insert(cmd, excl) - end - end - pickers.new(opts, { - prompt = opts.prompt or "FZF", - finder = finders.new_oneshot_job(cmd, opts), - previewer = previewers.cat.new(opts), - sorter = sorters.get_fuzzy_file(), - }):find() -end - -M.wiki = function() - return M.fzf { - prompt = 'WIKI', - cwd = '~/wiki', - extensions = {'md'}, - exclude = {'_templates/*'} - } -end --- M.home = function() --- return M.fzf { --- prompt = 'HOME', --- cwd = '~', --- } --- end -return M diff --git a/.vim/lua/conf/treesitter.lua b/.vim/lua/conf/treesitter.lua deleted file mode 100644 index fed55e1..0000000 --- a/.vim/lua/conf/treesitter.lua +++ /dev/null @@ -1,24 +0,0 @@ - -require 'nvim-treesitter.configs'.setup { - ensure_installed = { "c", "c_sharp", "javascript", "lua", "bash" }, - highlight = { - enable = false, - }, - indent = { - enable = true, - }, - refactor = { - navigation = { - enable = true, - keymaps = { - goto_definition = "", - }, - }, - smart_rename = { - enable = true, - keymaps = { - smart_rename = "grr", - }, - }, - }, -} -- cgit 1.4.1