diff options
| author | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-09-03 12:09:14 +0200 |
|---|---|---|
| committer | Ariel D'Alessandro <dalessandro.ariel@gmail.com> | 2023-09-03 12:09:14 +0200 |
| commit | 26f078de81ee51f1fb91a5d4f5dc7837515ab8c0 (patch) | |
| tree | 2fb6aeb92245ca34b111d2536e7a2c4940a06716 /lua/plugins | |
| parent | 9531ae2ef6c02640d2daa2608dd9665c1643a225 (diff) | |
| download | nvim-conf-26f078de81ee51f1fb91a5d4f5dc7837515ab8c0.tar.gz nvim-conf-26f078de81ee51f1fb91a5d4f5dc7837515ab8c0.zip | |
more updates
Diffstat (limited to 'lua/plugins')
| -rw-r--r-- | lua/plugins/database.lua | 28 | ||||
| -rw-r--r-- | lua/plugins/lazygit.lua | 8 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 20 | ||||
| -rw-r--r-- | lua/plugins/noice.lua | 9 | ||||
| -rw-r--r-- | lua/plugins/overseer.lua | 5 | ||||
| -rw-r--r-- | lua/plugins/treesitter.lua | 130 | ||||
| -rw-r--r-- | lua/plugins/trouble.lua | 2 |
7 files changed, 56 insertions, 146 deletions
diff --git a/lua/plugins/database.lua b/lua/plugins/database.lua index 4ffb064..e156510 100644 --- a/lua/plugins/database.lua +++ b/lua/plugins/database.lua @@ -22,33 +22,5 @@ return { Describe = "PRAGMA table_info({table})", }, } - - vim.g.db_ui_icons = { - expanded = { - db = "▾ ", - buffers = "▾ ", - saved_queries = "▾ ", - schemas = "▾ ", - schema = "▾ פּ", - tables = "▾ 藺", - table = "▾ ", - }, - collapsed = { - db = "▸ ", - buffers = "▸ ", - saved_queries = "▸ ", - schemas = "▸ ", - schema = "▸ פּ", - tables = "▸ 藺", - table = "▸ ", - }, - saved_query = "", - new_query = "璘", - tables = "離", - buffers = "", - add_connection = "", - connection_ok = "✓", - connection_error = "✕", - } end, } diff --git a/lua/plugins/lazygit.lua b/lua/plugins/lazygit.lua deleted file mode 100644 index 0320d79..0000000 --- a/lua/plugins/lazygit.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - "kdheepak/lazygit.nvim", - enabled = false, - keys = { { "<leader>gg", ":LazyGit<cr>" } }, - config = function() - vim.env.GIT_EDITOR = "nvr -cc split --remote-wait +'set bufhidden=wipe'" - end, -} diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 0458b7f..1c0a855 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -18,26 +18,6 @@ return { "williamboman/mason-lspconfig.nvim", "WhoIsSethDaniel/mason-tool-installer.nvim", { - "lvimuser/lsp-inlayhints.nvim", - enabled = false, - config = function() - require("lsp-inlayhints").setup() - vim.api.nvim_create_augroup("LspAttach_inlayhints", {}) - 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) - require("lsp-inlayhints").on_attach(client, bufnr, false) - end, - }) - end, - }, - { "j-hui/fidget.nvim", enabled = false, opts = { diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua index a1d7f47..72f9e13 100644 --- a/lua/plugins/noice.lua +++ b/lua/plugins/noice.lua @@ -3,6 +3,7 @@ return { dependencies = { "MunifTanjim/nui.nvim", }, + event = "VeryLazy", opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** @@ -108,6 +109,14 @@ return { find = "Pattern not found", }, }, + { + view = "mini", + filter = { + event = "msg_show", + kind = "", + find = "change;" + } + }, }, }, } diff --git a/lua/plugins/overseer.lua b/lua/plugins/overseer.lua deleted file mode 100644 index 634de8b..0000000 --- a/lua/plugins/overseer.lua +++ /dev/null @@ -1,5 +0,0 @@ -return { - "stevearc/overseer.nvim", - enabled = false, - config = true, -} diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index ba55910..35db83a 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -2,94 +2,56 @@ return { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", dependencies = { - "nvim-treesitter/playground", - { "nvim-treesitter/nvim-treesitter-refactor", enabled = false }, "nvim-treesitter/nvim-treesitter-textobjects", }, - config = function() - require("nvim-treesitter.configs").setup { - ensure_installed = { - "bash", - "css", - "go", - "gomod", - "html", - "javascript", - "json", - "lua", - "luadoc", - "markdown", - "markdown_inline", - "nix", - "org", - "php", - "phpdoc", - "query", - "rust", - "sql", - "svelte", - "typescript", - "regex", - "vim", - "yaml", - }, - highlight = { - enable = true, - additional_vim_regex_highlighting = { "org" }, - }, - indent = { - enable = true, - }, - incremental_selection = { + event = "VeryLazy", + main = "nvim-treesitter.configs", + opts = { + ensure_installed = { + "bash", + "css", + "go", + "gomod", + "html", + "javascript", + "json", + "lua", + "luadoc", + "markdown", + "markdown_inline", + "nix", + "org", + "php", + "phpdoc", + "query", + "rust", + "sql", + "svelte", + "typescript", + "regex", + "vim", + "yaml", + }, + highlight = { + enable = true, + additional_vim_regex_highlighting = { "org" }, + }, + indent = { + enable = true, + }, + textobjects = { + select = { enable = true, + lookahead = true, keymaps = { - init_selection = "gnn", - node_incremental = "grn", - scope_incremental = "grc", - node_decremental = "grm", + ["af"] = "@function.outer", + ["if"] = "@function.inner", + ["ac"] = "@conditional.outer", + ["ic"] = "@conditional.inner", + ["al"] = "@loop.outer", + ["il"] = "@loop.inner", }, }, - -- refactor = { - -- highlight_definitions = { enable = true }, - -- smart_rename = { - -- enable = false, - -- keymaps = { - -- smart_rename = "trr", - -- }, - -- }, - -- }, - textobjects = { - select = { - enable = true, - lookahead = true, - keymaps = { - ["af"] = "@function.outer", - ["if"] = "@function.inner", - ["ac"] = "@conditional.outer", - ["ic"] = "@conditional.inner", - ["al"] = "@loop.outer", - ["il"] = "@loop.inner", - }, - }, - }, - playground = { - enable = true, - disable = {}, - updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code - persist_queries = false, -- Whether the query persists across vim sessions - keybindings = { - toggle_query_editor = "o", - toggle_hl_groups = "i", - toggle_injected_languages = "t", - toggle_anonymous_nodes = "a", - toggle_language_display = "I", - focus_language = "f", - unfocus_language = "F", - update = "R", - goto_node = "<cr>", - show_help = "?", - }, - }, - } - end, + }, + }, } diff --git a/lua/plugins/trouble.lua b/lua/plugins/trouble.lua index 3f884fe..5a87f26 100644 --- a/lua/plugins/trouble.lua +++ b/lua/plugins/trouble.lua @@ -1,6 +1,6 @@ return { "folke/trouble.nvim", - enabled = false, + enabled = true, dependencies = "kyazdani42/nvim-web-devicons", keys = { { "<leader><leader>t", "<cmd>TroubleToggle<cr>", desc = "Trouble toggle" } }, config = true, |