From be08f1593d5071bee109c4502becba7dd23ff853 Mon Sep 17 00:00:00 2001 From: hhhh hgfh Date: Wed, 22 Oct 2025 01:02:47 +0300 Subject: [PATCH] update: settings for nvim --- nvim/init.lua | 1 + nvim/lazy-lock.json | 9 +++++---- nvim/lua/chadrc.lua | 4 +--- nvim/lua/configs/lspconfig.lua | 2 +- nvim/lua/custom/init.lua | 13 +++++++++++++ nvim/lua/mappings.lua | 6 ++++++ 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index a6fba59..d624999 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -2,6 +2,7 @@ vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/" vim.g.mapleader = " " vim.wo.number = true vim.wo.relativenumber = true +vim.opt.wrap = false -- bootstrap lazy and all plugins local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index e479000..40ce142 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,5 +1,5 @@ { - "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" }, + "LuaSnip": { "branch": "master", "commit": "f958d9837c8fa7816bb8fb54977e658affc63c31" }, "NvChad": { "branch": "v2.5", "commit": "f107fabe11ac8013dc3435ecd5382bee872b1584" }, "base46": { "branch": "v3.0", "commit": "db58475d3fd2a16f9b1467d6895e3c4c195ed7dd" }, "cmp-async-path": { "branch": "main", "commit": "0ed1492f59e730c366d261a5ad822fa37e44c325" }, @@ -11,13 +11,13 @@ "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, - "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" }, "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, + "nvim-cmp": { "branch": "main", "commit": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025" }, "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, @@ -29,6 +29,7 @@ "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "ui": { "branch": "v3.0", "commit": "03b9718140375e7f3f5e4f3e04bc2b6c907440ec" }, + "vim-devicons": { "branch": "master", "commit": "71f239af28b7214eebb60d4ea5bd040291fb7e33" }, "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" }, "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" } diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua index 6dcaab7..46a0b75 100644 --- a/nvim/lua/chadrc.lua +++ b/nvim/lua/chadrc.lua @@ -19,9 +19,7 @@ M.mason = { ensure_installed = { "lua-language-server", "stylua", - "clangd", - "clang-format", - "codelldb" + "codelldb", } } } diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index 676d38f..94c4889 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -13,7 +13,7 @@ vim.lsp.config('clangd', { "clangd", "--background-index", "--clang-tidy", - "--experemental-modules-support", + "--experimental-modules-support", "--all-scopes-completion", "--completion-style=detailed", "--header-insertion=iwyu", diff --git a/nvim/lua/custom/init.lua b/nvim/lua/custom/init.lua index b35cadd..ae11a42 100644 --- a/nvim/lua/custom/init.lua +++ b/nvim/lua/custom/init.lua @@ -5,3 +5,16 @@ vim.api.nvim_create_autocmd("BufWritePre", { vim.lsp.buf.format() end, }) + +-- настройки clipboard +vim.g.clipboard = { + name = 'OSC 52', + copy = { + ['+'] = require('vim.ui.clipboard.osc52').copy('+'), + ['*'] = require('vim.ui.clipboard.osc52').copy('*'), + }, + paste = { + ['+'] = require('vim.ui.clipboard.osc52').paste('+'), + ['*'] = require('vim.ui.clipboard.osc52').paste('*'), + }, +} diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index ccd94d3..0147a14 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -21,3 +21,9 @@ map('n', 'lo', 'lua vim.diagnostic.open_float()', { noremap = t map('n', '[l', 'DapContinue', { noremap = true, silent = true, desc = 'Go to prev diagnostic' }) map('n', ']l', 'DapStepOver', { noremap = true, silent = true, desc = 'Go to next diagnostic' }) map('n', 'lt', 'DapStepInto', { noremap = true, silent = true, desc = 'Open toggle' }) + +-- Tabs +map('n', 'tn', ':tabnew', { noremap = true, silent = true, desc = 'Open new tab' }) +map('n', 'tc', ':tabclose', { noremap = true, silent = true, desc = 'Close this tab' }) +map('n', 'tl', ':tabnext', { noremap = true, silent = true, desc = 'Go to next tab' }) +map('n', 'th', ':tabprevious', { noremap = true, silent = true, desc = 'Go to previous tab' })