From b6aae4722c206315eb2a89e8dd04669342a9051b Mon Sep 17 00:00:00 2001 From: Niktia Bykov Date: Tue, 2 Jan 2024 14:39:34 +0500 Subject: [PATCH] stuff --- .config/nvim/lua/user/lsp/handlers.lua | 13 +------------ .config/nvim/lua/user/lsp/init.lua | 7 +------ .config/nvim/lua/user/options.lua | 2 +- .config/nvim/lua/user/plugins.lua | 7 ++++--- .config/nvim/lua/user/schemastore.lua | 0 .config/nvim/lua/user/treesitter.lua | 9 ++++----- 6 files changed, 11 insertions(+), 27 deletions(-) create mode 100644 .config/nvim/lua/user/schemastore.lua diff --git a/.config/nvim/lua/user/lsp/handlers.lua b/.config/nvim/lua/user/lsp/handlers.lua index 96efc8c..d0678cb 100644 --- a/.config/nvim/lua/user/lsp/handlers.lua +++ b/.config/nvim/lua/user/lsp/handlers.lua @@ -1,6 +1,5 @@ local M = {} --- TODO: backfill this to template M.setup = function() local signs = { { name = "DiagnosticSignError", text = "" }, @@ -24,7 +23,7 @@ M.setup = function() underline = true, severity_sort = true, float = { - focusable = false, + focusable = true, style = "minimal", border = "rounded", source = "always", @@ -34,16 +33,6 @@ M.setup = function() } vim.diagnostic.config(config) - - vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { - border = "rounded", - width = 60, - }) - - vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { - border = "rounded", - width = 60, - }) end -- local function lsp_highlight_document(client) diff --git a/.config/nvim/lua/user/lsp/init.lua b/.config/nvim/lua/user/lsp/init.lua index 6d81a1c..bc83d62 100644 --- a/.config/nvim/lua/user/lsp/init.lua +++ b/.config/nvim/lua/user/lsp/init.lua @@ -28,12 +28,7 @@ vim.api.nvim_set_keymap("n", "gr", "lua vim.lsp.buf.references()", opts vim.api.nvim_set_keymap("n", "ca", "lua vim.lsp.buf.code_action()", opts) -- vim.api.nvim_buf_set_keymap("n", "f", "lua vim.diagnostic.open_float()", opts) vim.api.nvim_set_keymap("n", "[d", 'lua vim.diagnostic.goto_prev({ border = "rounded" })', opts) -vim.api.nvim_set_keymap( - "n", - "gl", - 'lua vim.diagnostic.open_float({ border = "rounded" })', - opts -) +vim.api.nvim_set_keymap("n", "gl", 'lua vim.diagnostic.open_float({ border = "rounded" })', opts) vim.api.nvim_set_keymap("n", "]d", 'lua vim.diagnostic.goto_next({ border = "rounded" })', opts) vim.api.nvim_set_keymap("n", "q", "lua vim.diagnostic.setloclist()", opts) diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index eeb4674..432fa24 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -5,7 +5,7 @@ vim.opt.showmode = false vim.opt.fileencoding = "utf-8" vim.opt.ignorecase = true vim.opt.showtabline = 2 -vim.opt.pumblend = 10 +vim.opt.pumblend = 5 vim.opt.smartindent = true vim.opt.smartcase = true vim.opt.splitright = true diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index 8215494..bdee408 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -53,7 +53,7 @@ lazy.setup({ { "nvim-neo-tree/neo-tree.nvim", branch = "v2.x", - requires = { + dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended "MunifTanjim/nui.nvim", @@ -62,7 +62,7 @@ lazy.setup({ { "kyazdani42/nvim-tree.lua", - requires = { + dependencies = { "kyazdani42/nvim-web-devicons", -- optional, for file icons }, tag = "nightly", -- optional, updated every week. (see issue #1193) @@ -71,7 +71,7 @@ lazy.setup({ { "akinsho/bufferline.nvim", tag = "v2.*", - requires = "kyazdani42/nvim-web-devicons", + dependencies = {"kyazdani42/nvim-web-devicons"}, }, { @@ -118,6 +118,7 @@ lazy.setup({ "folke/neodev.nvim", "MunifTanjim/nui.nvim", + "b0o/schemastore.nvim" }) -- vim.cmd([[ diff --git a/.config/nvim/lua/user/schemastore.lua b/.config/nvim/lua/user/schemastore.lua new file mode 100644 index 0000000..e69de29 diff --git a/.config/nvim/lua/user/treesitter.lua b/.config/nvim/lua/user/treesitter.lua index 3edaf1b..4d1d337 100644 --- a/.config/nvim/lua/user/treesitter.lua +++ b/.config/nvim/lua/user/treesitter.lua @@ -4,17 +4,16 @@ if not status_ok then end configs.setup({ - ensure_installed = {"python", "rust", "javascript"}, -- one of "all" or a list of languages + ensure_installed = { "python", "rust", "javascript" }, -- one of "all" or a list of languages ignore_install = { "phpdoc", "comment", "rst" }, -- List of parsers to ignore installing highlight = { - additional_vim_regex_highlighting = false, - enable = true, -- false will disable the whole extension - disable = { "css" }, -- list of language that will be disabled + enable = true, + disable = { "css" }, }, autopairs = { enable = true, }, - indent = { enable = true, disable = { "python", "css" } }, + indent = { enable = true }, autotag = { enable = true, },