diff --git a/home/default.nix b/home/default.nix index 492eb5f..ef21617 100644 --- a/home/default.nix +++ b/home/default.nix @@ -365,15 +365,12 @@ in nvim-web-devicons packer-nvim plenary-nvim - rust-vim supertab syntastic - tabular telescope-nvim trouble-nvim typescript-vim vim-commentary - vim-go vim-javascript vim-markdown vim-nix diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index ea53042..5f9c318 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -97,6 +97,28 @@ vim.cmd([[match ExtraWhitespace /\s\+$/]]) ------------------------------------------------------------------------------- -- LSP {{{1 ------------------------------------------------------------------- ------------------------------------------------------------------------------- +-- See `:help vim.lsp.*` for documentation on any of the below functions + +local opts = { noremap=true, silent=true } +vim.api.nvim_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) +vim.api.nvim_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) +vim.api.nvim_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) +vim.api.nvim_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) +vim.api.nvim_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) +vim.api.nvim_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) +vim.api.nvim_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) +vim.api.nvim_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) +vim.api.nvim_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) +vim.api.nvim_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) +vim.api.nvim_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) +vim.api.nvim_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) +vim.api.nvim_set_keymap('n', 'e', 'lua vim.diagnostic.open_float()', opts) +vim.api.nvim_set_keymap('n', '[d', 'lua vim.diagnostic.goto_prev()', opts) +vim.api.nvim_set_keymap('n', ']d', 'lua vim.diagnostic.goto_next()', opts) +vim.api.nvim_set_keymap('n', 'q', 'lua vim.diagnostic.setloclist()', opts) +vim.api.nvim_set_keymap('n', 'f', 'lua vim.lsp.buf.formatting()', opts) +vim.api.nvim_set_keymap("n", "", "za", { silent = true, noremap = true }) + require("lspconfig").bashls.setup({}) require("lspconfig").gopls.setup({}) require("lspconfig").pyright.setup({}) @@ -107,6 +129,7 @@ require("lspconfig").terraformls.setup({}) require("lspconfig").tflint.setup({}) require("lspconfig").yamlls.setup({}) + ------------------------------------------------------------------------------- -- packer {{{1 ------------------------------------------------------------------- ------------------------------------------------------------------------------- @@ -241,39 +264,11 @@ vim.api.nvim_set_keymap("n", "hs", ":Hound", { silent = true, noremap = -- neoclip require('telescope').load_extension('neoclip') --- vim-go -vim.g.go_auto_sameids = 0 -vim.g.go_fmt_command = "goimports" -vim.g.go_fmt_experimental = 1 -vim.g.go_highlight_array_whitespace_error = 1 -vim.g.go_highlight_build_constraints = 1 -vim.g.go_highlight_chan_whitespace_error = 1 -vim.g.go_highlight_extra_types = 1 -vim.g.go_highlight_fields = 1 -vim.g.go_highlight_format_strings = 1 -vim.g.go_highlight_function_calls = 1 -vim.g.go_highlight_function_parameters = 1 -vim.g.go_highlight_functions = 1 -vim.g.go_highlight_generate_tags = 1 -vim.g.go_highlight_operators = 1 -vim.g.go_highlight_space_tab_error = 1 -vim.g.go_highlight_string_spellcheck = 1 -vim.g.go_highlight_trailing_whitespace_error = 0 -vim.g.go_highlight_types = 1 -vim.g.go_highlight_variable_assignments = 1 -vim.g.go_highlight_variable_declarations = 1 -vim.g.go_rename_command = "gopls" -vim.g.go_metalinter_autosave = 1 -vim.g.go_metalinter_autosave_enabled = { "golint", "govet" } - -- vim-terraform vim.g.terraform_align = 1 vim.g.terraform_fmt_on_save = 1 vim.g.terraform_fold_sections = 1 --- rust.vim -vim.g.rustfmt_autosave = 1 - -- vim-markdown vim.g.vim_markdown_override_foldtext = 0 vim.g.vim_markdown_no_default_key_mappings = 1