diff --git a/lazy-lock.json b/lazy-lock.json deleted file mode 100644 index 4de3e9f..0000000 --- a/lazy-lock.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, - "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "aurora": { "branch": "master", "commit": "f712bacedb99b862f558540a1d67ec5b7dcee30b" }, - "barbar.nvim": { "branch": "master", "commit": "95aa36179dcb752c5157a3561014994f1998ff2d" }, - "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" }, - "bionic.nvim": { "branch": "main", "commit": "3523383b6db41046a3d813ac65dd57e78e61babb" }, - "block.nvim": { "branch": "main", "commit": "6fb969ab12579e58b9379aa51933cad4a466cf75" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, - "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "3d8912ebeb56e5ae08ef0906e3a54de1c66b92f1" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" }, - "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "commented.nvim": { "branch": "master", "commit": "be322c5ef455800984705cee97490a5450f072bc" }, - "copilot.vim": { "branch": "release", "commit": "9484e35cf222e9360e05450622a884f95c662c4c" }, - "crates.nvim": { "branch": "main", "commit": "b4f4987ccdb1cc3899ee541ef4375c73c48c4570" }, - "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "git-conflict.nvim": { "branch": "main", "commit": "4c8e252b87d54d944c1e56bfb477f78b6fdaf661" }, - "github-nvim-theme": { "branch": "main", "commit": "24c8706c9ad26b944f5a76dea999dca8708f252e" }, - "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "gitsigns.nvim": { "branch": "main", "commit": "70584ff9aae8078b64430c574079d79620b8f06d" }, - "gruvqueen": { "branch": "master", "commit": "b79ed8b2bcc26e04fb7586f95a1e5d7a600e9cf8" }, - "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" }, - "hlchunk.nvim": { "branch": "main", "commit": "882d1bc86d459fa8884398223c841fd09ea61b6b" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, - "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, - "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, - "lightspeed.nvim": { "branch": "main", "commit": "fcc72d8a4d5f4ebba62d8a3a0660f88f1b5c3b05" }, - "live-server.nvim": { "branch": "main", "commit": "0b4d31c665fa69b3e68d6da5765fab5ccf88b0c0" }, - "lsp-lens.nvim": { "branch": "main", "commit": "48bb1a7e271424c15f3d588d54adc9b7c319d977" }, - "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, - "lspkind-nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "material.nvim": { "branch": "main", "commit": "ba56aeea3db29c8c9ffd55158aed7b2e6a749a46" }, - "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "neoconf.nvim": { "branch": "main", "commit": "ef304c29977b85c99382fcba821b3f710e144a74" }, - "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "neogen": { "branch": "main", "commit": "0daffcec249bf42275e322361fe55b89a05ff278" }, - "neogit": { "branch": "master", "commit": "2f2dbbed4920b11f7fb7e3d9b0e1806de1a1503e" }, - "neotest": { "branch": "master", "commit": "e07fe8241112274aae9947b98d255763738a1d52" }, - "neotest-jest": { "branch": "main", "commit": "514fd4eae7da15fd409133086bb8e029b65ac43f" }, - "neotest-rust": { "branch": "main", "commit": "9e9df68064bd6fa3b5e40b32fcb7c52af130cdbf" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "34625be12649666b7ccb08761087cc97bb788552" }, - "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, - "nvim-autopairs": { "branch": "master", "commit": "dbfc1c34bed415906395db8303c71039b3a3ffb4" }, - "nvim-bqf": { "branch": "main", "commit": "52703d7adc3be3f7c09eea9a80c5b8caa615fb25" }, - "nvim-cmp": { "branch": "main", "commit": "b9fd19fa160490609389cd45d552896ec4264a6d" }, - "nvim-cmp-lua-latex-symbols": { "branch": "master", "commit": "0050e236dbebe12de35ecdc646fc1d9a6b0dbb29" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" }, - "nvim-coverage": { "branch": "main", "commit": "aa4b4400588e2259e87e372b1e4e90ae13cf5a39" }, - "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, - "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, - "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" }, - "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, - "nvim-lspconfig": { "branch": "master", "commit": "f4619ab31fc4676001ea05ae8200846e6e7700c7" }, - "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, - "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, - "nvim-pqf": { "branch": "main", "commit": "ba0e291cb5c0249838132e197dac082777bdc7d6" }, - "nvim-tree.lua": { "branch": "master", "commit": "d8d3a1590a05b2d8b5eb26e2ed1c6052b1b47a77" }, - "nvim-treesitter": { "branch": "master", "commit": "ff797254282b56d98849f6fa1082f3b2f99ebe43" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, - "nvim-treesitter-textsubjects": { "branch": "master", "commit": "9f9a6b307fb122f13708f78483222abd43b7bb3a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, - "nvim-ufo": { "branch": "main", "commit": "458aa4451b98614cfab6b3d7beddc8caff5e3052" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "nvim-yati": { "branch": "main", "commit": "c4307e6855f17ff89f0132787e2daba27495d254" }, - "nvimux": { "branch": "master", "commit": "a2cd0cab0acf6c37d999e0cfd199a9fa126a8dcf" }, - "one-small-step-for-vimkind": { "branch": "main", "commit": "cd2500ab74addeed6ac260a008dd649c01d3ba12" }, - "orgmode.nvim": { "branch": "master", "commit": "c79e06c6aa6b0a9a897ba132aca14c77685fedb4" }, - "overseer.nvim": { "branch": "master", "commit": "3047ede61cc1308069ad1184c0d447ebee92d749" }, - "package-info.nvim": { "branch": "master", "commit": "45acce5b12ce824332d8000cc2c91805b6710446" }, - "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, - "preview-swagger.nvim": { "branch": "master", "commit": "b2685918a51478e0c5d4790571e58188aa288512" }, - "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" }, - "refactoring.nvim": { "branch": "master", "commit": "d2786877c91aa409c824f27b4ce8a9f560dda60a" }, - "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "satellite.nvim": { "branch": "main", "commit": "40eb89743e3439c66192abfc31eb3280622a5d3c" }, - "sniprun": { "branch": "master", "commit": "97daa506e2faa3939e0491642103635f9d22cd04" }, - "sonokai": { "branch": "master", "commit": "da162343354fbd9bf9cd49293a856f0e3761e8ac" }, - "stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" }, - "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" }, - "surround.nvim": { "branch": "master", "commit": "36c253d6470910692491b13382f54c9bab2811e1" }, - "tabout.nvim": { "branch": "master", "commit": "6a8f4e67a9bfc9bfc9989cc45253180598cc4339" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "5ee5002373655fd684a4ad0d47a3de876ceacf9a" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, - "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "1bb28df3cfc241b961331f00dcb8d5b45fe3e4f0" }, - "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, - "treesj": { "branch": "main", "commit": "60e27280030f9cd8dfb6ceb335922c6ff76682cc" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "urlview.nvim": { "branch": "main", "commit": "7d622e11adbc2cac5bba62345ade9b6672d564a4" }, - "vgit.nvim": { "branch": "main", "commit": "dd8889d1e5520d3fc32855f80b29bde877be9382" }, - "vim-fugitive": { "branch": "master", "commit": "a83135b55b018a891e0803199c3d418010a404d8" }, - "vim-grammarous": { "branch": "master", "commit": "db46357465ce587d5325e816235b5e92415f8c05" }, - "vim-matchup": { "branch": "master", "commit": "2d660e4aa7c566014c667af2cda0458043527902" }, - "vim-slash": { "branch": "master", "commit": "31aee09b7ea8893a18fa34f65e63e364fc998444" }, - "vimwiki": { "branch": "dev", "commit": "69318e74c88ef7677e2496fd0a836446ceac61e8" }, - "vscode.nvim": { "branch": "main", "commit": "4fe3e696a90f183d4dbbb432ddb79155c6d4c99b" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, - "windline.nvim": { "branch": "master", "commit": "54401a62c61d56fe9df106321b158c9048aa5f9b" }, - "window-picker.nvim": { "branch": "main", "commit": "2fe9e4001beeeee9562ddb21b0ad46ab2463bc5b" } -} \ No newline at end of file diff --git a/lua/config/core/autocmd.lua b/lua/config/core/autocmd.lua index 687ac83..300277b 100644 --- a/lua/config/core/autocmd.lua +++ b/lua/config/core/autocmd.lua @@ -21,11 +21,11 @@ function M.autocmds() end, group = au_ft, }) - vim.api.nvim_create_autocmd({ "WinEnter", "BufRead", "BufEnter" }, { - pattern = "alpha", - command = "Alpha", - group = au_ft, - }) + -- vim.api.nvim_create_autocmd({ "WinEnter", "BufRead", "BufEnter" }, { + -- pattern = "alpha", + -- command = "Alpha", + -- group = au_ft, + -- }) vim.api.nvim_create_autocmd("FileType", { pattern = "alpha", command = "set showtabline=0", @@ -33,21 +33,6 @@ function M.autocmds() }) -- lsp vim.api.nvim_create_augroup("LspAttach_inlayhints", { clear = true }) - -- vim.api.nvim_create_autocmd("LspAttach", { - -- group = "LspAttach_inlayhints", - -- callback = function(args) - -- if not (args.data and args.data.client_id) then - -- return - -- end - - -- local bufnr = args.buf - -- local client = vim.lsp.get_client_by_id(args.data.client_id) - -- local present, inlay = pcall(require, "lsp-inlayhints") - -- if present then - -- inlay.on_attach(client, bufnr) - -- end - -- end, - -- }) vim.api.nvim_create_autocmd("LspAttach", { group = "LspAttach_inlayhints", callback = function(args) @@ -140,6 +125,17 @@ function M.autocmds() -- end -- end, -- }) + vim.api.nvim_create_autocmd("WinLeave", { + callback = function() + if vim.bo.ft == "TelescopePrompt" and vim.fn.mode() == "i" then + vim.api.nvim_feedkeys( + vim.api.nvim_replace_termcodes("", true, false, true), + "i", + false + ) + end + end, + }) end return M diff --git a/lua/config/core/mappings.lua b/lua/config/core/mappings.lua index a0ed026..12c22f0 100644 --- a/lua/config/core/mappings.lua +++ b/lua/config/core/mappings.lua @@ -126,6 +126,11 @@ M.telescope = { "Telescope file_browser", { desc = "File Browser" }, }, + { + "fB", + "Telescope file_browser path=%:p:h select_buffer=true", + { desc = "File Browser Current Buffer" }, + }, { "fs", "Telescope git_status", @@ -478,6 +483,13 @@ function M.set_lsp_mapping(bufnr) "lua vim.diagnostic.open_float({focusable = false, border = 'single', source = 'if_many' })", { desc = "Diagnostic Float", buffer = bufnr }, }, + { + "ui", + function() + vim.lsp.inlay_hint.enable(bufnr, nil) + end, + { desc = "Inlay Hint Toggle", buffer = bufnr }, + }, }, } diff --git a/lua/config/plugins/configs/cmp/init.lua b/lua/config/plugins/configs/cmp/init.lua index 9ded101..cc8d11f 100644 --- a/lua/config/plugins/configs/cmp/init.lua +++ b/lua/config/plugins/configs/cmp/init.lua @@ -78,10 +78,8 @@ function M.init() cmp.select_next_item() elseif luasnip and luasnip.expand_or_jumpable() then luasnip.expand_or_jump() - elseif present_neogen then - if neogen.jumpable() then - neogen.jump_next() - end + elseif present_neogen and neogen.jumpable() then + neogen.jump_next() else fallback() end diff --git a/lua/config/plugins/configs/dap/init.lua b/lua/config/plugins/configs/dap/init.lua index 8ddf474..dcc675a 100644 --- a/lua/config/plugins/configs/dap/init.lua +++ b/lua/config/plugins/configs/dap/init.lua @@ -231,9 +231,10 @@ dap.configurations.rust[1].program = function() local TOML = require("config.utils.toml") local cargotoml = vim.fn.readblob(vim.fn.getcwd() .. "/Cargo.toml") local parsed = TOML.parse(cargotoml) - return build_path_string( + local path = build_path_string( vim.fn.getcwd() .. "/target/debug/" .. parsed.package.name ) + return path end dap.configurations.rust[2] = { @@ -282,3 +283,4 @@ if not dapvt_present then else dapvt.setup({}) end +require("overseer").patch_dap(true) diff --git a/lua/config/plugins/configs/lspconfig/init.lua b/lua/config/plugins/configs/lspconfig/init.lua index ce88984..c81a3fd 100644 --- a/lua/config/plugins/configs/lspconfig/init.lua +++ b/lua/config/plugins/configs/lspconfig/init.lua @@ -29,11 +29,11 @@ function LSP.on_attach(client, bufnr) ) require("config.core.mappings").set_lsp_mapping(bufnr) - -- if vim.version().minor > 9 then - -- if client.server_capabilities.inlayHintProvider then - -- vim.lsp.inlay_hint(bufnr, true) - -- end - -- end + if vim.version().minor > 9 then + if client.server_capabilities.inlayHintProvider then + vim.lsp.inlay_hint.enable(bufnr, true) + end + end end -- LSP Settings diff --git a/lua/config/plugins/configs/telescope/init.lua b/lua/config/plugins/configs/telescope/init.lua index dc20ecd..69af1bc 100644 --- a/lua/config/plugins/configs/telescope/init.lua +++ b/lua/config/plugins/configs/telescope/init.lua @@ -7,21 +7,7 @@ function M.init() vim.notify("telescope is not installed") return end - local action_set = require("telescope.actions.set") telescope.setup({ - pickers = { - find_files = { - hidden = true, - attach_mappings = function(_) - action_set.select:enhance({ - post = function() - vim.cmd(":normal! zx") - end, - }) - return true - end, - }, - }, defaults = { vimgrep_arguments = { "rg", diff --git a/lua/config/plugins/configs/treesitter/init.lua b/lua/config/plugins/configs/treesitter/init.lua index 4f29590..844a943 100644 --- a/lua/config/plugins/configs/treesitter/init.lua +++ b/lua/config/plugins/configs/treesitter/init.lua @@ -54,11 +54,6 @@ function M.init() ["i;"] = "textsubjects-container-inner", }, }, - -- context_commentstring = { - -- enable = true, - -- -- This plugin provided an autocommand option - -- enable_autocmd = true, - -- }, textobjects = { lsp_interop = { enable = true, @@ -116,8 +111,12 @@ function M.init() }, }, }) - - require("ts_context_commentstring").setup({}) + require("ts_context_commentstring").setup({ + enable_autocmd = false, + languages = { + typescript = "// %s", + }, + }) end return M diff --git a/lua/config/plugins/modules/navigation.lua b/lua/config/plugins/modules/navigation.lua index d5e8290..889508f 100644 --- a/lua/config/plugins/modules/navigation.lua +++ b/lua/config/plugins/modules/navigation.lua @@ -41,12 +41,6 @@ M.navigation = { ["abecodes/tabout.nvim"] = { config = function() require("tabout").setup({ - tabkey = "", - backwards_tabkey = "", - act_as_tab = true, - act_as_shift_tab = false, - enable_backwards = true, - completion = true, tabouts = { { open = "'", close = "'" }, { open = '"', close = '"' }, @@ -55,7 +49,6 @@ M.navigation = { { open = "[", close = "]" }, { open = "{", close = "}" }, }, - ignore_beginning = true, exclude = {}, }) end, diff --git a/lua/config/plugins/modules/utility.lua b/lua/config/plugins/modules/utility.lua index 2bf8c14..3ed5417 100644 --- a/lua/config/plugins/modules/utility.lua +++ b/lua/config/plugins/modules/utility.lua @@ -11,7 +11,6 @@ M.utility = { }, -- INFO: exec async tasks run jobs etc ["stevearc/overseer.nvim"] = { - commit = "3047ede61cc1308069ad1184c0d447ebee92d749", -- Recommended to to avoid breaking changes cmd = { "CompilerOpen", "CompilerToggleResults" }, opts = { -- Tasks are disposed 5 minutes after running to free resources.