From fe07bef7852ba06a820562df3fb9eb9ce1bde2b4 Mon Sep 17 00:00:00 2001 From: Ariel Date: Wed, 6 Mar 2024 20:24:37 +0800 Subject: [PATCH] Update init.lua --- init.lua | 36 ++++++++++++++++-------------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/init.lua b/init.lua index c76a2d4..3b17910 100644 --- a/init.lua +++ b/init.lua @@ -129,10 +129,6 @@ local plugins = { enabled = true, } }, - { - 'stevearc/overseer.nvim', - opts = {}, - }, { "windwp/nvim-autopairs", event = "InsertEnter", @@ -374,7 +370,7 @@ config.setup({ highlight = { enable = true}, indent = { enable = true}, }) -vim.keymap.set('n', 'f', ':Neotree . toggle left', {}) +vim.keymap.set('n', 'f', 'Neotree . toggle left', {}) -- import nvim-cmp plugin safely local cmp_status, cmp = pcall(require, "cmp") @@ -414,25 +410,33 @@ cmp.setup({ }), }) - -- Setup language servers. local lspconfig = require('lspconfig') +local capabilities = require('cmp_nvim_lsp').default_capabilities() +lspconfig.svls.setup { + capabilities = capabilities +} lspconfig.clangd.setup { + capabilities = capabilities, cmd = { "clangd", "--header-insertion=never" } } -lspconfig.pyright.setup {} -lspconfig.tsserver.setup {} +lspconfig.pyright.setup { + capabilities = capabilities +} +lspconfig.tsserver.setup { + capabilities = capabilities +} lspconfig.rust_analyzer.setup { + capabilities = capabilities, -- Server-specific settings. See `:help lspconfig-setup` settings = { ['rust-analyzer'] = {}, }, } - -- Global mappings. -- See `:help vim.diagnostic.*` for documentation on any of the below functions vim.keymap.set('n', 'e', vim.diagnostic.open_float) @@ -485,10 +489,8 @@ vim.api.nvim_create_autocmd("LspAttach", { require("lsp_signature").setup({}) -vim.keymap.set('n', '', 'u') -vim.keymap.set('v', '', 'u') -vim.keymap.set('i', '', 'ui') -vim.keymap.set('i', '', 'yyi') +vim.keymap.set({'i', 'n', 'v', 'x'}, '', '', {noremap=true}) +vim.keymap.set({'i', 'n', 'v', 'x'}, '', '', {noremap=true}) vim.keymap.set('i', '', 'PA') vim.keymap.set('i', '', 'ddi') vim.keymap.set('i', '', '^i') @@ -504,8 +506,6 @@ vim.keymap.set("v", "", "t', 'TodoTelescope') vim.keymap.set('v', "", "dpV`]") vim.keymap.set('v', "", "dkPV`]") -vim.keymap.set('n', '5', '+5') -vim.keymap.set('n', '4', '-5') vim.keymap.set('n', '', 'Legendary', {noremap=true}) vim.keymap.set('n', 'h', 'HopWord') require("nvim-treesitter.configs").setup { @@ -518,14 +518,10 @@ require("nvim-treesitter.configs").setup { }, } -require("overseer").setup({ - templates = { "builtin", "user.cpp_cp" }, -}) - vim.api.nvim_create_autocmd("FileType", { pattern = "cpp", callback = function() - vim.api.nvim_buf_set_keymap(0, 'n', "b", ":10sp:te g++ -std=c++17 -Wall -Ofast -g -fsanitize=address -fsanitize=undefined % && ./a.out < std.ini", { + vim.api.nvim_buf_set_keymap(0, 'n', "b", "10spte g++ -std=c++17 -Wall -Ofast -g -fsanitize=address -fsanitize=undefined % && ./a.out < std.ini", { silent = true, noremap = true })