From 6748725b17d4c4a5835a3a5e4f3ab66286c741be Mon Sep 17 00:00:00 2001 From: hhhh hgfh Date: Sun, 8 Feb 2026 16:52:42 +0300 Subject: [PATCH] refactor: update nvim settings --- nvim/build_targets.json | 1 + nvim/init.lua | 2 - nvim/lazy-lock.json | 57 +- nvim/lua/autocmds.lua | 1 - nvim/lua/chadrc.lua | 34 - nvim/lua/configs/cmp.lua | 1 - nvim/lua/configs/conform.lua | 2 + nvim/lua/configs/gitsigns.lua | 98 +-- nvim/lua/configs/lazy.lua | 2 +- nvim/lua/configs/lsp/e-lspconfig.lua | 69 +- nvim/lua/configs/lsp/lspconfig.lua | 54 +- nvim/lua/configs/lspconfig.lua | 34 - nvim/lua/configs/luasnip.lua | 12 - nvim/lua/configs/nvim-dap.lua | 7 +- nvim/lua/configs/nvimtree.lua | 2 +- nvim/lua/configs/snacks.lua | 0 nvim/lua/configs/telescope.lua | 6 +- nvim/lua/configs/treesitter.lua | 11 +- nvim/lua/configs/ufo.lua | 12 +- nvim/lua/custom/darcula.lua | 804 ++++++++++++++++++ nvim/lua/custom/init.lua | 24 +- nvim/lua/custom/make.lua | 184 ++++ nvim/lua/mappings.lua | 46 +- nvim/lua/plugins/common.lua | 35 +- nvim/lua/plugins/{dev.lua => development.lua} | 96 ++- nvim/lua/plugins/init.lua | 60 -- nvim/lua/plugins/lines.lua | 14 +- nvim/lua/plugins/noice.lua | 10 +- nvim/lua/plugins/snacks.lua | 3 +- nvim/lua/plugins/telescope.lua | 11 +- nvim/lua/plugins/typst.lua | 8 + nvim/{.stylua.toml => stylua.toml} | 0 nvim/temp | 34 + 33 files changed, 1390 insertions(+), 344 deletions(-) create mode 100644 nvim/build_targets.json delete mode 100644 nvim/lua/autocmds.lua delete mode 100644 nvim/lua/chadrc.lua delete mode 100644 nvim/lua/configs/lspconfig.lua create mode 100644 nvim/lua/configs/snacks.lua create mode 100644 nvim/lua/custom/darcula.lua create mode 100644 nvim/lua/custom/make.lua rename nvim/lua/plugins/{dev.lua => development.lua} (51%) delete mode 100644 nvim/lua/plugins/init.lua create mode 100644 nvim/lua/plugins/typst.lua rename nvim/{.stylua.toml => stylua.toml} (100%) create mode 100644 nvim/temp diff --git a/nvim/build_targets.json b/nvim/build_targets.json new file mode 100644 index 0000000..c7a9f2a --- /dev/null +++ b/nvim/build_targets.json @@ -0,0 +1 @@ +{"barsic": "cp ~/engine/builddir/pmc2/pmc2-engine bin/.", "build": "meson compile -C builddir pmc2-engine", "test": "meson test -C builddir -v pmc2_tests", "barsic-master": "cp ~/builddir/pmc2/pmc2-engine && make run_alice"} diff --git a/nvim/init.lua b/nvim/init.lua index 5dca27b..dd1640b 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -9,5 +9,3 @@ require("configs.lazy") require("mappings") require("options") require("custom.init") - -vim.cmd[[colorscheme darcula-dark]] diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 76b07d2..eda26c3 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,36 +1,47 @@ { - "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" }, + "LuaSnip": { "branch": "master", "commit": "dae4f5aaa3574bd0c2b9dd20fb9542a02c10471c" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "cmp-async-path": { "branch": "main", "commit": "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1" }, + "cmp-async-path": { "branch": "main", "commit": "f8af3f726e07f2e9d37672eaa9102581aefce149" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, - "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, + "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" }, - "darcula-dark.nvim": { "branch": "main", "commit": "5e8edf8b2aff3bf3d5110799713d29649cb87bbb" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, + "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "git-conflict.nvim": { "branch": "main", "commit": "4bbfdd92d547d2862a75b4e80afaf30e73f7bbb4" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ce96a464fdbc24208e24c117e2021794259005d" }, + "gitui.nvim": { "branch": "main", "commit": "686d74e79899af760ed9f5f0ad2bd1bb1c135e26" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "marks.nvim": { "branch": "master", "commit": "f353e8c08c50f39e99a9ed474172df7eddd89b72" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "d7b5feb6e769e995f7fcf44d92f49f811c51d10c" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "mini.pairs": { "branch": "main", "commit": "b316e68f2d242d5bd010deaab645daa27ed86297" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "ae609525ddf01c153c39305730b1791800ffe4fe" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.nvim": { "branch": "main", "commit": "a995fe9cd4193fb492b5df69175a351a74b3d36b" }, + "mini.pairs": { "branch": "main", "commit": "4089aa6ea6423e02e1a8326a7a7a00159f6f5e04" }, + "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" }, + "neotest-gtest": { "branch": "main", "commit": "b66f1d33cbf3b37b9803e6bc7ef47ac60eba86b1" }, + "neotest-phpunit": { "branch": "main", "commit": "2761ae9e9a385e491a9731f8c52824e1be64a68f" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" }, - "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, - "nvim-lspconfig": { "branch": "master", "commit": "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, + "nvim-dap": { "branch": "master", "commit": "e47878dcf1ccc30136b30d19ab19fe76946d61cd" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, + "nvim-lspconfig": { "branch": "master", "commit": "66fd02ad1c7ea31616d3ca678fa04e6d0b360824" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-tree.lua": { "branch": "master", "commit": "64e2192f5250796aa4a7f33c6ad888515af50640" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" }, - "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" }, - "persisted.nvim": { "branch": "main", "commit": "5063ee8e3589a43eefadcca57496aea01b6170fa" }, + "nvim-tree.lua": { "branch": "master", "commit": "037d89e60fb01a6c11a48a19540253b8c72a3c32" }, + "nvim-treesitter": { "branch": "main", "commit": "45a07f869b0cffba342276f2c77ba7c116d35db8" }, + "nvim-ufo": { "branch": "main", "commit": "ab3eb124062422d276fae49e0dd63b3ad1062cfc" }, + "nvim-web-devicons": { "branch": "master", "commit": "746ffbb17975ebd6c40142362eee1b0249969c5c" }, + "persisted.nvim": { "branch": "main", "commit": "14cc1db0052ea26f2d2d2f1b861845dae58b7ead" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "snacks.nvim": { "branch": "main", "commit": "9a15b317495cda991d3b4990f18aed47a9a9a891" }, - "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, + "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, + "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, + "typst-preview.nvim": { "branch": "master", "commit": "e123a7ab64e52d836e00dea9251e85b201f38966" }, "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } } diff --git a/nvim/lua/autocmds.lua b/nvim/lua/autocmds.lua deleted file mode 100644 index d2db0bb..0000000 --- a/nvim/lua/autocmds.lua +++ /dev/null @@ -1 +0,0 @@ -require "nvchad.autocmds" diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua deleted file mode 100644 index 46a0b75..0000000 --- a/nvim/lua/chadrc.lua +++ /dev/null @@ -1,34 +0,0 @@ --- This file needs to have same structure as nvconfig.lua --- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua --- Please read that file to know all available options :( - ----@type ChadrcConfig -local M = {} - -M.base46 = { - theme = "darcula-dark", - - -- hl_override = { - -- Comment = { italic = true }, - -- ["@comment"] = { italic = true }, - -- }, -} - -M.mason = { - opts ={ - ensure_installed = { - "lua-language-server", - "stylua", - "codelldb", - } - } -} - -M.nvdash = { load_on_startup = true } --- M.ui = { --- tabufline = { --- lazyload = false --- } --- } - -return M diff --git a/nvim/lua/configs/cmp.lua b/nvim/lua/configs/cmp.lua index 36bc96d..e576e37 100644 --- a/nvim/lua/configs/cmp.lua +++ b/nvim/lua/configs/cmp.lua @@ -1,4 +1,3 @@ - local cmp = require "cmp" local options = { diff --git a/nvim/lua/configs/conform.lua b/nvim/lua/configs/conform.lua index ad34362..9cfbe75 100644 --- a/nvim/lua/configs/conform.lua +++ b/nvim/lua/configs/conform.lua @@ -2,9 +2,11 @@ local options = { formatters_by_ft = { lua = { "stylua" }, cpp = { "clang-format" }, + go = { "gofmr" }, }, format_on_save = { + -- These options will be passed to conform.format() timeout_ms = 500, lsp_fallback = true, }, diff --git a/nvim/lua/configs/gitsigns.lua b/nvim/lua/configs/gitsigns.lua index 8a697b5..d911b56 100644 --- a/nvim/lua/configs/gitsigns.lua +++ b/nvim/lua/configs/gitsigns.lua @@ -1,53 +1,53 @@ return { - signs = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - untracked = { text = "▎" }, - }, - signs_staged = { - add = { text = "▎" }, - change = { text = "▎" }, - delete = { text = "" }, - topdelete = { text = "" }, - changedelete = { text = "▎" }, - }, - on_attach = function(buffer) - local gs = package.loaded.gitsigns + signs = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + untracked = { text = "▎" }, + }, + signs_staged = { + add = { text = "▎" }, + change = { text = "▎" }, + delete = { text = "" }, + topdelete = { text = "" }, + changedelete = { text = "▎" }, + }, + on_attach = function(buffer) + local gs = package.loaded.gitsigns - local function map(mode, l, r, desc) - vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true }) - end + local function map(mode, l, r, desc) + vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc, silent = true }) + end - -- stylua: ignore start - map("n", "]h", function() - if vim.wo.diff then - vim.cmd.normal({ "]c", bang = true }) - else - gs.nav_hunk("next") - end - end, "Next Hunk") - map("n", "[h", function() - if vim.wo.diff then - vim.cmd.normal({ "[c", bang = true }) - else - gs.nav_hunk("prev") - end - end, "Prev Hunk") - map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk") - map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk") - map({ "n", "x" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") - map({ "n", "x" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") - map("n", "ghS", gs.stage_buffer, "Stage Buffer") - map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") - map("n", "ghR", gs.reset_buffer, "Reset Buffer") - map("n", "ghp", gs.preview_hunk_inline, "Preview Hunk Inline") - map("n", "ghb", function() gs.blame_line({ full = true }) end, "Blame Line") - map("n", "ghB", function() gs.blame() end, "Blame Buffer") - map("n", "ghd", gs.diffthis, "Diff This") - map("n", "ghD", function() gs.diffthis("~") end, "Diff This ~") - map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") - end, + -- stylua: ignore start + map("n", "]h", function() + if vim.wo.diff then + vim.cmd.normal({ "]c", bang = true }) + else + gs.nav_hunk("next") + end + end, "Next Hunk") + map("n", "[h", function() + if vim.wo.diff then + vim.cmd.normal({ "[c", bang = true }) + else + gs.nav_hunk("prev") + end + end, "Prev Hunk") + map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk") + map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk") + map({ "n", "x" }, "ghs", ":Gitsigns stage_hunk", "Stage Hunk") + map({ "n", "x" }, "ghr", ":Gitsigns reset_hunk", "Reset Hunk") + map("n", "ghS", gs.stage_buffer, "Stage Buffer") + map("n", "ghu", gs.undo_stage_hunk, "Undo Stage Hunk") + map("n", "ghR", gs.reset_buffer, "Reset Buffer") + map("n", "ghp", gs.preview_hunk_inline, "Preview Hunk Inline") + map("n", "ghb", function() gs.blame_line({ full = true }) end, "Blame Line") + map("n", "ghB", function() gs.blame() end, "Blame Buffer") + map("n", "ghd", gs.diffthis, "Diff This") + map("n", "ghD", function() gs.diffthis("~") end, "Diff This ~") + map({ "o", "x" }, "ih", ":Gitsigns select_hunk", "GitSigns Select Hunk") + end, } diff --git a/nvim/lua/configs/lazy.lua b/nvim/lua/configs/lazy.lua index e70e849..f533341 100644 --- a/nvim/lua/configs/lazy.lua +++ b/nvim/lua/configs/lazy.lua @@ -21,6 +21,6 @@ require("lazy").setup({ spec = { { import = "plugins" }, }, - install = { colorscheme = { "darcula-dark" } }, + install = { colorscheme = { "habamax" } }, checker = { enabled = true }, }) diff --git a/nvim/lua/configs/lsp/e-lspconfig.lua b/nvim/lua/configs/lsp/e-lspconfig.lua index 8edad00..48c2f29 100644 --- a/nvim/lua/configs/lsp/e-lspconfig.lua +++ b/nvim/lua/configs/lsp/e-lspconfig.lua @@ -1,34 +1,55 @@ local M = {} -local api = vim.api +local map = vim.keymap.set -local function check_triggeredChars(triggerChars) - local cur_line = api.nvim_get_current_line() - local pos = api.nvim_win_get_cursor(0)[2] - local prev_char = cur_line:sub(pos - 1, pos - 1) - local cur_char = cur_line:sub(pos, pos) +-- export on_attach & capabilities +M.on_attach = function(_, bufnr) + local function opts(desc) + return { buffer = bufnr, desc = "LSP " .. desc } + end - for _, char in ipairs(triggerChars) do - if cur_char == char or prev_char == char then - return true + map("n", "gD", vim.lsp.buf.declaration, opts "Go to declaration") + map("n", "gd", vim.lsp.buf.definition, opts "Go to definition") + map("n", "wa", vim.lsp.buf.add_workspace_folder, opts "Add workspace folder") + map("n", "wr", vim.lsp.buf.remove_workspace_folder, opts "Remove workspace folder") + + map("n", "wl", function() + print(vim.inspect(vim.lsp.buf.list_workspace_folders())) + end, opts "List workspace folders") + + map("n", "D", vim.lsp.buf.type_definition, opts "Go to type definition") +end + +-- disable semanticTokens +M.on_init = function(client, _) + if vim.fn.has "nvim-0.11" ~= 1 then + if client.supports_method "textDocument/semanticTokens" then + client.server_capabilities.semanticTokensProvider = nil + end + else + if client:supports_method "textDocument/semanticTokens" then + client.server_capabilities.semanticTokensProvider = nil end end end -M.setup = function(client, bufnr) - local group = api.nvim_create_augroup("LspSignature", { clear = false }) - api.nvim_clear_autocmds { group = group, buffer = bufnr } +M.capabilities = vim.lsp.protocol.make_client_capabilities() - local triggerChars = client.server_capabilities.signatureHelpProvider.triggerCharacters - - api.nvim_create_autocmd("TextChangedI", { - group = group, - buffer = bufnr, - callback = function() - if check_triggeredChars(triggerChars) then - vim.lsp.buf.signature_help { focus = false, silent = true, max_height = 7, border = "single" } - end - end, - }) -end +M.capabilities.textDocument.completion.completionItem = { + documentationFormat = { "markdown", "plaintext" }, + snippetSupport = true, + preselectSupport = true, + insertReplaceSupport = true, + labelDetailsSupport = true, + deprecatedSupport = true, + commitCharactersSupport = true, + tagSupport = { valueSet = { 1 } }, + resolveSupport = { + properties = { + "documentation", + "detail", + "additionalTextEdits", + }, + }, +} return M diff --git a/nvim/lua/configs/lsp/lspconfig.lua b/nvim/lua/configs/lsp/lspconfig.lua index 7e6e8fb..41754d4 100644 --- a/nvim/lua/configs/lsp/lspconfig.lua +++ b/nvim/lua/configs/lsp/lspconfig.lua @@ -2,7 +2,7 @@ local on_attach = require("configs.lsp.e-lspconfig").on_attach local on_init = require("configs.lsp.e-lspconfig").on_init local capabilities = require("configs.lsp.e-lspconfig").capabilities --- clangd lsp server +-- C/C++ vim.lsp.config('clangd', { on_attach = on_attach, on_init = on_init, @@ -17,16 +17,48 @@ vim.lsp.config('clangd', { "--completion-style=detailed", "--header-insertion=iwyu", "--limit-references=5", - "--malloc-trim", "--pch-storage=disk", }, - filetypes = { "c", "cpp", "objc", "objcpp" }, - init_options = { - fallbackFlags = {'-std=c++20'}, - } + filetypes = { "c", "cpp", "h", "hpp", "objc", "objcpp" }, + root_markers = { '.git' }, }) vim.lsp.enable('clangd') +-- Go (gopls) lsp server +vim.lsp.config('gopls', { + on_attach = on_attach, + on_init = on_init, + capabilities = capabilities, + cmd = { 'gopls' }, + filetypes = { 'go', 'gomod', 'gowork', 'gotmpl' }, + root_markers = { 'go.mod', '.git' }, + single_file_support = true, + settings = { + gopls = { + completeUnimported = true, + usePlaceholders = true, + analyses = { + unusedparams = true, + }, + staticcheck = true, + gofumpt = true, + }, + }, +}) +vim.lsp.enable('gopls') + +-- PhP +vim.lsp.config('phpactor', { + cmd = { 'phpactor', 'language-server' }, + filetypes = { 'php' }, + root_markers = { 'composer.json', '.git' }, + init_options = { + ["language_server_phpstan.enabled"] = false, + ["language_server_psalm.enabled"] = false, + } +}) +vim.lsp.enable('phpactor') + -- Lua vim.lsp.config('lua_ls', { cmd = { 'lua-language-server' }, @@ -59,6 +91,16 @@ vim.lsp.config('bashls', { }) vim.lsp.enable('bashls') +-- Meson +vim.lsp.config('meson_ls', { + cmd = { 'mesonlsp' }, + filetypes = { 'meson' }, + root_markers = { 'meson.build', '.git' }, + single_file_support = true, + settings = {} +}) +vim.lsp.enable('meson_ls') + -- For all vim.diagnostic.config({ virtual_text = false, diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua deleted file mode 100644 index 94c4889..0000000 --- a/nvim/lua/configs/lspconfig.lua +++ /dev/null @@ -1,34 +0,0 @@ -require("nvchad.configs.lspconfig").defaults() - -local on_attach = require("nvchad.configs.lspconfig").on_attach -local on_init = require("nvchad.configs.lspconfig").on_init -local capabilities = require("nvchad.configs.lspconfig").capabilities - --- clangd lsp server -vim.lsp.config('clangd', { - on_attach = on_attach, - on_init = on_init, - capabilities = capabilities, - cmd = { - "clangd", - "--background-index", - "--clang-tidy", - "--experimental-modules-support", - "--all-scopes-completion", - "--completion-style=detailed", - "--header-insertion=iwyu", - "--limit-references=5", - "--malloc-trim", - "--pch-storage=disk", - }, - filetypes = { "c", "cpp", "objc", "objcpp" }, - init_options = { - fallbackFlags = {'-std=c++20'}, - } -}) - -vim.diagnostic.config({ - virtual_text = false, -}) - -vim.lsp.enable('clangd') diff --git a/nvim/lua/configs/luasnip.lua b/nvim/lua/configs/luasnip.lua index f6f61c0..ef53ac6 100644 --- a/nvim/lua/configs/luasnip.lua +++ b/nvim/lua/configs/luasnip.lua @@ -9,15 +9,3 @@ require("luasnip.loaders.from_snipmate").lazy_load { paths = vim.g.snipmate_snip -- lua format require("luasnip.loaders.from_lua").load() require("luasnip.loaders.from_lua").lazy_load { paths = vim.g.lua_snippets_path or "" } - --- fix luasnip #258 -vim.api.nvim_create_autocmd("InsertLeave", { - callback = function() - if - require("luasnip").session.current_nodes[vim.api.nvim_get_current_buf()] - and not require("luasnip").session.jump_active - then - require("luasnip").unlink_current() - end - end, -}) diff --git a/nvim/lua/configs/nvim-dap.lua b/nvim/lua/configs/nvim-dap.lua index 596b290..7f48a79 100644 --- a/nvim/lua/configs/nvim-dap.lua +++ b/nvim/lua/configs/nvim-dap.lua @@ -69,17 +69,16 @@ function M.setup() dapui.close({}) end - -- Настройка подсветки для точек останова (ИСПРАВЛЕННАЯ ВЕРСИЯ) + -- Цвета на задний фон для debug vim.api.nvim_set_hl(0, 'DapBreakpoint', { fg = '#993939', bg = '#31353f' }) vim.api.nvim_set_hl(0, 'DapLogPoint', { fg = '#61afef', bg = '#31353f' }) vim.api.nvim_set_hl(0, 'DapStopped', { fg = '#98c379', bg = '#31353f' }) - - -- Настройка значков (эта часть правильная) + -- Настройка значков для точек останова :cite[1]:cite[10] vim.fn.sign_define('DapBreakpoint', { text='', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl='DapBreakpoint' }) vim.fn.sign_define('DapBreakpointCondition', { text='ﳁ', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl='DapBreakpoint' }) vim.fn.sign_define('DapBreakpointRejected', { text='', texthl='DapBreakpoint', linehl='DapBreakpoint', numhl= 'DapBreakpoint' }) vim.fn.sign_define('DapLogPoint', { text='', texthl='DapLogPoint', linehl='DapLogPoint', numhl= 'DapLogPoint' }) - vim.fn.sign_define('DapStopped', { text='', texthl='DapStopped', linehl='DapStopped', numhl= 'DapStopped' }) + vim.fn.sign_define('DapStopped', { text='', texthl='DapStopped', linehl='DapStopped', numhl= 'DapStopped' })vim.fn.sign_define("DapBreakpointRejected", { text = "❌", texthl = "LspDiagnosticsSignHint" }) end return M diff --git a/nvim/lua/configs/nvimtree.lua b/nvim/lua/configs/nvimtree.lua index 64e57e8..45d2a79 100644 --- a/nvim/lua/configs/nvimtree.lua +++ b/nvim/lua/configs/nvimtree.lua @@ -1,5 +1,5 @@ return { - filters = { dotfiles = false }, + filters = { dotfiles = false, git_ignored = false, }, disable_netrw = true, hijack_cursor = true, sync_root_with_cwd = true, diff --git a/nvim/lua/configs/snacks.lua b/nvim/lua/configs/snacks.lua new file mode 100644 index 0000000..e69de29 diff --git a/nvim/lua/configs/telescope.lua b/nvim/lua/configs/telescope.lua index 7e7c475..ee5a959 100644 --- a/nvim/lua/configs/telescope.lua +++ b/nvim/lua/configs/telescope.lua @@ -1,4 +1,4 @@ -return { +require("telescope").setup(){ defaults = { prompt_prefix = "  ", selection_caret = " ", @@ -17,6 +17,6 @@ return { }, }, - extensions_list = { "themes", "terms" }, - extensions = {}, + extensions_list = { "themes", "terms", "noice", "persisted" }, + extensions = { "noice", "persisted" }, } diff --git a/nvim/lua/configs/treesitter.lua b/nvim/lua/configs/treesitter.lua index 7a7b1f9..d4f788a 100644 --- a/nvim/lua/configs/treesitter.lua +++ b/nvim/lua/configs/treesitter.lua @@ -1,8 +1,8 @@ return { ensure_installed = { - "bash", "c", "cpp", + "make", "cmake", "diff", "doxygen", @@ -18,10 +18,11 @@ return { "lua", "luadoc", "luap", - "make", "markdown", "markdown_inline", "meson", + "php", + "phpdoc", "printf", "python", "query", @@ -33,7 +34,7 @@ return { "vim", "vimdoc", "xml", - "yaml", + "yaml" }, highlight = { @@ -41,7 +42,5 @@ return { use_languagetree = true, }, - indent = { - enable = true, - }, + indent = { enable = true }, } diff --git a/nvim/lua/configs/ufo.lua b/nvim/lua/configs/ufo.lua index f542c31..2f54ac3 100644 --- a/nvim/lua/configs/ufo.lua +++ b/nvim/lua/configs/ufo.lua @@ -1,19 +1,21 @@ -vim.o.foldcolumn = '1' -vim.o.foldlevel = 99 +vim.o.foldcolumn = '1' -- '0' is not bad +vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value vim.o.foldlevelstart = 99 vim.o.foldenable = true +-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself vim.keymap.set('n', 'zR', require('ufo').openAllFolds) vim.keymap.set('n', 'zM', require('ufo').closeAllFolds) -vim.keymap.set('n', 'zP', function () +vim.keymap.set('n', 'zK', function() local winid = require('ufo').peekFoldedLinesUnderCursor() if not winid then vim.lsp.buf.hover() end -end, {desc = "Peek folder"}) +end, {desc = "Peek Fold"}) require("ufo").setup({ - provider_selector = function (bufnr, filetype, buftype) + provider_selector = function(bufnr, filetype, buftype) return { 'lsp', 'indent' } end }) + diff --git a/nvim/lua/custom/darcula.lua b/nvim/lua/custom/darcula.lua new file mode 100644 index 0000000..2f337f4 --- /dev/null +++ b/nvim/lua/custom/darcula.lua @@ -0,0 +1,804 @@ +---@class Config +local config = { + opt = { + integrations = { + telescope = false, + lualine = true, + lsp_semantics_token = true, + nvim_cmp = true, + dap_nvim = true, + }, + }, +} + +---@class MyModule +local M = {} + +---@type Config +M.config = config + +local color = { + green = "#98be65", + red = "#f43753", + grey = "#C9D0D3", + light_blue = "#b3deef", + background = "#383838", + pale_gold = "#d3b987", + dark = "#2B2B2B", + bright_sky = "#73cef4", + golden_yellow = "#ffc24b", + light_olive_green = "#c9d05c", + medium_gray = "#4c4c4c", + light_brown = "#dc9656", + silver_gray = "#b8b8b8", + bright_cyan = "#00f1f5", + light_slate_gray = "#abb2bf", + dark_grey = "#484848", + comment = "#808080", + light_lime_green = "#a9ff68", + peach_orange = "#ff9e64", + slate_gray = "#6d8086", + light_lavender = "#cba6f7", + very_light_gray = "#eeeeee", + dark_charcoal_gray = "#404040", + very_dark_gray = "#242424", + bright_pink = "#f70067", + burnt_orange = "#CC7832", + dark_maroon = "#7a1b29", + steel_blue = "#596f77", + bright_yellow_green = "#e3e346", + copper_brown = "#C07C41", + deep_fuchsia = "#b33076", + lavender = "#9876AA", + deep_light_blue = "#51afef", + pale_taupe = "#AD9E7D", + olive_green = "#6A8759", + _52 = "#c95942", + _54 = "#bf4537", + _64 = "#89d957", + _70 = "#4dd158", + _66 = "#6FAFBD", + _71 = "#4B4E4F", + _74 = "#3C3F40", + _38 = "#881515", + _39 = "#73797e", + _47 = "#f7bb3b", + _50 = "#d1d4cf", + _53 = "#c955ae", + _55 = "#b8733e", + _56 = "#afd700", + _57 = "#ad475f", + _58 = "#FFC66D", + _61 = "#AFBF7E", + _68 = "#6897BB", + _72 = "#4682b4", + _75 = "#392a52", + _82 = "#151838", +} + +---@param args Config? +-- you can define your setup function here. Usually configurations can be merged, accepting outside params and +-- you can also put some validation here for those. +M.setup = function(args) + M.config = vim.tbl_deep_extend("force", M.config, args or {}) + if vim.g.colors_name ~= nil then + vim.cmd("highlight clear") + end + + if args and type(args.override) == "function" then + c = args.override(color) + color = vim.tbl_deep_extend("force", color, c) + end + + -- neovim version should be higher than 0.8.3 + if vim.fn.has("nvim-0.8.3") == 0 then + vim.cmd( + "echohl WarningMsg | echo 'Your neovim version is lower than 0.8.3, some features may not work correctly!' | echohl None" + ) + end + + vim.g.colors_name = "darcula-dark" + vim.o.termguicolors = true + M.configure_highlights() +end + +M.configure_highlights = function() + -- colors + -- Highlight groups + local hi = vim.api.nvim_set_hl + + if M.config.opt.integrations.lsp_semantics_token then + -- lsp semantics token + hi(0, "@attribute", { link = "TSAttribute" }) + hi(0, "@boolean", { link = "TSBoolean" }) + hi(0, "@character", { link = "TSCharacter" }) + hi(0, "@character.special", { link = "SpecialChar" }) + hi(0, "@class", { link = "TSType" }) + hi(0, "@comment", { link = "TSComment" }) + hi(0, "@conditional", { link = "TSConditional" }) + hi(0, "@constant", { link = "TSConstant" }) + hi(0, "@constant.builtin", { link = "TSConstantBuiltin" }) + hi(0, "@constant.macro", { link = "TSConstant" }) + hi(0, "@constructor", { link = "TSConstructor" }) + hi(0, "@decorator", { link = "Identifier" }) + hi(0, "@enum", { link = "TSType" }) + hi(0, "@enumMember", { link = "Constant" }) + hi(0, "@error", { link = "TSError" }) + hi(0, "@event", { link = "Identifier" }) + hi(0, "@exception", { link = "TSException" }) + hi(0, "@field", { link = "TSField" }) + hi(0, "@float", { link = "TSFloat" }) + hi(0, "@function", { link = "TSFunction" }) + hi(0, "@function.builtin", { link = "TSFuncBuiltin" }) + hi(0, "@function.call", { link = "TSFunctionCall" }) + hi(0, "@function.macro", { link = "TSFuncMacro" }) + hi(0, "@include", { link = "TSInclude" }) + hi(0, "@interface", { link = "Structure" }) + hi(0, "@keyword", { link = "TSKeyword" }) + hi(0, "@keyword.function", { link = "TSKeywordFunction" }) + hi(0, "@keyword.operator", { link = "TSKeywordOperator" }) + hi(0, "@keyword.return", { link = "TSKeyword" }) + hi(0, "@label", { link = "TSLabel" }) + hi(0, "@method", { link = "TSMethod" }) + hi(0, "@method.call", { link = "TSMethodCall" }) + hi(0, "@modifier", { link = "Identifier" }) + hi(0, "@namespace", { link = "TSNamespace" }) + hi(0, "@none", { link = "TSNone" }) + hi(0, "@number", { link = "TSNumber" }) + hi(0, "@operator", { link = "TSOperator" }) + hi(0, "@parameter", { link = "TSParameter" }) + hi(0, "@property", { link = "TSVariable" }) + hi(0, "@punctuation.bracket", { link = "TSPunctBracket" }) + hi(0, "@punctuation.delimiter", { link = "TSPunctDelimiter" }) + hi(0, "@punctuation.special", { link = "TSPunctSpecial" }) + hi(0, "@regexp", { link = "TSStringRegex" }) + hi(0, "@repeat", { link = "TSRepeat" }) + hi(0, "@string", { link = "TSString" }) + hi(0, "@string.escape", { link = "TSStringEscape" }) + hi(0, "@string.regex", { link = "TSStringRegex" }) + hi(0, "@string.special", { link = "SpecialChar" }) + hi(0, "@struct", { link = "TSType" }) + hi(0, "@symbol", { link = "TSSymbol" }) + hi(0, "@tag", { link = "TSTag" }) + hi(0, "@tag.attribute", { link = "TSAttribute" }) + hi(0, "@tag.delimiter", { link = "TSTagDelimiter" }) + hi(0, "@text", { link = "TSText" }) + hi(0, "@text.danger", { link = "DiagnosticError" }) + hi(0, "@text.emphasis", { link = "TSEmphasis" }) + hi(0, "@text.environment", { link = "Macro" }) + hi(0, "@text.environment.name", { link = "Type" }) + hi(0, "@text.literal", { link = "TSLiteral" }) + hi(0, "@text.math", { link = "Number" }) + hi(0, "@text.note", { link = "Tag" }) + hi(0, "@text.reference", { link = "TSParameterReference" }) + hi(0, "@text.strike", { link = "TSStrike" }) + hi(0, "@text.strong", { link = "TSStrong" }) + hi(0, "@text.title", { link = "TSTitle" }) + hi(0, "@text.todo", { link = "Todo" }) + hi(0, "@text.underline", { link = "TSUnderline" }) + hi(0, "@text.uri", { link = "TSURI" }) + hi(0, "@text.warning", { link = "DiagnosticWarn" }) + hi(0, "@type", { link = "TSType" }) + hi(0, "@type.builtin", { link = "TSTypeBuiltin" }) + hi(0, "@type.definition", { link = "TSTypeDefinition" }) + hi(0, "@type.qualifier", { link = "TSType" }) + hi(0, "@typeParameter", { link = "Type" }) + hi(0, "@variable", { link = "TSVariable" }) + hi(0, "@variable.builtin", { link = "TSVariableBuiltin" }) + hi(0, "@lsp.type.namespace", { link = "TSNamespace" }) + hi(0, "@lsp.type.variable", { link = "TSVariable" }) + hi(0, "@lsp.type.parameter", { link = "TSVariable" }) + hi(0, "@lsp.typemod.variable.readonly", { link = "TSConstant" }) + hi(0, "@lsp.type.type", { link = "TSType" }) + hi(0, "@lsp.type.function", {}) + hi(0, "@lsp.type.method", {}) + hi(0, "@lsp.type.comment", {}) + hi(0, "@lsp.typemod.variable.defaultLibrary", { link = "TSKeyword" }) + hi(0, "@lsp.mod.defaultLibrary.go", { link = "TSKeyword" }) + hi(0, "@lsp.type.property", { link = "TSField" }) + hi(0, "@tag.attribute.tsx", { link = "TSParameter" }) + hi(0, "@tag.attribute.javascript", { link = "TSParameter" }) + end + + hi(0, "Bold", { bold = true }) + hi(0, "Boolean", { fg = color.light_brown }) + hi(0, "Character", { fg = color.red }) + + -- nvim-cmp + if M.config.opt.integrations.nvim_cmp then + hi(0, "Pmenu", { bg = color._74, ctermbg = 13, ctermfg = 0 }) + hi(0, "PmenuSel", { bg = color._71, ctermbg = 0, ctermfg = 242 }) + hi(0, "CmpDocumentation", { fg = color.grey }) + hi(0, "CmpDocumentationBorder", { fg = color.grey }) + hi(0, "CmpItemAbbr", { fg = color.grey }) + hi(0, "CmpItemAbbrDefault", { fg = color.grey }) + hi(0, "CmpItemAbbrDeprecated", { fg = color.medium_gray, strikethrough = true }) + hi(0, "CmpItemAbbrDeprecatedDefault", { fg = color.medium_gray }) + hi(0, "CmpItemAbbrMatch", { fg = color.light_blue }) + hi(0, "CmpItemAbbrMatchDefault", { fg = color.grey }) + hi(0, "CmpItemAbbrMatchFuzzy", { fg = color.light_blue }) + hi(0, "CmpItemAbbrMatchFuzzyDefault", { fg = color.grey }) + hi(0, "CmpItemKindClass", { fg = color.golden_yellow }) + hi(0, "CmpItemKindClassDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindColorDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindConstant", { fg = color.light_brown }) + hi(0, "CmpItemKindConstantDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindConstructor", { fg = color.light_blue }) + hi(0, "CmpItemKindConstructorDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindDefault", { fg = color.bright_sky }) + hi(0, "CmpItemKindEnum", { fg = color.golden_yellow }) + hi(0, "CmpItemKindEnumDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindEnumMember", { fg = color.golden_yellow }) + hi(0, "CmpItemKindEnumMemberDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindEvent", { fg = color.golden_yellow }) + hi(0, "CmpItemKindEventDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindField", { fg = color.red }) + hi(0, "CmpItemKindFieldDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindFileDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindFolderDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindFunction", { fg = color.light_blue }) + hi(0, "CmpItemKindFunctionDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindInterface", { fg = color.golden_yellow }) + hi(0, "CmpItemKindInterfaceDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindKeyword", { fg = color.pale_gold }) + hi(0, "CmpItemKindKeywordDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindMethod", { fg = color.light_blue }) + hi(0, "CmpItemKindMethodDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindModule", { fg = color.grey }) + hi(0, "CmpItemKindModuleDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindOperator", { fg = color.grey }) + hi(0, "CmpItemKindOperatorDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindProperty", { fg = color.red }) + hi(0, "CmpItemKindPropertyDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindReference", { fg = color.red }) + hi(0, "CmpItemKindReferenceDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindSnippet", { fg = color.silver_gray }) + hi(0, "CmpItemKindSnippetDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindStruct", { fg = color.golden_yellow }) + hi(0, "CmpItemKindStructDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindTextDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindTypeParameter", { fg = color.golden_yellow }) + hi(0, "CmpItemKindTypeParameterDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindUnit", { fg = color.golden_yellow }) + hi(0, "CmpItemKindUnitDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindValue", { fg = color.light_brown }) + hi(0, "CmpItemKindValueDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemKindVariable", { fg = color.red }) + hi(0, "CmpItemKindVariableDefault", { link = "CmpItemKind" }) + hi(0, "CmpItemMenu", { fg = color.silver_gray }) + hi(0, "CmpItemMenuDefault", { fg = color.grey }) + hi(0, "ColorColumn", { bg = color.background, ctermbg = 1 }) + hi(0, "Comment", { ctermfg = 14 }) + hi(0, "Conceal", { ctermbg = 242, ctermfg = 7, fg = color.light_blue }) + hi(0, "Conditional", { fg = color.pale_gold }) + end + -- conflict-marker.vim + + hi(0, "Constant", { ctermfg = 13, fg = color.light_brown }) + + -- copilot.vim + hi(0, "CopilotSuggestion", { ctermfg = 244, fg = color.comment }) + + -- cursor + hi(0, "Cursor", { bg = color.very_light_gray, fg = color.dark }) + hi(0, "CursorColumn", { bg = color.background, ctermbg = 242 }) + hi(0, "CursorLine", { bg = color.background }) + hi(0, "CursorLineNr", { bg = color.background, bold = true, ctermfg = 11, fg = color.silver_gray }) + + -- dap.nvim + if M.config.opt.integrations.dap_nvim then + hi(0, "DapUIBreakpointsCurrentLine", { bold = true, fg = color.light_lime_green }) + hi(0, "DapUIBreakpointsDisabledLine", { fg = color.dark_grey }) + hi(0, "DapUIBreakpointsInfo", { fg = color.light_lime_green }) + hi(0, "DapUIBreakpointsPath", { fg = color.bright_cyan }) + hi(0, "DapUIDecoration", { fg = color.bright_cyan }) + hi(0, "DapUIFloatBorder", { fg = color.bright_cyan }) + hi(0, "DapUILineNumber", { fg = color.bright_cyan }) + hi(0, "DapUIModifiedValue", { bold = true, fg = color.bright_cyan }) + hi(0, "DapUIPlayPause", { fg = color.light_lime_green }) + hi(0, "DapUIPlayPauseNC", { fg = color.light_lime_green }) + hi(0, "DapUIRestart", { fg = color.light_lime_green }) + hi(0, "DapUIRestartNC", { fg = color.light_lime_green }) + hi(0, "DapUIScope", { fg = color.bright_cyan }) + hi(0, "DapUISource", { fg = color.light_lavender }) + hi(0, "DapUIStepBack", { fg = color.bright_cyan }) + hi(0, "DapUIStepBackNC", { fg = color.bright_cyan }) + hi(0, "DapUIStepInto", { fg = color.bright_cyan }) + hi(0, "DapUIStepIntoNC", { fg = color.bright_cyan }) + hi(0, "DapUIStepOut", { fg = color.bright_cyan }) + hi(0, "DapUIStepOutNC", { fg = color.bright_cyan }) + hi(0, "DapUIStepOver", { fg = color.bright_cyan }) + hi(0, "DapUIStepOverNC", { fg = color.bright_cyan }) + hi(0, "DapUIStop", { fg = color.bright_pink }) + hi(0, "DapUIStopNC", { fg = color.bright_pink }) + hi(0, "DapUIStoppedThread", { fg = color.bright_cyan }) + hi(0, "DapUIThread", { fg = color.light_lime_green }) + hi(0, "DapUIType", { fg = color.light_lavender }) + hi(0, "DapUIUnavailable", { fg = color.dark_grey }) + hi(0, "DapUIUnavailableNC", { fg = color.dark_grey }) + hi(0, "DapUIWatchesEmpty", { fg = color.bright_pink }) + hi(0, "DapUIWatchesError", { fg = color.bright_pink }) + hi(0, "DapUIWatchesValue", { fg = color.light_lime_green }) + end + hi(0, "Debug", { fg = color.red }) + hi(0, "Define", { fg = color.pale_gold }) + hi(0, "DefinitionArrow", { fg = color._57 }) + hi(0, "DefinitionBorder", { fg = color.light_blue }) + hi(0, "DefinitionFile", { bg = color._82 }) + hi(0, "Definitions", { bold = true, fg = color.light_lavender }) + hi(0, "DefinitionsIcon", { fg = color.bright_yellow_green }) + hi(0, "Delimiter", { fg = color.light_brown }) + hi(0, "DiagnosticError", { ctermfg = 1, fg = color.red }) + hi(0, "DiagnosticHint", { ctermfg = 7, fg = color.bright_sky }) + hi(0, "DiagnosticInfo", { ctermfg = 4, fg = color.grey }) + hi(0, "DiagnosticLineCol", { fg = color._39 }) + hi(0, "DiagnosticMap", { fg = color.light_lavender }) + hi(0, "DiagnosticQuickFix", { bold = true, fg = color._70 }) + hi(0, "DiagnosticUnderlineError", { sp = color.red, undercurl = true }) + hi(0, "DiagnosticUnderlineHint", { sp = color.bright_sky, undercurl = true }) + hi(0, "DiagnosticUnderlineInformation", { sp = color.light_brown, undercurl = true }) + hi(0, "DiagnosticUnderlineWarn", { sp = color.pale_gold, undercurl = true }) + hi(0, "DiagnosticUnderlineWarning", { sp = color.pale_gold, undercurl = true }) + hi(0, "DiagnosticWarn", { ctermfg = 3, fg = color.pale_gold }) + -- hi(0, "DiffAdd", { ctermbg = 4, fg = color._05 }) + -- hi(0, "DiffAdded", { fg = color._05 }) + -- hi(0, "DiffChange", { ctermbg = 5, fg = color._07 }) + -- hi(0, "DiffDelete", { bold = true, ctermbg = 6, ctermfg = 12, fg = color.red }) + -- hi(0, "DiffFile", { fg = color.red }) + -- hi(0, "DiffLine", { fg = color.light_blue }) + -- hi(0, "DiffNewFile", { fg = color._05 }) + -- hi(0, "DiffRemoved", { fg = color.red }) + -- hi(0, "DiffText", { bold = true, ctermbg = 9, fg = color.light_blue }) + hi(0, "Directory", { ctermfg = 159, fg = color.light_blue }) + hi(0, "Error", { bg = color.red, ctermbg = 9, ctermfg = 15, fg = color.dark }) + hi(0, "ErrorMsg", { ctermbg = 1, ctermfg = 15, fg = color.red }) + hi(0, "Exception", { fg = color.red }) + hi(0, "EyelinerDimmed", { fg = color.medium_gray }) + hi(0, "EyelinerPrimary", { fg = color.light_brown }) + hi(0, "EyelinerSecondary", { fg = color.pale_gold }) + hi(0, "FinderParam", { bg = color._75, bold = true, fg = color.light_lavender }) + hi(0, "FinderSpinner", { bold = true, fg = color.deep_fuchsia }) + hi(0, "FinderSpinnerBorder", { fg = color.deep_light_blue }) + hi(0, "FinderSpinnerTitle", { bold = true, fg = color.deep_fuchsia }) + hi(0, "FinderVirtText", { fg = color._52 }) + hi(0, "Float", { fg = color.light_brown }) + hi(0, "FloatBorder", { fg = color.grey }) + hi(0, "FocusedSymbol", { bg = color.background, fg = color.light_olive_green }) + hi(0, "FoldColumn", { ctermbg = 242 }) + hi(0, "Folded", { bg = color.background, ctermbg = 242 }) + hi(0, "Function", { fg = color.light_blue }) + hi(0, "GitGutterAdd", { bg = color.dark, fg = color.light_olive_green }) + hi(0, "GitGutterChange", { bg = color.dark, fg = color.light_blue }) + hi(0, "GitGutterChangeDelete", { bg = color.dark, fg = color.pale_gold }) + hi(0, "GitGutterDelete", { bg = color.dark, fg = color.red }) + hi(0, "GitSignsStagedAdd", { bg = color.dark, fg = color.green }) + hi(0, "GitSignsStagedAddLn", { bg = color.dark, fg = color.green }) + hi(0, "GitSignsStagedAddNr", { bg = color.dark, fg = color.green }) + hi(0, "GitSignsStagedChange", { bg = color.dark, fg = color.steel_blue }) + hi(0, "GitSignsStagedChangeLn", { bg = color.dark, fg = color.very_dark_gray }) + hi(0, "GitSignsStagedChangeNr", { bg = color.dark, fg = color.steel_blue }) + hi(0, "GitSignsStagedChangedelete", { bg = color.dark, fg = color.steel_blue }) + hi(0, "GitSignsStagedChangedeleteLn", { bg = color.dark, fg = color.very_dark_gray }) + hi(0, "GitSignsStagedChangedeleteNr", { bg = color.dark, fg = color.steel_blue }) + hi(0, "GitSignsStagedDelete", { bg = color.dark, fg = color.dark_maroon }) + hi(0, "GitSignsStagedDeleteNr", { bg = color.dark, fg = color.dark_maroon }) + hi(0, "GitSignsStagedTopdelete", { bg = color.dark, fg = color.dark_maroon }) + hi(0, "GitSignsStagedTopdeleteNr", { bg = color.dark, fg = color.dark_maroon }) + hi(0, "HopNextKey", { bold = true, ctermfg = 198, fg = color.bright_pink }) + hi(0, "HopNextKey1", { bold = true, ctermfg = 45, fg = color.bright_cyan }) + hi(0, "HopNextKey2", { ctermfg = 33, fg = color.bright_cyan }) + hi(0, "HopPreview", { link = "IncSearch" }) + hi(0, "HopUnmatched", { ctermfg = 242, fg = color.slate_gray, sp = color.slate_gray }) + hi(0, "Identifier", { ctermfg = 14, fg = color.red }) + hi(0, "Ignore", { ctermfg = 0, fg = color.dark }) + -- hi(0, "IlluminatedWordRead", { sp = color._09, underline = true }) + -- hi(0, "IlluminatedWordText", { sp = color._09, underline = true }) + -- hi(0, "IlluminatedWordWrite", { sp = color._09, underline = true }) + hi(0, "Implements", { bold = true, fg = color.light_lavender }) + hi(0, "ImplementsIcon", { fg = color.bright_yellow_green }) + hi(0, "IncSearch", { bg = color.light_brown, fg = color.background }) + hi(0, "Include", { fg = color.copper_brown }) + hi(0, "IndentBlanklineChar", { fg = color.dark_grey, nocombine = true }) + hi(0, "IndentBlanklineContextChar", { fg = color.silver_gray, nocombine = true }) + hi(0, "IndentBlanklineContextStart", { sp = color.golden_yellow, underline = true }) + hi(0, "IndentBlanklineSpaceChar", { ctermfg = 12, fg = color.medium_gray, nocombine = true }) + hi(0, "IndentBlanklineSpaceCharBlankline", { ctermfg = 12, fg = color.medium_gray, nocombine = true }) + hi(0, "Keyword", { fg = color.pale_gold }) + hi(0, "LSOutlinePreviewBorder", { fg = color.green }) + hi(0, "Label", { fg = color.golden_yellow }) + hi(0, "LineNr", { ctermfg = 11, fg = color.silver_gray }) + hi(0, "LspDiagnosticsDefaultError", { link = "DiagnosticError" }) + hi(0, "LspDiagnosticsDefaultHint", { link = "DiagnosticHint" }) + hi(0, "LspDiagnosticsDefaultInformation", { link = "DiagnosticInfo" }) + hi(0, "LspDiagnosticsDefaultWarning", { link = "DiagnosticWarn" }) + hi(0, "LspDiagnosticsUnderlineError", { link = "DiagnosticUnderlineError" }) + hi(0, "LspDiagnosticsUnderlineHint", { link = "DiagnosticUnderlineHint" }) + hi(0, "LspDiagnosticsUnderlineInformation", { link = "DiagnosticUnderlineInformation" }) + hi(0, "LspDiagnosticsUnderlineWarning", { link = "DiagnosticUnderlineWarning" }) + hi(0, "LspReferenceRead", { sp = color.silver_gray, underline = true }) + hi(0, "LspReferenceText", { sp = color.silver_gray, underline = true }) + hi(0, "LspReferenceWrite", { sp = color.silver_gray, underline = true }) + hi(0, "LspSagaAutoPreview", { fg = color.deep_light_blue }) + hi(0, "LspSagaCodeActionBorder", { fg = color.light_lavender }) + hi(0, "LspSagaCodeActionContent", { bold = true, fg = color.green }) + hi(0, "LspSagaCodeActionTitle", { bold = true, fg = color.burnt_orange }) + hi(0, "LspSagaDiagnosticBorder", { fg = color.light_lavender }) + hi(0, "LspSagaDiagnosticHeader", { fg = color._56 }) + hi(0, "LspSagaFinderSelection", { bold = true, fg = color._64 }) + hi(0, "LspSagaHoverBorder", { fg = color._47 }) + hi(0, "LspSagaLspFinderBorder", { fg = color.deep_light_blue }) + hi(0, "LspSagaRenameBorder", { fg = color.bright_cyan }) + hi(0, "LspSagaSignatureHelpBorder", { fg = color.green }) + hi(0, "Macro", { fg = color.red }) + hi(0, "MatchParen", { fg = color.bright_cyan, bold = true }) + hi(0, "ModeMsg", { bold = true, fg = color.light_olive_green }) + hi(0, "MoreMsg", { bold = true, ctermfg = 121, fg = color.light_olive_green }) + hi(0, "NERDTreeFile", { fg = color.grey }) + hi(0, "NERDTreeCWD", { fg = color.grey }) + hi(0, "NERDTreeGitStatusIgnored", { ctermfg = 81, fg = color.medium_gray }) + hi(0, "NERDTreeGitStatusModified", { ctermfg = 224, fg = color.bright_sky }) + hi(0, "NERDTreeGitStatusRenamed", { ctermfg = 225, fg = color.light_blue }) + hi(0, "NERDTreeGitStatusUntracked", { ctermfg = 14, fg = color.medium_gray }) + hi(0, "NonText", { bold = true, ctermfg = 12, fg = color.medium_gray }) + hi(0, "Normal", { bg = color.dark, fg = color.grey }) + hi(0, "NormalFloat", { fg = color.grey }) + hi(0, "NormalNC", { fg = color.grey }) + hi(0, "NotifyDEBUGBody", { link = "Normal" }) + hi(0, "NotifyDEBUGBorder", { fg = color.bright_sky }) + hi(0, "NotifyDEBUGIcon", { fg = color.bright_sky }) + hi(0, "NotifyDEBUGTitle", { fg = color.bright_sky }) + hi(0, "NotifyERRORBody", { link = "Normal" }) + hi(0, "NotifyERRORBorder", { fg = color.red }) + hi(0, "NotifyERRORIcon", { fg = color.red }) + hi(0, "NotifyERRORTitle", { fg = color.red }) + hi(0, "NotifyINFOBody", { link = "Normal" }) + hi(0, "NotifyINFOBorder", { fg = color.grey }) + hi(0, "NotifyINFOIcon", { fg = color.grey }) + hi(0, "NotifyINFOTitle", { fg = color.grey }) + hi(0, "NotifyTRACEBody", { link = "Normal" }) + hi(0, "NotifyTRACEBorder", { fg = color.bright_sky }) + hi(0, "NotifyTRACEIcon", { fg = color.bright_sky }) + hi(0, "NotifyTRACETitle", { fg = color.bright_sky }) + hi(0, "NotifyWARNBody", { link = "Normal" }) + hi(0, "NotifyWARNBorder", { fg = color.pale_gold }) + hi(0, "NotifyWARNIcon", { fg = color.pale_gold }) + hi(0, "NotifyWARNTitle", { fg = color.pale_gold }) + hi(0, "Number", { fg = color.light_brown }) + hi(0, "NvimInternalError", { bg = color.red, ctermbg = 9, ctermfg = 9, fg = color.dark }) + hi(0, "Operator", { fg = color.grey }) + hi(0, "OutlineDetail", { fg = color._39 }) + hi(0, "OutlineFoldPrefix", { fg = color._54 }) + hi(0, "OutlineIndentEvn", { fg = color._53 }) + hi(0, "OutlineIndentOdd", { fg = color._55 }) + hi(0, "PreProc", { ctermfg = 81, fg = color.golden_yellow }) + hi(0, "Question", { bold = true, ctermfg = 121, fg = color.light_blue }) + hi(0, "QuickFixLine", { bg = color.background }) + hi(0, "References", { bold = true, fg = color.light_lavender }) + hi(0, "ReferencesIcon", { fg = color.bright_yellow_green }) + hi(0, "Repeat", { fg = color.golden_yellow }) + hi(0, "SagaShadow", { fg = color.dark }) + hi(0, "ScrollbarCursor", { ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarCursorHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarError", { ctermfg = 0, fg = color.red }) + hi(0, "ScrollbarErrorHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.red }) + hi(0, "ScrollbarGitAdd", { ctermfg = 0, fg = color.green }) + hi(0, "ScrollbarGitAddHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.green }) + hi(0, "ScrollbarGitChange", { ctermfg = 0, fg = color.bright_yellow_green }) + hi( + 0, + "ScrollbarGitChangeHandle", + { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.bright_yellow_green } + ) + hi(0, "ScrollbarGitDelete", { ctermfg = 0, fg = color.red }) + hi(0, "ScrollbarGitDeleteHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.red }) + hi(0, "ScrollbarHandle", { bg = color.background, ctermbg = 15 }) + hi(0, "ScrollbarHint", { ctermfg = 0, fg = color.bright_sky }) + hi(0, "ScrollbarHintHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.bright_sky }) + hi(0, "ScrollbarInfo", { ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarInfoHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarMisc", { ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarMiscHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.grey }) + hi(0, "ScrollbarSearch", { ctermfg = 0, fg = color.background }) + hi(0, "ScrollbarSearchHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.background }) + hi(0, "ScrollbarWarn", { ctermfg = 0, fg = color.pale_gold }) + hi(0, "ScrollbarWarnHandle", { bg = color.background, ctermbg = 15, ctermfg = 0, fg = color.pale_gold }) + hi(0, "Search", { bg = color.golden_yellow, ctermbg = 11, ctermfg = 0, fg = color.background }) + hi(0, "SignColumn", { ctermbg = 242, ctermfg = 14, fg = color.silver_gray }) + hi(0, "SniprunFloatingWinErr", { ctermfg = 1, fg = color._38 }) + hi(0, "SniprunFloatingWinOk", { ctermfg = 14, fg = color.bright_cyan }) + hi(0, "SniprunVirtualTextErr", { bg = color._38, ctermbg = 1, fg = color.dark }) + hi(0, "SniprunVirtualTextOk", { bg = color.bright_cyan, ctermbg = 14, fg = color.dark }) + hi(0, "Special", { ctermfg = 224, fg = color.bright_sky }) + hi(0, "SpecialChar", { fg = color.light_brown }) + hi(0, "SpecialKey", { ctermfg = 81, fg = color.medium_gray }) + hi(0, "SpellBad", { ctermbg = 9, sp = color.red, undercurl = true }) + hi(0, "SpellCap", { ctermbg = 12, sp = color.light_blue, undercurl = true }) + hi(0, "SpellLocal", { ctermbg = 14, sp = color.bright_sky, undercurl = true }) + hi(0, "SpellRare", { ctermbg = 13, sp = color.pale_gold, undercurl = true }) + hi(0, "Statement", { bold = true, ctermfg = 11, fg = color.red }) + hi(0, "StatusLine", { bg = color.dark_grey, fg = color.grey }) + hi(0, "StatusLineNC", { bg = color.background, fg = color.silver_gray }) + hi(0, "StorageClass", { fg = color.golden_yellow }) + hi(0, "String", { fg = color.light_olive_green }) + hi(0, "Structure", { fg = color.pale_gold }) + hi(0, "Substitute", { bg = color.golden_yellow, fg = color.background }) + hi(0, "SymbolsOutlineConnector", { fg = color.medium_gray }) + hi(0, "TSAnnotation", { fg = color.light_brown }) + hi(0, "TSAttribute", { fg = color.golden_yellow }) + hi(0, "TSBoolean", { fg = color.light_brown }) + hi(0, "TSCharacter", { fg = color.red }) + hi(0, "TSComment", { fg = color.comment, italic = true }) + hi(0, "GitSignsCurrentLineBlame", { fg = color.comment, italic = true }) + hi(0, "TSConditional", { fg = color.burnt_orange }) + hi(0, "TSConstBuiltin", { fg = color.light_brown, italic = true }) + hi(0, "TSMethodCall", { fg = color.pale_taupe }) + hi(0, "TSFunctionCall", { fg = color.pale_taupe }) + hi(0, "TSConstMacro", { fg = color.red }) + hi(0, "TSConstant", { fg = color.lavender }) + hi(0, "TSConstructor", { fg = color.light_blue }) + hi(0, "TSCurrentScope", { bold = true }) + hi(0, "TSDefinition", { sp = color.silver_gray, underline = true }) + hi(0, "TSDefinitionUsage", { sp = color.silver_gray, underline = true }) + hi(0, "TSEmphasis", { fg = color.light_brown, italic = true }) + hi(0, "TSError", { fg = color.red }) + hi(0, "TSException", { fg = color.red }) + hi(0, "TSField", { fg = color.grey }) + hi(0, "TSFloat", { fg = color.light_brown }) + hi(0, "TSFuncBuiltin", { fg = color.burnt_orange, italic = true }) + hi(0, "TSFuncMacro", { fg = color.red }) + hi(0, "TSFunction", { fg = color._58 }) + hi(0, "TSInclude", { fg = color.copper_brown }) + hi(0, "TSKeyword", { fg = color.burnt_orange }) + hi(0, "TSKeywordFunction", { fg = color.burnt_orange }) + hi(0, "TSKeywordOperator", { fg = color.pale_gold }) + hi(0, "TSLabel", { fg = color.lavender }) + hi(0, "TSLiteral", { fg = color.light_brown }) + hi(0, "TSMethod", { fg = color.pale_gold }) + hi(0, "TSNamespace", { fg = color._61 }) + hi(0, "TSNone", { fg = color.grey }) + hi(0, "TSNumber", { fg = color._68 }) + hi(0, "TSConstantBuiltin", { fg = color.copper_brown }) + hi(0, "TSOperator", { fg = color.grey }) + hi(0, "TSParameter", { fg = color.grey }) + hi(0, "TSParameterReference", { fg = color.grey }) + hi(0, "TSProperty", { fg = color.pale_gold }) + hi(0, "TSPunctBracket", { fg = color.grey }) + hi(0, "TSPunctDelimiter", { fg = color.light_brown }) + hi(0, "TSPunctSpecial", { fg = color.grey }) + hi(0, "TSRepeat", { fg = color.pale_gold }) + hi(0, "TSStrike", { fg = color.dark, strikethrough = true }) + hi(0, "TSString", { fg = color.olive_green }) + hi(0, "TSStringEscape", { fg = color.bright_sky }) + hi(0, "TSStringRegex", { fg = color.bright_sky }) + hi(0, "TSStrong", { bold = true }) + hi(0, "TSSymbol", { fg = color.light_olive_green }) + hi(0, "TSTag", { fg = color.golden_yellow }) + hi(0, "TSTagDelimiter", { fg = color.light_brown }) + hi(0, "TSText", { fg = color.grey }) + hi(0, "TSTitle", { fg = color.light_blue }) + hi(0, "TSType", { fg = color._66 }) + + hi(0, "TSTypeDefinition", { fg = color.grey }) + hi(0, "TSTypeBuiltin", { fg = color.burnt_orange, italic = true }) + hi(0, "TSURI", { fg = color.light_brown, underline = true }) + hi(0, "TSUnderline", { fg = color.dark, underline = true }) + hi(0, "TSVariable", { fg = color.grey }) + hi(0, "TSVariableBuiltin", { fg = color.burnt_orange, italic = true }) + hi(0, "TabLine", { bg = color.background, ctermbg = 242, ctermfg = 15, fg = color.medium_gray }) + hi(0, "TabLineFill", { bg = color.background, fg = color.medium_gray }) + hi(0, "TabLineSel", { bg = color.background, fg = color.light_olive_green }) + hi(0, "Tag", { fg = color.golden_yellow }) + hi(0, "TargetFileName", { fg = color._50 }) + -- telescope + if M.config.opt.integrations.telescope then + hi(0, "TelescopeBorder", { bg = color.very_dark_gray, fg = color.very_dark_gray }) + hi(0, "TelescopeNormal", { bg = color.very_dark_gray }) + hi(0, "TelescopePreviewLine", { bg = color.background }) + hi(0, "TelescopePreviewTitle", { bg = color.light_olive_green, fg = color.very_dark_gray }) + hi(0, "TelescopePromptBorder", { bg = color.dark_charcoal_gray, fg = color.dark_charcoal_gray }) + hi(0, "TelescopePromptNormal", { bg = color.dark_charcoal_gray, fg = color.grey }) + hi(0, "TelescopePromptPrefix", { bg = color.dark_charcoal_gray, fg = color.red }) + hi(0, "TelescopePromptTitle", { bg = color.red, fg = color.very_dark_gray }) + hi(0, "TelescopeResultsTitle", { bg = color.very_dark_gray, fg = color.very_dark_gray }) + hi(0, "TelescopeSelection", { bg = color.dark_charcoal_gray }) + end + + hi(0, "TermCursor", { bg = color.very_light_gray, fg = color.dark }) + hi(0, "TermCursorNC", { bg = color.very_light_gray, fg = color.dark }) + hi(0, "Title", { ctermfg = 225, fg = color.light_blue }) + hi(0, "Todo", { bg = color.background, ctermbg = 11, ctermfg = 0, fg = color.golden_yellow }) + hi(0, "TooLong", { fg = color.red }) + hi(0, "TreesitterContext", { bg = color.background, italic = true }) + hi(0, "Type", { ctermfg = 121, fg = color._66 }) + hi(0, "Typedef", { fg = color.golden_yellow }) + hi(0, "Underlined", { ctermfg = 81, fg = color.red, underline = true }) + hi(0, "User1", { bg = color.dark_grey, fg = color.red }) + hi(0, "User2", { bg = color.dark_grey, fg = color.pale_gold }) + hi(0, "User3", { bg = color.dark_grey, fg = color.grey }) + hi(0, "User4", { bg = color.dark_grey, fg = color.bright_sky }) + hi(0, "User5", { bg = color.dark_grey, fg = color.grey }) + hi(0, "User6", { bg = color.background, fg = color.grey }) + hi(0, "User7", { bg = color.dark_grey, fg = color.grey }) + hi(0, "User8", { bg = color.dark_grey, fg = color.dark }) + hi(0, "User9", { bg = color.dark_grey, fg = color.dark }) + hi(0, "VertSplit", { fg = color.grey }) + hi(0, "WinSeparator", { fg = color.grey }) + hi(0, "Visual", { bg = color.dark_grey, ctermbg = 242 }) + hi(0, "VisualNOS", { fg = color.red }) + hi(0, "WarningMsg", { ctermfg = 224, fg = color.red }) + hi(0, "WildMenu", { bg = color.golden_yellow, ctermbg = 11, ctermfg = 0, fg = color.red }) + hi(0, "WinBar", { fg = color.grey }) + hi(0, "WinBarNC", { fg = color.silver_gray }) + hi(0, "gitcommitBranch", { bold = true, fg = color.light_brown }) + hi(0, "gitcommitComment", { fg = color.medium_gray }) + hi(0, "gitcommitDiscarded", { fg = color.medium_gray }) + hi(0, "gitcommitDiscardedFile", { bold = true, fg = color.red }) + hi(0, "gitcommitDiscardedType", { fg = color.light_blue }) + hi(0, "gitcommitHeader", { fg = color.pale_gold }) + hi(0, "gitcommitOverflow", { fg = color.red }) + hi(0, "gitcommitSelected", { fg = color.medium_gray }) + hi(0, "gitcommitSelectedFile", { bold = true, fg = color.light_olive_green }) + hi(0, "gitcommitSelectedType", { fg = color.light_blue }) + hi(0, "gitcommitSummary", { fg = color.light_olive_green }) + hi(0, "gitcommitUnmergedFile", { bold = true, fg = color.red }) + hi(0, "gitcommitUnmergedType", { fg = color.light_blue }) + hi(0, "gitcommitUntracked", { fg = color.medium_gray }) + hi(0, "gitcommitUntrackedFile", { fg = color.golden_yellow }) + hi(0, "iCursor", { bg = color._72, fg = color.very_light_gray }) + hi(0, "lCursor", { bg = color.very_light_gray, fg = color.dark }) + + if M.config.opt.integrations.lualine then + hi(0, "lualine_a_command", { bg = color.green, bold = true, fg = color.dark }) + hi(0, "lualine_a_inactive", { bg = color.light_slate_gray, bold = true, fg = color.dark }) + hi(0, "lualine_a_insert", { bg = color.green, bold = true, fg = color.dark }) + hi(0, "lualine_a_normal", { bg = color.green, bold = true, fg = color.dark }) + hi(0, "lualine_a_replace", { bg = color.green, bold = true, fg = color.dark }) + hi(0, "lualine_a_visual", { bg = color.green, bold = true, fg = color.dark }) + hi(0, "lualine_b_command", { bg = color.green, fg = color.dark }) + hi(0, "lualine_b_diagnostics_error_command", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_inactive", { bg = color.light_slate_gray, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_insert", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_normal", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_replace", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_terminal", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_error_visual", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diagnostics_hint_command", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_inactive", { bg = color.light_slate_gray, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_insert", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_normal", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_replace", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_terminal", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_hint_visual", { bg = color.green, fg = color.bright_sky }) + hi(0, "lualine_b_diagnostics_info_command", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_inactive", { bg = color.light_slate_gray, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_insert", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_normal", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_replace", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_terminal", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_info_visual", { bg = color.green, fg = color.grey }) + hi(0, "lualine_b_diagnostics_warn_command", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_inactive", { bg = color.light_slate_gray, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_insert", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_normal", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_replace", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_terminal", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diagnostics_warn_visual", { bg = color.green, fg = color.pale_gold }) + hi(0, "lualine_b_diff_added_command", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_inactive", { bg = color.light_slate_gray, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_insert", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_normal", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_replace", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_terminal", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_added_visual", { bg = color.green, fg = color.light_olive_green }) + hi(0, "lualine_b_diff_modified_command", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_inactive", { bg = color.light_slate_gray, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_insert", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_normal", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_replace", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_terminal", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_modified_visual", { bg = color.green, fg = color.light_blue }) + hi(0, "lualine_b_diff_removed_command", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diff_removed_inactive", { bg = color.light_slate_gray, fg = color.red }) + hi(0, "lualine_b_diff_removed_insert", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diff_removed_normal", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diff_removed_replace", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diff_removed_terminal", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_diff_removed_visual", { bg = color.green, fg = color.red }) + hi(0, "lualine_b_inactive", { bg = color.light_slate_gray, fg = color.dark }) + hi(0, "lualine_b_insert", { bg = color.green, fg = color.dark }) + hi(0, "lualine_b_normal", { bg = color.green, fg = color.dark }) + hi(0, "lualine_b_replace", { bg = color.green, fg = color.dark }) + hi(0, "lualine_b_visual", { bg = color.green, fg = color.dark }) + hi(0, "lualine_c_command", { bg = color.green, fg = color.dark }) + hi(0, "lualine_c_inactive", { bg = color.light_slate_gray, fg = color.dark }) + hi(0, "lualine_c_insert", { bg = color.green, fg = color.dark }) + hi(0, "lualine_c_normal", { bg = color.green, fg = color.dark }) + hi(0, "lualine_c_replace", { bg = color.green, fg = color.dark }) + hi(0, "lualine_c_visual", { bg = color.green, fg = color.dark }) + hi(0, "lualine_x_2_command", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_2_inactive", { bg = color.light_slate_gray, fg = color.peach_orange }) + hi(0, "lualine_x_2_insert", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_2_normal", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_2_replace", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_2_terminal", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_2_visual", { bg = color.green, fg = color.peach_orange }) + hi(0, "lualine_x_filetype_DevIconDefault_command", { bg = color.green, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_inactive", { bg = color.light_slate_gray, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_insert", { bg = color.green, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_normal", { bg = color.green, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_replace", { bg = color.green, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_terminal", { bg = color.green, fg = color.slate_gray }) + hi(0, "lualine_x_filetype_DevIconDefault_visual", { bg = color.green, fg = color.slate_gray }) + end + + -- nvim-ts-rainbow + hi(0, "rainbowcol1", { fg = color.very_light_gray }) + hi(0, "rainbowcol2", { fg = color.light_brown }) + hi(0, "rainbowcol3", { fg = color.golden_yellow }) + hi(0, "rainbowcol4", { fg = color.very_light_gray }) + hi(0, "rainbowcol5", { fg = color.bright_sky }) + hi(0, "rainbowcol6", { fg = color.light_blue }) + hi(0, "rainbowcol7", { fg = color.pale_gold }) + + hi(0, "@lsp.type.keyword.go", { link = "TSKeyword" }) + hi(0, "@lsp.type.string.go", { link = "TSString" }) + hi(0, "Statement", { link = "TSKeyword" }) + hi(0, "Comment", { link = "TSComment" }) + hi(0, "Number", { link = "TSNumber" }) + hi(0, "String", { link = "TSString" }) + hi(0, "goImportString", { link = "TSString" }) + hi(0, "@lsp.type.function", { link = "TSMethodCall" }) + hi(0, "@lsp.typemod.function.definition", { link = "TSFunction" }) + hi(0, "@lsp.type.method", { link = "TSMethod" }) + hi(0, "goBlock", { link = "TSVariable" }) + hi(0, "Identifier", { link = "TSKeyword" }) + -- Terminal colors + local g = vim.g + + g.terminal_color_0 = color.dark + g.terminal_color_1 = color.red + g.terminal_color_2 = color.light_olive_green + g.terminal_color_3 = color.golden_yellow + g.terminal_color_4 = color.light_blue + g.terminal_color_5 = color.pale_gold + g.terminal_color_6 = color.bright_sky + g.terminal_color_7 = color.very_light_gray + g.terminal_color_8 = color.medium_gray + g.terminal_color_9 = color.red + g.terminal_color_10 = color.light_olive_green + g.terminal_color_11 = color.golden_yellow + g.terminal_color_12 = color.light_blue + g.terminal_color_13 = color.pale_gold + g.terminal_color_14 = color.bright_sky + g.terminal_color_15 = color.very_light_gray + + -- Snacks Dashboard + hi(0, "SnacksDashboardHeader", { fg = color.golden_yellow, bold = true }) + hi(0, "SnacksDashboardTitle", { fg = color.pale_gold, bold = true }) + hi(0, "SnacksDashboardIcon", { fg = color.light_blue }) + hi(0, "SnacksDashboardDesc", { fg = color.light_slate_gray }) + hi(0, "SnacksDashboardFile", { fg = color.pale_gold, bold = true }) + hi(0, "SnacksDashboardKey", { fg = color.burnt_orange }) + hi(0, "SnacksDashboardSpecial", { fg = color.light_slate_gray }) + hi(0, "SnacksDashboardDir", { fg = color.light_slate_gray }) + hi(0, "SnacksDashboardNormal", { fg = color.light_slate_gray }) + hi(0, "SnacksDashboardTerminal", { fg = color.light_slate_gray }) + hi(0, "SnacksDashboardFooter", { fg = color.light_slate_gray }) + + -- Neo-Tree + hi(0, "NeoTreeFileName", { fg = color.light_slate_gray }) + hi(0, "NeoTreeDotfile", { fg = color.comment }) + hi(0, "NeoTreeDirectoryName", { fg = color.pale_gold }) + hi(0, "NeoTreeDirectoryIcon", { fg = color.pale_gold }) + hi(0, "NeoTreeGitModified", { fg = color.burnt_orange }) + hi(0, "NeoTreeGitStaged", { fg = color.olive_green }) + hi(0, "NeoTreeGitUntracked", { fg = color.lavender }) + hi(0, "NeoTreeNormal", { fg = color.light_slate_gray, bg = color.very_dark_gray }) + hi(0, "NeoTreeNormalNC", { fg = color.light_slate_gray, bg = color.very_dark_gray }) + hi(0, "NeoTreeTabActive", { fg = color.light_slate_gray, bg = color.very_dark_gray, bold = true }) + hi(0, "NeoTreeTabInactive", { fg = color.dark_grey, bg = color.very_dark_gray }) + hi(0, "NeoTreeTabSeparatorActive", { fg = color.light_slate_gray, bg = color.very_dark_gray }) + hi(0, "NeoTreeTabSeparatorInactive", { fg = color.light_slate_gray, bg = color.dark_grey }) +end + +return M diff --git a/nvim/lua/custom/init.lua b/nvim/lua/custom/init.lua index 0d181f2..202c395 100644 --- a/nvim/lua/custom/init.lua +++ b/nvim/lua/custom/init.lua @@ -1,23 +1,19 @@ --- ========== Formating =========== -- +-- ========== Telescope ============= -- require("telescope").load_extension("noice") require("telescope.themes").get_dropdown() --- ========== Formating =========== -- + +-- ========== Theme ============= -- +require("custom.darcula").setup() + +-- ========== Make ============= -- +require("custom.make") + +-- ========== Formating ============= -- vim.api.nvim_create_autocmd("BufWritePre", { - pattern = { "*.c", "*.cpp", "*.h", "*.hpp" }, + pattern = { "*.c", "*.cpp", "*.h", "*.hpp", "*.go" }, callback = function() vim.lsp.buf.format() end, }) --- ========== Formating =========== -- -vim.o.clipboard ="unnamedplus" -vim.api.nvim_create_autocmd("TextYankPost", { - callback = function() - local copy_to_unnamedplus = require("vim.ui.clipboard.osc52").copy("+") - copy_to_unnamedplus(vim.v.event.regcontents) - local copy_to_unnamed = require("vim.ui.clipboard.osc52").copy("*") - copy_to_unnamed(vim.v.event.regcontents) - end, -}) - diff --git a/nvim/lua/custom/make.lua b/nvim/lua/custom/make.lua new file mode 100644 index 0000000..a97b473 --- /dev/null +++ b/nvim/lua/custom/make.lua @@ -0,0 +1,184 @@ +_G.last_make_command = nil +_G.make_terminal_buf = nil +_G.build_targets = {} + +local config_file = vim.fn.stdpath('config') .. '/build_targets.json' + +-- Загрузка таргетов из файла +local function load_targets() + local ok, data = pcall(vim.fn.readfile, config_file) + if ok and data[1] then + _G.build_targets = vim.fn.json_decode(data[1]) + else + _G.build_targets = {} + end +end + +-- Сохранение таргетов в файл +local function save_targets() + local data = vim.fn.json_encode(_G.build_targets) + vim.fn.writefile({data}, config_file) +end + +-- Загружаем таргеты при старте +load_targets() + +local function run_make_command(command) + if _G.make_terminal_buf and vim.api.nvim_buf_is_valid(_G.make_terminal_buf) then + vim.cmd('buffer ' .. _G.make_terminal_buf) + else + vim.cmd('terminal') + _G.make_terminal_buf = vim.api.nvim_get_current_buf() + end + vim.cmd('startinsert') + vim.defer_fn(function() + if vim.b.terminal_job_id then + vim.fn.chansend(vim.b.terminal_job_id, "clear\n") + vim.fn.chansend(vim.b.terminal_job_id, command .. "\n") + end + end, 300) +end + +-- Основная команда сборки (оставьте вашу текущую) +vim.api.nvim_create_user_command('Build', function() + vim.ui.input({ + prompt = 'Флаги сборки: ', + default = '', + }, function(flags) + if flags == nil then return end + vim.ui.input({ + prompt = 'Имя проекта: ', + default = '', + }, function(project_name) + if project_name == nil then return end + local make_cmd = "meson compile" .. flags .. " " .. project_name + _G.last_make_command = make_cmd + run_make_command(make_cmd) + vim.notify("🔨 Сборка запущена: " .. make_cmd) + end) + end) +end, { + desc = "Сборка проекта в терминале" +}) + +vim.api.nvim_create_user_command('TargetNew', function() + vim.ui.input({ + prompt = 'Название таргета: ', + default = '', + }, function(target_name) + if target_name == nil or target_name == '' then return end + vim.ui.input({ + prompt = 'Команда сборки для "' .. target_name .. '": ', + default = '', + }, function(build_command) + if build_command == nil or build_command == '' then return end + _G.build_targets[target_name] = build_command + save_targets() + vim.notify("✅ Таргет '" .. target_name .. "' сохранен") + end) + end) +end, { + desc = "Создать новый таргет сборки" +}) + +-- ПЕРЕПИСАННАЯ команда для выбора таргета с использованием vim.ui.select +vim.api.nvim_create_user_command('Target', function() + local target_count = 0 + for _ in pairs(_G.build_targets) do + target_count = target_count + 1 + end + if target_count == 0 then + vim.notify("❌ Нет сохраненных таргетов. Используйте :TargetNew", vim.log.levels.ERROR) + return + end + -- Подготавливаем список для vim.ui.select + local targets_list = {} + for name, cmd in pairs(_G.build_targets) do + table.insert(targets_list, { + name = name, + cmd = cmd, + -- Форматируем для красивого отображения + display = string.format("🔨 %s\n 📝 %s", name, cmd) + }) + end + -- Сортируем по имени + table.sort(targets_list, function(a, b) return a.name < b.name end) + vim.ui.select(targets_list, { + prompt = '📋 Выберите таргет сборки:', + format_item = function(item) + return item.display + end, + }, function(selected) + if not selected then + vim.notify("❌ Выбор отменен", vim.log.levels.WARN) + return + end + _G.last_make_command = selected.cmd + run_make_command(selected.cmd) + vim.notify("🔨 Запускаю: " .. selected.cmd) + end) +end, { + desc = "Выбрать таргет сборки" +}) + +-- Команда для просмотра всех таргетов +vim.api.nvim_create_user_command('TargetList', function() + local target_count = 0 + for _ in pairs(_G.build_targets) do + target_count = target_count + 1 + end + if target_count == 0 then + print("📝 Список таргетов пуст") + return + end + print("📋 Сохраненные таргеты сборки:") + local targets_list = {} + for name, cmd in pairs(_G.build_targets) do + table.insert(targets_list, { name = name, cmd = cmd }) + end + table.sort(targets_list, function(a, b) return a.name < b.name end) + for i, target in ipairs(targets_list) do + print(string.format(" %d. %s → %s", i, target.name, target.cmd)) + end +end, { + desc = "Показать список всех таргетов" +}) + +-- Команда для удаления таргета (уже использует vim.ui.select - оставляем как есть) +vim.api.nvim_create_user_command('TargetDelete', function() + local target_count = 0 + for _ in pairs(_G.build_targets) do + target_count = target_count + 1 + end + if target_count == 0 then + vim.notify("❌ Нет сохраненных таргетов", vim.log.levels.ERROR) + return + end + local targets_list = {} + for name, cmd in pairs(_G.build_targets) do + table.insert(targets_list, name) + end + table.sort(targets_list) + vim.ui.select(targets_list, { + prompt = 'Выберите таргет для удаления:', + }, function(selected) + if not selected then return end + _G.build_targets[selected] = nil + save_targets() + vim.notify("🗑️ Таргет '" .. selected .. "' удален") + end) +end, { + desc = "Удалить таргет сборки" +}) + +-- Повтор последней сборки (оставьте вашу текущую) +vim.api.nvim_create_user_command('LastBuild', function() + if _G.last_make_command then + run_make_command(_G.last_make_command) + vim.notify("🔁 Повторяю: " .. _G.last_make_command) + else + vim.notify("❌ Нет истории сборок", vim.log.levels.ERROR) + end +end, { + desc = "Повторить последнюю сборку в терминале" +}) diff --git a/nvim/lua/mappings.lua b/nvim/lua/mappings.lua index 649d6f6..1d24361 100644 --- a/nvim/lua/mappings.lua +++ b/nvim/lua/mappings.lua @@ -3,6 +3,8 @@ local map = vim.keymap.set -- ========== Basics =========== -- map("n", ";", ":", { desc = "CMD enter command mode" }) map("i", "jk", "") +map("t", "jk", "") +map("n", "h", "s | terminal | i"); -- ========== Debug =========== -- map('n', 'db', 'DapToggleBreakpoint', { desc = 'Toggle breakpoint' }) @@ -15,18 +17,13 @@ map('n', 'du', 'lua require("dapui").toggle()', { desc = 'Toggl -- ========== LSP =========== -- map('n', 'lo', 'lua vim.diagnostic.open_float()', { noremap = true, silent = true, desc = 'Open diagnostic' }) +map("n", "ll", 'lua vim.lsp.buf.code_action()', { noremap = true, silent = true, desc = 'Show complete by lsp'}) 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' }) map("n", "ds", vim.diagnostic.setloclist, { desc = "LSP diagnostic loclist" }) map("n", "", "noh", { desc = "general clear highlights" }) --- ========== 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' }) - -- ========== Sessions ============= -- map("n", "ss", ":SessionSave", {noremap = true, silent = true}) map("n", "sl", ":SessionLoad", {noremap = true, silent = true}) @@ -71,7 +68,42 @@ map("n", "fa", "Telescope find_files follow=true no_ignore=true hid map("n", "wK", "WhichKey ", { desc = "whichkey all keymaps" }) -- ========== Buffers ============= -- -map("n", "x", "bp | sp | bn | bd", {desc = "Close buffer"}) +map("n", "x", function() + local bufnr = vim.api.nvim_get_current_buf() + local buftype = vim.api.nvim_buf_get_option(bufnr, 'buftype') + local modified = vim.api.nvim_buf_get_option(bufnr, 'modified') + + if buftype == 'terminal' then + vim.cmd('bp | sp | bn | bd!') + return + end + + if modified then + vim.notify("Changes not saved") + else + vim.cmd('bp | sp | bn | bd') + end +end, {desc = "Close buffer"}) map("n", "e", "enew", {desc = "Create buffer"}) map("n", "", "BufferLineCycleNext", {desc = "Go to next buffer"}) map("n", "", "BufferLineCyclePrev", {desc = "Go to prev buffer"}) + +-- ========== Git ============= -- +map("n", "gb", "Gitsigns blame", {desc = "Open blame for file"}) +map("n", "gl", "Gitsigns blame", {desc = "Open blame for file"}) +map("n", "gco", "GitConflictChooseOurs", {desc = "Select the current changes"}) +map("n", "gct", "GitConflictChooseTheirs", {desc = "Select the incoming changes"}) +map("n", "gcn", "GitConflictNextConflict", {desc = "Move to the next conflict"}) +map("n", "gcp", "GitConflictPrevConflict", {desc = "Move to the previous conflict"}) +map("n", "ghn", "Gitsigns blame", {desc = "Show hunk in normal mode"}) +map("n", "ghi", "Gitsigns blame", {desc = "Show hunk inline"}) +map("n", "gd", "Gitsigns diffthis", {desc = "Show diff of buffer"}) +map("n", "gs", "Gitsigns stage_buffer", {desc = "Stage this buffer"}) +map("n", "gu", "Gitui", {desc = "Stage this buffer"}) + +-- ========== Target ============= -- +map("n", "tt", "Build", {desc = "Build project"}) +map("n", "tt", "Target", {desc = "Execute target"}) +map("n", "tn", "TargetNew", {desc = "Create new target"}) +map("n", "tl", "TargetList", {desc = "Show list of targets"}) +map("n", "td", "TargetDelete", {desc = "Delete target from list"}) diff --git a/nvim/lua/plugins/common.lua b/nvim/lua/plugins/common.lua index d14d593..013c40a 100644 --- a/nvim/lua/plugins/common.lua +++ b/nvim/lua/plugins/common.lua @@ -4,39 +4,41 @@ return { "nvim-tree/nvim-web-devicons", opts = {}, }, + { + 'nvim-mini/mini.nvim', + version = '*' + }, -- Marks { "chentoast/marks.nvim", event = "VeryLazy", opts = {}, }, - -- Gitsigns + -- Git { "lewis6991/gitsigns.nvim", event = {"BufReadPre", "BufNewFile"}, - opts = function () + opts = function() require("configs.gitsigns") - end + end, }, - -- Theme { - "xiantang/darcula-dark.nvim", - dependencies = { - "nvim-treesitter/nvim-treesitter", - }, + 'akinsho/git-conflict.nvim', + version = "*", + config = true }, -- Nvim tree { "nvim-tree/nvim-tree.lua", - cmd = {'NvimTreeToggle', 'NvimTreeFocus'}, - opts = function () - require("configs.nvimtree") + cmd = { "NvimTreeToggle", "NvimTreeFocus" }, + opts = function() + return require "configs.nvimtree" end, }, -- Pairs { - 'nvim-mini/mini.pairs', - event = {"BufReadPre", "BufNewFile"}, + "nvim-mini/mini.pairs", + event = { "BufReadPost", "BufNewFile" }, opts = { modes = { insert = true, command = true, terminal = false }, skip_next = [=[[%w%%%'%[%"%.%`%$]]=], @@ -44,16 +46,17 @@ return { skip_unbalanced = true, markdown = true, }, + }, -- Formating { "stevearc/conform.nvim", event = 'BufWritePre', - config = function () - require("configs.nvimtree") + config = function() + require "configs.conform" end, }, - -- Yank Highlight + -- Yank highlight { "machakann/vim-highlightedyank", event = "VeryLazy", diff --git a/nvim/lua/plugins/dev.lua b/nvim/lua/plugins/development.lua similarity index 51% rename from nvim/lua/plugins/dev.lua rename to nvim/lua/plugins/development.lua index 88743e5..f54aa95 100644 --- a/nvim/lua/plugins/dev.lua +++ b/nvim/lua/plugins/development.lua @@ -2,9 +2,10 @@ return { -- Nvim lspconfig { "neovim/nvim-lspconfig", - config = function() - require "configs.lsp.lspconfig" - end, + event = { "BufReadPre", "BufNewFile" }, + config = function () + require("configs.lsp.lspconfig") + end }, -- Mason { @@ -13,12 +14,12 @@ return { }, -- Mason lspconfig { - "mason-org/mason-lspconfig.nvim", - opts = {}, - dependencies = { - "mason-org/mason.nvim", - "neovim/nvim-lspconfig", - }, + "mason-org/mason-lspconfig.nvim", + opts = {}, + dependencies = { + "mason-org/mason.nvim", + "neovim/nvim-lspconfig", + } }, -- Nvim complete { @@ -26,7 +27,6 @@ return { event = "InsertEnter", dependencies = { { - -- snippet plugin "L3MON4D3/LuaSnip", dependencies = "rafamadriz/friendly-snippets", opts = { history = true, updateevents = "TextChanged,TextChangedI" }, @@ -35,8 +35,6 @@ return { require "configs.luasnip" end, }, - - -- autopairing of (){}[] etc { "windwp/nvim-autopairs", opts = { @@ -45,14 +43,11 @@ return { }, config = function(_, opts) require("nvim-autopairs").setup(opts) - -- setup cmp for autopairs local cmp_autopairs = require "nvim-autopairs.completion.cmp" require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done()) end, }, - - -- cmp sources plugins { "saadparwaiz1/cmp_luasnip", "hrsh7th/cmp-nvim-lua", @@ -65,25 +60,82 @@ return { return require "configs.cmp" end, }, - -- Treesitter + -- Treesitter (syntax) { "nvim-treesitter/nvim-treesitter", event = { "BufReadPost", "BufNewFile" }, cmd = { "TSInstall", "TSBufEnable", "TSBufDisable", "TSModuleInfo" }, build = ":TSUpdate", - opts = function() - return require "configs.treesitter" - end, - config = function(_, opts) - require("nvim-treesitter.configs").setup(opts) + config = function() + require("nvim-treesitter.config").setup(require "configs.treesitter") end, }, - -- Ufo folders + -- Folders { 'kevinhwang91/nvim-ufo', dependencies = 'kevinhwang91/promise-async', event = "VeryLazy", + config = function() + require("configs.ufo") + end + }, + -- Tests + { + "nvim-neotest/neotest", + event = "VeryLazy", + dependencies = { + "nvim-lua/plenary.nvim", + "alfaix/neotest-gtest", + "olimorris/neotest-phpunit", + }, + config = function() + require("neotest").setup({ + adapters = { + require("neotest-phpunit"), + require("neotest-gtest").setup({}), + }, + }) + end, + }, + -- These are for C/C++ Debbuger + { + "nvim-neotest/nvim-nio", + event = "VeryLazy", + }, + { + "mfussenegger/nvim-dap", + event = "VeryLazy", config = function () + require("configs.nvim-dap").setup() + end + }, + { + "rcarriga/nvim-dap-ui", + event = "VeryLazy", + dependencies = "mfussenegger/nvim-dap", + }, + { + "jay-babu/mason-nvim-dap.nvim", + event = "VeryLazy", + dependencies = { + "williamboman/mason.nvim", + "mfussenegger/nvim-dap", + }, + opts = { + handlers = {} + }, + }, + { + "theHamsta/nvim-dap-virtual-text", + dependencies = "mfussenegger/nvim-dap", + config = function() + require("nvim-dap-virtual-text").setup() + end, + }, + { + 'aspeddro/gitui.nvim', + config = function () + require("gitui").setup() end, }, } diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua deleted file mode 100644 index 2c35d27..0000000 --- a/nvim/lua/plugins/init.lua +++ /dev/null @@ -1,60 +0,0 @@ -return { - { - "stevearc/conform.nvim", - -- event = 'BufWritePre', -- uncomment for format on save - opts = require "configs.conform", - }, - - -- These are some examples, uncomment them if you want to see them work! - { - "neovim/nvim-lspconfig", - config = function() - require "configs.lspconfig" - end, - }, - -- Yank highlight - { - "machakann/vim-highlightedyank", - event = "VeryLazy", - }, - -- Icons - { - 'ryanoasis/vim-devicons', - event = "VeryLazy", - }, - -- These are for C/C++ Debbuger - { - "nvim-neotest/nvim-nio", - event = "VeryLazy", - }, - { - "mfussenegger/nvim-dap", - event = "VeryLazy", - config = function () - require("configs.nvim-dap").setup() - end - }, - { - "rcarriga/nvim-dap-ui", - event = "VeryLazy", - dependencies = "mfussenegger/nvim-dap", - }, - { - "jay-babu/mason-nvim-dap.nvim", - event = "VeryLazy", - dependencies = { - "williamboman/mason.nvim", - "mfussenegger/nvim-dap", - }, - opts = { - handlers = {} - }, - }, - { - "theHamsta/nvim-dap-virtual-text", - dependencies = "mfussenegger/nvim-dap", - config = function() - require("nvim-dap-virtual-text").setup() - end, - }, -} diff --git a/nvim/lua/plugins/lines.lua b/nvim/lua/plugins/lines.lua index b476932..f013eca 100644 --- a/nvim/lua/plugins/lines.lua +++ b/nvim/lua/plugins/lines.lua @@ -1,17 +1,17 @@ return { { - 'nvim-lualine/lualine.nvim', - dependencies = 'nvim-tree/nvim-web-devicons', - config = function () - require("configs.lualine") - end, + 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require("configs.lualine") + end, }, { 'akinsho/bufferline.nvim', version = "*", dependencies = 'nvim-tree/nvim-web-devicons', - config = function () + config = function() require("configs.bufferline") end, - } + }, } diff --git a/nvim/lua/plugins/noice.lua b/nvim/lua/plugins/noice.lua index 66d2ed1..bf05981 100644 --- a/nvim/lua/plugins/noice.lua +++ b/nvim/lua/plugins/noice.lua @@ -1,7 +1,8 @@ return { "folke/noice.nvim", event = "VeryLazy", - opts = { + opts ={ + -- add any options here }, dependencies = { "MunifTanjim/nui.nvim", @@ -18,13 +19,12 @@ return { override = { ["vim.lsp.util.convert_input_to_markdown_lines"] = true, ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, }, }, presets = { - long_message_to_split = true, - inc_rename = false, - lsp_doc_border = false, + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help }, } } diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua index 140ad26..1666073 100644 --- a/nvim/lua/plugins/snacks.lua +++ b/nvim/lua/plugins/snacks.lua @@ -5,7 +5,8 @@ return { ---@type snacks.Config opts = { bigfile = { enabled = true }, - dashboard = { enabled = true }, + dashboard = { enabled = true, }, + explorer = { enabled = false }, indent = { enabled = true }, input = { enabled = true }, picker = { enabled = true }, diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 79ca9a8..d696d4b 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,9 +1,8 @@ -return { - 'nvim-telescope/telescope.nvim', - tag = '0.1.8', - dependencies = {'nvim-lua/plenary.nvim', 'nvim-treesitter/nvim-treesitter'}, +return { + "nvim-telescope/telescope.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, cmd = "Telescope", - configs =function () - return require("configs.telescope") + configs = function() + return require "configs.telescope" end, } diff --git a/nvim/lua/plugins/typst.lua b/nvim/lua/plugins/typst.lua new file mode 100644 index 0000000..c397840 --- /dev/null +++ b/nvim/lua/plugins/typst.lua @@ -0,0 +1,8 @@ +return { + 'chomosuke/typst-preview.nvim', + lazy = false, + version = '1.*', + opts = { + port = 8000, + }, +} diff --git a/nvim/.stylua.toml b/nvim/stylua.toml similarity index 100% rename from nvim/.stylua.toml rename to nvim/stylua.toml diff --git a/nvim/temp b/nvim/temp new file mode 100644 index 0000000..97b7eb0 --- /dev/null +++ b/nvim/temp @@ -0,0 +1,34 @@ +  Error 12:14:10 PM notify.error +lazy.nvim + +Failed to run `config` for nvim-treesitter + +/home/hhhh/.config/nvim/lua/plugins/development.lua:73: module 'nvim-treesitter.configs' not found: + no field package.preload['nvim-treesitter.configs'] + cache_loader: module 'nvim-treesitter.configs' not found + cache_loader_lib: module 'nvim-treesitter.configs' not found + no file './nvim-treesitter/configs.lua' + no file '/usr/share/luajit-2.1/nvim-treesitter/configs.lua' + no file '/usr/local/share/lua/5.1/nvim-treesitter/configs.lua' + no file '/usr/local/share/lua/5.1/nvim-treesitter/configs/init.lua' + no file '/usr/share/lua/5.1/nvim-treesitter/configs.lua' + no file '/usr/share/lua/5.1/nvim-treesitter/configs/init.lua' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/share/lua/5.1/nvim-treesitter/configs.lua' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/share/lua/5.1/nvim-treesitter/configs/init.lua' + no file './nvim-treesitter/configs.so' + no file '/usr/local/lib/lua/5.1/nvim-treesitter/configs.so' + no file '/usr/lib/lua/5.1/nvim-treesitter/configs.so' + no file '/usr/local/lib/lua/5.1/loadall.so' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/lib/lua/5.1/nvim-treesitter/configs.so' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/lib64/lua/5.1/nvim-treesitter/configs.so' + no file './nvim-treesitter.so' + no file '/usr/local/lib/lua/5.1/nvim-treesitter.so' + no file '/usr/lib/lua/5.1/nvim-treesitter.so' + no file '/usr/local/lib/lua/5.1/loadall.so' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/lib/lua/5.1/nvim-treesitter.so' + no file '/home/hhhh/.local/share/nvim/lazy-rocks/telescope.nvim/lib64/lua/5.1/nvim-treesitter.so' + +# stacktrace: + - lua/plugins/development.lua:73 _in_ **config** + - lua/custom/init.lua:2 + - init.lua:11