diff --git a/lazy-lock.json b/lazy-lock.json index 99a79aa..99c470b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,9 +2,9 @@ "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "auto-pairs": { "branch": "master", "commit": "39f06b873a8449af8ff6a3eee716d3da14d63a76" }, - "auto-session": { "branch": "main", "commit": "5dd96000324d5f7448dec096281b6caf64d79913" }, + "auto-session": { "branch": "main", "commit": "afa735f5923a4c0e8f519ffaa18885dc03922571" }, "blame.nvim": { "branch": "main", "commit": "dedbcdce857f708c63f261287ac7491a893912d0" }, - "bookmarks.nvim": { "branch": "main", "commit": "fadfd901f6cb51fbd39a12a7aab4eac4b3116764" }, + "bookmarks.nvim": { "branch": "main", "commit": "37ab69d45b9ee4c6ac640ccdbcdbb21a651c7e30" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, @@ -12,7 +12,7 @@ "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "25d48271e3d4404ba017cb92a37d3a681c1ad149" }, + "conform.nvim": { "branch": "master", "commit": "2122fe2ff01e9a542fc358ee9398ce2cbddf345d" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -20,26 +20,24 @@ "easy-commands.nvim": { "branch": "main", "commit": "e1a4721d9d9805ed7115a4083b8095acf7a721fe" }, "flatten.nvim": { "branch": "main", "commit": "e420e531d2ab24aebcf7b3c9fca28e6c5c34964d" }, "git-messenger.vim": { "branch": "master", "commit": "8a61bdfa351d4df9a9118ee1d3f45edbed617072" }, - "gitsigns.nvim": { "branch": "main", "commit": "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" }, "go.nvim": { "branch": "master", "commit": "e66c3240d26936428cd0f320dc5ffa1eb01538b8" }, "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" }, "guess-indent.nvim": { "branch": "main", "commit": "6cd61f7a600bb756e558627cd2e740302c58e32d" }, "guihua.lua": { "branch": "master", "commit": "225db770e36aae6a1e9e3a65578095c8eb4038d3" }, - "gx.nvim": { "branch": "main", "commit": "d921f21f200113fd3201194aa9dddb033e83768a" }, + "gx.nvim": { "branch": "main", "commit": "28060914ee334da8a7f3c17509fd23cec023a0f7" }, "hlsearch.nvim": { "branch": "main", "commit": "fdeb60b890d15d9194e8600042e5232ef8c29b0e" }, "hop.nvim": { "branch": "master", "commit": "036462a345792279c58f2f6445756efab706f04a" }, - "hurl.nvim": { "branch": "main", "commit": "01438729c58240eb2984b8c276e04dd011a07d9e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, + "hurl.nvim": { "branch": "main", "commit": "88dd2ffdf40e2778e9277dcb167224bf1447a5da" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lspsaga.nvim": { "branch": "main", "commit": "c27118b0a9f60c557825addda8c4d12a3ac466f1" }, + "lspsaga.nvim": { "branch": "main", "commit": "a751b92b5d765a99fe3a42b9e51c046f81385e15" }, "lua-async-await": { "branch": "main", "commit": "652d94df34e97abe2d4a689edbc4270e7ead1a98" }, "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "marks.nvim": { "branch": "master", "commit": "74e8d01b2a2131b6e46354cffc553aa7f81bcf5b" }, - "markview.nvim": { "branch": "main", "commit": "d0ccc97b5c988fb28e5033abdf7b832b9dfaf897" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "maximize.nvim": { "branch": "master", "commit": "02588e7b20df1a0692aa96f83cc4670199f74d71" }, + "maximize.nvim": { "branch": "master", "commit": "d7273702756ac3d32b58e2a2cf0d9c4f3c28ff2c" }, "mdeval.nvim": { "branch": "master", "commit": "2c32e2f3e7d8f222e7a4724989f218d036e1081d" }, "move.nvim": { "branch": "main", "commit": "cccbd4ea9049ca5f99f025ffaddb7392359c7d6a" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" }, @@ -50,46 +48,47 @@ "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-dap": { "branch": "master", "commit": "bc03b83c94d0375145ff5ac6a6dcf28c1241e06f" }, - "nvim-java": { "branch": "main", "commit": "b9e6b71c8cbb3f6db8ce7d3a9bd3f3cb805156f1" }, + "nvim-dap": { "branch": "master", "commit": "dcc85d12d6e2c18c5fa0f9a304d9f5e767e1401a" }, + "nvim-java": { "branch": "main", "commit": "b3174e41ab51867123d8663eced53b33f1548522" }, "nvim-java-core": { "branch": "main", "commit": "5b03dca22fee76524a89e1c2dc1d73a9f0b1a3bb" }, "nvim-java-dap": { "branch": "main", "commit": "55f239532f7a3789d21ea68d1e795abc77484974" }, "nvim-java-refactor": { "branch": "main", "commit": "ea1420fed5463c9cc976c2b4175f434b3646f0f7" }, "nvim-java-test": { "branch": "main", "commit": "7f0f40e9c5b7eab5096d8bec6ac04251c6e81468" }, - "nvim-lspconfig": { "branch": "master", "commit": "e9b1c95d29ca9e479fc39896b31d24eed96b40a3" }, + "nvim-lspconfig": { "branch": "master", "commit": "652386deae739e38fa1bcf2f06e3e7de9b3436ba" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-recorder": { "branch": "main", "commit": "2b307756704a0ba26e8a3adfe98d02eeaecaa52e" }, "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, - "nvim-spider": { "branch": "main", "commit": "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, "nvim-tree-pairs": { "branch": "main", "commit": "e7f7b6cc28dda6f3fa271ce63b0d371d5b7641da" }, - "nvim-treesitter": { "branch": "master", "commit": "d13f0183ba93f9b5aba7359146f294abfffff9c3" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "dd00780a661a0c7a38765c220150291a3e88daea" }, - "nvim-ufo": { "branch": "main", "commit": "42be3ce3903c26bb753586958e403877ad36b9f6" }, - "nvim-web-devicons": { "branch": "master", "commit": "5be6c4e685618b99c3210a69375b38a1202369b4" }, + "nvim-treesitter": { "branch": "master", "commit": "3e0feeb062b29bb7d6d6df1e32ba28111c2bb734" }, + "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "ca93cb2c34b67ab22d01976fc90bc95627a3317f" }, + "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, + "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, "onedark.nvim": { "branch": "master", "commit": "fae34f7c635797f4bf62fb00e7d0516efa8abe37" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "rainbow": { "branch": "master", "commit": "76ca1a20aa42edb5c65c19029968aad4625790dc" }, "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" }, "remember.nvim": { "branch": "master", "commit": "1b5176283bcf91d052b5755d9ba6e8ce14dfc95b" }, + "render-markdown.nvim": { "branch": "main", "commit": "b7002694a7a794f8d8a6a0cc54769628cf1cf9d8" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "scratch.nvim": { "branch": "main", "commit": "0c3badbc8b1fbe31ed5b422ba8f5c66ea6f7a9bf" }, - "snipe.nvim": { "branch": "main", "commit": "17c92aec4b31d9c7d3d5a067db4cd1fda9248c5d" }, + "snipe.nvim": { "branch": "main", "commit": "854a47c970413405361487c13e2b1e9aa9a3696e" }, "sniprun": { "branch": "master", "commit": "a29d7b1c313b00980015ad79fa0ab512a0729940" }, "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "ed5f89c30d64471274b81af7f6eafddff7807be9" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" }, "telescope-tabs": { "branch": "master", "commit": "0a678eefcb71ebe5cb0876aa71dd2e2583d27fd3" }, - "telescope.nvim": { "branch": "master", "commit": "10b8a82b042caf50b78e619d92caf0910211973d" }, + "telescope.nvim": { "branch": "master", "commit": "3b1600d0fd5172ad9fae00987362ca0ef3d8895d" }, "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, "toggleterm.nvim": { "branch": "main", "commit": "48be57eaba817f038d61bbf64d2c597f578c0827" }, - "treesj": { "branch": "main", "commit": "275f83c81a5a1f5ae23c1eac30c4ac28beebbca2" }, + "treesj": { "branch": "main", "commit": "0d81326b5afd36babe7dd480aabbb0b05f33e688" }, "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, + "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }, "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, "vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } diff --git a/lua/auto-commands.lua b/lua/auto-commands.lua index fa3439d..61303ca 100644 --- a/lua/auto-commands.lua +++ b/lua/auto-commands.lua @@ -1,27 +1,14 @@ local vim = vim -local M = {} --- function to create a list of commands and convert them to autocommands --------- This function is taken from https://github.com/norcalli/nvim_utils -function M.nvim_create_augroups(definitions) - for group_name, definition in pairs(definitions) do - vim.api.nvim_command('augroup '..group_name) - vim.api.nvim_command('autocmd!') - for _, def in ipairs(definition) do - local command = table.concat(vim.tbl_flatten{'autocmd', def}, ' ') - vim.api.nvim_command(command) - end - vim.api.nvim_command('augroup END') - end -end +-- Create an augroup for Trouble settings +local lspsaga_augroup = vim.api.nvim_create_augroup("LspsagaSettings", { clear = true }) - -local autoCommands = { - -- other autocommands - open_folds = { - {"BufReadPost,FileReadPost", "*", "normal zR"} - } -} - -M.nvim_create_augroups(autoCommands) +-- Create an autocommand for the Trouble filetype +vim.api.nvim_create_autocmd("BufWinEnter", { + pattern = "sagaoutline", + group = lspsaga_augroup, + callback = function() + vim.wo.relativenumber = true + end, +}) diff --git a/lua/cokeline-config.lua b/lua/cokeline-config.lua deleted file mode 100644 index 8984b6f..0000000 --- a/lua/cokeline-config.lua +++ /dev/null @@ -1,69 +0,0 @@ -local is_picking_focus = require('cokeline.mappings').is_picking_focus -local is_picking_close = require('cokeline.mappings').is_picking_close -local get_hex = require('cokeline.hlgroups').get_hl_attr - -local red = vim.g.terminal_color_1 -local yellow = vim.g.terminal_color_3 - -require('cokeline').setup({ - default_hl = { - fg = function(buffer) - return - buffer.is_focused - and get_hex('ColorColumn', 'bg') - or get_hex('Normal', 'fg') - end, - bg = function(buffer) - return - buffer.is_focused - and get_hex('Normal', 'fg') - or get_hex('ColorColumn', 'bg') - end, - }, - - components = { - { - text = function(buffer) return (buffer.index ~= 1) and '▏' or '' end, - }, - { - text = ' ', - }, - { - text = function(buffer) - return - (is_picking_focus() or is_picking_close()) - and buffer.pick_letter .. ' ' - or buffer.devicon.icon - end, - fg = function(buffer) - return - (is_picking_focus() and yellow) - or (is_picking_close() and red) - or buffer.devicon.color - end, - italic = function() - return - (is_picking_focus() or is_picking_close()) - end, - bold = function() - return - (is_picking_focus() or is_picking_close()) - end - }, - { - text = function(buffer) return buffer.filename .. ' ' end, - underline = function(buffer) - return buffer.is_hovered and not buffer.is_focused - end - }, - { - text = '󰖭', - on_click = function(_, _, _, _, buffer) - buffer:delete() - end - }, - { - text = ' ', - } - }, -}) diff --git a/lua/mappings.lua b/lua/mappings.lua index 397ddc7..a35eef1 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -78,6 +78,14 @@ vim.keymap.set('n', 'e', vim.diagnostic.open_float) vim.keymap.set('n', '[d', vim.diagnostic.goto_prev) vim.keymap.set('n', ']d', vim.diagnostic.goto_next) vim.keymap.set('n', 'q', vim.diagnostic.setloclist) +vim.keymap.set( + 'n', + 'lh', + function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end, + { + desc = "Toggle inlay hints", + } +) -- Use LspAttach autocommand to only map the following keys -- after the language server attaches to the current buffer @@ -110,14 +118,29 @@ vim.keymap.set("n", "l;", function() vim.lsp.inlay_hint.enable(not vim.l -- Lspsaga -vim.api.nvim_set_keymap("n", "aa", "execute 'Lspsaga outline' | set relativenumber", { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "li", "Lspsaga incoming_calls", { noremap = true, silent = true }) +vim.keymap.set( + "n", + "aa", + "execute 'Lspsaga outline' | set relativenumber", + { noremap = true, silent = true } +) vim.api.nvim_set_keymap("n", "lo", "Lspsaga outgoing_calls", { noremap = true, silent = true }) vim.api.nvim_set_keymap("n", "gp", "Lspsaga peek_type_definition", {noremap=true}) --- trouble -vim.api.nvim_set_keymap("n", "tt", "TroubleToggle", { noremap = true, silent = true }) +-- Trouble +vim.api.nvim_set_keymap( + "n", + "tb", + "Trouble diagnostics toggle filter.buf=0", + { + desc = "Trouble: Toggle diagnostics for the current buffer", + noremap = true, + silent = true, + } +) + -- todo vim.api.nvim_set_keymap("n", "tf", "TodoTelescope", { noremap = true, silent = true }) diff --git a/lua/mason-config.lua b/lua/mason-config.lua index 422c857..93be563 100644 --- a/lua/mason-config.lua +++ b/lua/mason-config.lua @@ -12,7 +12,8 @@ require("mason-lspconfig").setup { "dockerls", "jsonls", "lemminx", - "taplo" + "taplo", + "bashls", }, } @@ -39,6 +40,7 @@ lspconfig.jdtls.setup {} lspconfig.jsonls.setup {} lspconfig.lemminx.setup {} lspconfig.taplo.setup {} +lspconfig.bashls.setup {} -- Enable inlay hints vim.lsp.inlay_hint.enable(true) diff --git a/lua/noice-config.lua b/lua/noice-config.lua index 7d75489..f00b297 100644 --- a/lua/noice-config.lua +++ b/lua/noice-config.lua @@ -192,9 +192,22 @@ require("noice").setup { }, ---@type NoiceRouteConfig[] routes = { - { filter = { event = "msg_show", kind = "", find = "written" }, view = "mini" }, - { filter = { event = "msg_show", find = "Hop" }, skip = true }, - { filter = { event = "msg_show", find = "lines --" }, skip = true } + { + filter = { event = "msg_show", kind = "", find = "written" }, + view = "mini", + }, + { + filter = { event = "msg_show", find = "Hop" }, + skip = true, + }, + { + filter = { event = "msg_show", find = "lines --" }, + skip = true, + }, + { + filter = { event = "msg_show", find = "multiple different client offset_encodings" }, + skip = true, + } }, ---@type table status = {}, --- @see section on statusline components diff --git a/lua/plugin-mappings.lua b/lua/plugin-mappings.lua index ff4205f..6165055 100644 --- a/lua/plugin-mappings.lua +++ b/lua/plugin-mappings.lua @@ -23,10 +23,10 @@ vim.keymap.set('', 'F', function() hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true }) end, {remap=true}) vim.keymap.set('', 't', function() - hop.hint_char1({ direction = directions.AFTER_CURSOR, current_line_only = false, hint_offset = -1 }) + hop.hint_char1({ direction = directions.AFTER_CURSOR, current_line_only = true, hint_offset = -1 }) end, {remap=true}) vim.keymap.set('', 'T', function() - hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = false, hint_offset = 1 }) + hop.hint_char1({ direction = directions.BEFORE_CURSOR, current_line_only = true, hint_offset = 1 }) end, {remap=true}) vim.keymap.set('', 's', function() hop.hint_char1({ direction = directions.AFTER_CURSOR, current_line_only = false }) @@ -56,27 +56,6 @@ vim.keymap.set('n', 'sp', 'lua require("spectre").open_file_search( desc = "Search on current file" }) --- TODO: Disabled for now, not sure I like this --- nvim-spider --- vim.keymap.set( --- { "n", "o", "x" }, --- "w", --- "lua require('spider').motion('w')", --- { desc = "Spider-w" } --- ) --- vim.keymap.set( --- { "n", "o", "x" }, --- "e", --- "lua require('spider').motion('e')", --- { desc = "Spider-e" } --- ) --- vim.keymap.set( --- { "n", "o", "x" }, --- "b", --- "lua require('spider').motion('b')", --- { desc = "Spider-b" } --- ) - -- move.nvim local opts = { noremap = true, silent = true } vim.keymap.set('n', '', ':MoveLine(1)', opts) @@ -93,3 +72,4 @@ vim.keymap.set('v', '', ':MoveHBlock(1)', opts) -- neotree vim.keymap.set('n', '', ':Neotree toggle=true %:p:h:h %:p', { noremap = true, silent = true }) + diff --git a/lua/plugins.lua b/lua/plugins.lua index 1b1198b..03040bf 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -117,10 +117,6 @@ return { { 'nvim-pack/nvim-spectre' }, - { - 'chrisgrieser/nvim-spider', - lazy = true, - }, { 'fedepujol/move.nvim', config = function() @@ -282,28 +278,18 @@ return { }, }, }, - -- keys = { - -- -- Run API request - -- { "A", "HurlRunner", desc = "Run All requests" }, - -- { "a", "HurlRunnerAt", desc = "Run Api request" }, - -- { "te", "HurlRunnerToEntry", desc = "Run Api request to entry" }, - -- { "tm", "HurlToggleMode", desc = "Hurl Toggle Mode" }, - -- { "tv", "HurlVerbose", desc = "Run Api in verbose mode" }, - -- -- Run Hurl request in visual mode - -- { "h", ":HurlRunner", desc = "Hurl Runner", mode = "v" }, - -- }, }, { "LintaoAmons/scratch.nvim", opts = { - scratch_file_dir = vim.fn.stdpath("cache") .. "/scratch.nvim", -- where your scratch files will be put - filetypes = { "lua", "js", "sh", "py" }, -- you can simply put filetype here - filetype_details = { -- or, you can have more control here - json = {}, -- empty table is fine + scratch_file_dir = vim.fn.stdpath("cache") .. "/scratch.nvim", + filetypes = { "lua", "js", "bash", "sh", "py", "md" }, + filetype_details = { + json = {}, ["yaml"] = {}, go = { - requireDir = true, -- true if each scratch file requires a new directory - filename = "main", -- the filename of the scratch file in the new directory + requireDir = true, + filename = "main", content = { "package main", "", "func main() {", " ", "}" }, cursor = { location = { 4, 2 }, @@ -311,7 +297,7 @@ return { }, }, }, - window_cmd = "edit", -- 'vsplit' | 'split' | 'edit' | 'tabedit' | 'rightbelow vsplit' + window_cmd = "edit", use_telescope = true, localKeys = { { @@ -465,9 +451,6 @@ return { }, { "folke/noice.nvim", - -- opts = { - -- -- add any options here - -- }, dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify", @@ -697,15 +680,15 @@ return { }, }, { - "OXY2DEV/markview.nvim", - ft = "markdown", - + 'MeanderingProgrammer/render-markdown.nvim', + opts = {}, dependencies = { - "nvim-treesitter/nvim-treesitter", - - "nvim-tree/nvim-web-devicons" + 'nvim-treesitter/nvim-treesitter', }, }, + { + "dhruvasagar/vim-table-mode", + }, { 'declancm/maximize.nvim', config = function() require('maximize').setup() end @@ -743,47 +726,6 @@ return { } end, }, - { - 'chentoast/marks.nvim', - config = function() - require 'marks'.setup { - -- whether to map keybinds or not. default true - default_mappings = true, - -- which builtin marks to show. default {} - builtin_marks = { ".", "<", ">", "^" }, - -- whether movements cycle back to the beginning/end of buffer. default true - cyclic = true, - -- whether the shada file is updated after modifying uppercase marks. default false - force_write_shada = false, - -- how often (in ms) to redraw signs/recompute mark positions. - -- higher values will have better performance but may cause visual lag, - -- while lower values may cause performance penalties. default 150. - refresh_interval = 250, - -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase - -- marks, and bookmarks. - -- can be either a table with all/none of the keys, or a single number, in which case - -- the priority applies to all marks. - -- default 10. - sign_priority = { lower = 10, upper = 15, builtin = 8, bookmark = 20 }, - -- disables mark tracking for specific filetypes. default {} - excluded_filetypes = {}, - -- disables mark tracking for specific buftypes. default {} - excluded_buftypes = {}, - -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own - -- sign/virttext. Bookmarks can be used to group together positions and quickly move - -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and - -- default virt_text is "". - bookmark_0 = { - sign = "⚑", - virt_text = "hello world", - -- explicitly prompt for a virtual line annotation when setting a bookmark from this group. - -- defaults to false. - annotate = false, - }, - mappings = {} - } - end - }, { "willothy/flatten.nvim", config = function()