From 2ce7934c1975dc1289c6b8fc7bd0b930563d1902 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 24 Apr 2022 21:20:37 +0800 Subject: [PATCH] Update Neovim up to par with Neovim 0.7 --- nvim/init.lua | 7 +++-- nvim/lua/lsp-user-config.lua | 45 ++++++++++++++++--------------- nvim/lua/lush_theme/fds-theme.lua | 18 ------------- nvim/lua/plugins.lua | 34 ++++++++++++----------- 4 files changed, 44 insertions(+), 60 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index a50cf8e..291f971 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -28,11 +28,10 @@ vim.cmd "highlight clear SpellBad" vim.cmd "highlight clear SpellLocal" vim.cmd "highlight clear SpellCap" vim.cmd "highlight clear SpellRare" ---vim.cmd "highlight CursorLineNr ctermfg=cyan" vim.cmd "highlight Visual term=reverse cterm=reverse" vim.cmd "colorscheme fds-theme" -- Keybindings -vim.api.nvim_set_keymap('n', 'bd', ':bd', {}) -vim.api.nvim_set_keymap('i', 'jk', '', {}) -vim.api.nvim_set_keymap('n', 'hr', 'source $MYVIMRC', {}) +vim.keymap.set('n', 'bd', ':bd', {}) +vim.keymap.set('i', 'jk', '', {}) +vim.keymap.set('n', 'hr', 'source $MYVIMRC', {}) diff --git a/nvim/lua/lsp-user-config.lua b/nvim/lua/lsp-user-config.lua index cf5cb02..c63ba27 100644 --- a/nvim/lua/lsp-user-config.lua +++ b/nvim/lua/lsp-user-config.lua @@ -1,44 +1,45 @@ -- LSP config -local nvim_lsp = require('lspconfig') +local nvim_lsp = require("lspconfig") function setup() -- Use an on_attach function to only map the following keys -- after the language server attaches to the current buffer local on_attach = function(client, bufnr) - local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end - local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end + local function keymap_set(...) vim.keymap.set(bufnr, ...) end + local function buf_set_option(...) vim.keymap.set(bufnr, ...) end -- Enable completion triggered by - buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc') + buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc") -- Mappings. local opts = { noremap=true, silent=true } -- See `:help vim.lsp.*` for documentation on any of the below functions - buf_set_keymap('n', 'gD', 'lua vim.lsp.buf.declaration()', opts) - buf_set_keymap('n', 'gd', 'lua vim.lsp.buf.definition()', opts) - buf_set_keymap('n', 'K', 'lua vim.lsp.buf.hover()', opts) - buf_set_keymap('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - buf_set_keymap('n', '', 'lua vim.lsp.buf.signature_help()', opts) - buf_set_keymap('n', 'wa', 'lua vim.lsp.buf.add_workspace_folder()', opts) - buf_set_keymap('n', 'wr', 'lua vim.lsp.buf.remove_workspace_folder()', opts) - buf_set_keymap('n', 'wl', 'lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))', opts) - buf_set_keymap('n', 'D', 'lua vim.lsp.buf.type_definition()', opts) - buf_set_keymap('n', 'rn', 'lua vim.lsp.buf.rename()', opts) - buf_set_keymap('n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buf_set_keymap('n', 'gr', 'lua vim.lsp.buf.references()', opts) - buf_set_keymap('n', 'e', 'lua vim.lsp.diagnostic.show_line_diagnostics()', opts) - buf_set_keymap('n', '[d', 'lua vim.lsp.diagnostic.goto_prev()', opts) - buf_set_keymap('n', ']d', 'lua vim.lsp.diagnostic.goto_next()', opts) - buf_set_keymap('n', 'q', 'lua vim.lsp.diagnostic.set_loclist()', opts) buf_set_keymap("n", "f", "lua vim.lsp.buf.formatting()", opts) + keymap_set("n", "gD", "lua vim.lsp.buf.declaration()", opts) + keymap_set("n", "gd", "lua vim.lsp.buf.definition()", opts) + keymap_set("n", "K", "lua vim.lsp.buf.hover()", opts) + keymap_set("n", "gi", "lua vim.lsp.buf.implementation()", opts) + keymap_set("n", "", "lua vim.lsp.buf.signature_help()", opts) + keymap_set("n", "wa", "lua vim.lsp.buf.add_workspace_folder()", opts) + keymap_set("n", "wr", "lua vim.lsp.buf.remove_workspace_folder()", opts) + keymap_set("n", "wl", "lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))", opts) + keymap_set("n", "D", "lua vim.lsp.buf.type_definition()", opts) + keymap_set("n", "rn", "lua vim.lsp.buf.rename()", opts) + keymap_set("n", "ca", "lua vim.lsp.buf.code_action()", opts) + keymap_set("n", "gr", "lua vim.lsp.buf.references()", opts) + keymap_set("n", "e", "lua vim.lsp.diagnostic.show_line_diagnostics()", opts) + keymap_set("n", "[d", "lua vim.lsp.diagnostic.goto_prev()", opts) + keymap_set("n", "]d", "lua vim.lsp.diagnostic.goto_next()", opts) + keymap_set("n", "q", "lua vim.lsp.diagnostic.set_loclist()", opts) + keymap_set("n", "f", "lua vim.lsp.buf.formatting()", opts) end local capabilities = vim.lsp.protocol.make_client_capabilities() capabilities.textDocument.completion.completionItem.snippetSupport = true - capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities) + capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities) -- Enable the following language servers - local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'rnix' } + local servers = { "clangd", "rust_analyzer", "pyright", "tsserver", "rnix", "sumneko_lua" } for _, lsp in ipairs(servers) do nvim_lsp[lsp].setup { on_attach = on_attach, diff --git a/nvim/lua/lush_theme/fds-theme.lua b/nvim/lua/lush_theme/fds-theme.lua index 473eede..a0ecf4d 100644 --- a/nvim/lua/lush_theme/fds-theme.lua +++ b/nvim/lua/lush_theme/fds-theme.lua @@ -300,11 +300,6 @@ return lush(function() sassMixing { fg = base0E }, sassMixinName { fg = base0D }, - -- Signify highlighting - -- SignifySignAdd { fg = base0B, bg = base00 }, - -- SignifySignChange { fg = base03, bg = base00 }, - -- SignifySignDelete { fg = base08, bg = base00 }, - -- Spelling highlighting SpellBad { gui = 'undercurl' }, --, base08) SpellLocal { gui = 'undercurl' }, --, base0C) @@ -326,19 +321,6 @@ return lush(function() -- Java highlighting javaOperator { fg = base0D }, - -- Vim - -- vimCommand { fg = hue_3, bg = none }, - -- vimCommentTitle { fg = mono_3, gui = 'bold' }, - -- vimFunction { fg = l.Function, bg = none }, - -- vimFuncName { fg = hue_3, bg = none }, - -- vimHighlight { fg = hue_2, bg = none }, - -- vimLineComment { fg = mono_3, gui = 'italic' }, - -- vimParenSep { fg = mono_2 }, - -- vimSep { fg = mono_2 }, - -- vimUserFunc { fg = hue_1, bg = none }, - -- vimUserCommand { fg = hue_1, bg = none }, - -- vimVar { fg = hue_5, bg = none }, - -- Telescope highlighting TelescopeNormal { fg = base05, bg = base01 }, TelescopeBorder { fg = base00, bg = base01 }, diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index e785101..2058a78 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -106,20 +106,20 @@ return require("packer").startup(function(use) require("telescope").load_extension("project") - vim.api.nvim_set_keymap('n', 'ff', 'lua require("telescope.builtin").find_files({ hidden = true })', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fF', 'lua require("telescope.builtin").find_files({ cwd = require("telescope.utils").buffer_dir(), hidden = true })', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fg', 'lua require("telescope.builtin").grep_string()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fG', 'lua require("telescope.builtin").live_grep()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fb', 'lua require("telescope.builtin").buffers()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fh', 'lua require("telescope.builtin").help_tags()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'ft', 'lua require("telescope.builtin").treesitter()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fb', 'lua require("telescope.builtin").buffers()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fr', 'lua require("telescope.builtin").oldfiles()', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fR', 'lua require("telescope.builtin").oldfiles({ only_cwd = true })', { noremap = true }) - vim.api.nvim_set_keymap('n', 'fA', 'lua require("telescope.builtin").resume()', { noremap = true }) + vim.keymap.set('n', 'ff', 'lua require("telescope.builtin").find_files({ hidden = true })', { noremap = true }) + vim.keymap.set('n', 'fF', 'lua require("telescope.builtin").find_files({ cwd = require("telescope.utils").buffer_dir(), hidden = true })', { noremap = true }) + vim.keymap.set('n', 'fg', 'lua require("telescope.builtin").grep_string()', { noremap = true }) + vim.keymap.set('n', 'fG', 'lua require("telescope.builtin").live_grep()', { noremap = true }) + vim.keymap.set('n', 'fb', 'lua require("telescope.builtin").buffers()', { noremap = true }) + vim.keymap.set('n', 'fh', 'lua require("telescope.builtin").help_tags()', { noremap = true }) + vim.keymap.set('n', 'ft', 'lua require("telescope.builtin").treesitter()', { noremap = true }) + vim.keymap.set('n', 'fb', 'lua require("telescope.builtin").buffers()', { noremap = true }) + vim.keymap.set('n', 'fr', 'lua require("telescope.builtin").oldfiles()', { noremap = true }) + vim.keymap.set('n', 'fR', 'lua require("telescope.builtin").oldfiles({ only_cwd = true })', { noremap = true }) + vim.keymap.set('n', 'fA', 'lua require("telescope.builtin").resume()', { noremap = true }) - -- Extensions - vim.api.nvim_set_keymap('n', 'fp', 'lua require("telescope").extensions.project.project({})', { noremap = true }) + -- Ekeymap.set + vim.keymap.set('n', 'fp', 'lua require("telescope").extensions.project.project({})', { noremap = true }) end, } @@ -127,11 +127,11 @@ return require("packer").startup(function(use) use { "ThePrimeagen/harpoon", config = function() - vim.api.nvim_set_keymap("n", "fm", "lua require('harpoon.mark').add_file()", {}) + vim.keymap.set("n", "fm", "lua require('harpoon.mark').add_file()", {}) local has_telescope, telescope = pcall("telescope") if has_telescope then - vim.api.nvim_set_keymap("n", "fM", "lua require('telescope').extensions.harpoon.harpoon({})", {}) + vim.keymap.set("n", "fM", "lua require('telescope').extensions.harpoon.harpoon({})", {}) require("telescope").load_extension("harpoon") end end, @@ -171,7 +171,9 @@ return require("packer").startup(function(use) [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.scroll_docs(-4), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.scroll_docs(4), { "i", "c" }), - [""] = cmp.mapping(cmp.mapping.confirm({ select = true }), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.select_next_item(), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.select_prev_item(), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.confirm({ select = true }), { "i", "c" }), [""] = cmp.mapping({ i = cmp.mapping.abort(), c = cmp.mapping.close(),