diff --git a/lazy-lock.json b/lazy-lock.json index 55e698e..d816eaa 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -5,7 +5,7 @@ "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" }, "ccc.nvim": { "branch": "main", "commit": "4a0ddaf787cc82796e84ab8a7f70d086f250aeb6" }, "clangd_extensions.nvim": { "branch": "main", "commit": "84ed5417b6119dca77c4f96da1fd73e316b85781" }, - "cmake-tools.nvim": { "branch": "master", "commit": "61f075968ea7e790a39a1ff00484a0befdbd0ac9" }, + "cmake-tools.nvim": { "branch": "master", "commit": "b490713bc661613a14f01d2d01a1c44382e1c5c3" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -13,26 +13,27 @@ "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" }, "darkplus.nvim": { "branch": "master", "commit": "7c236649f0617809db05cd30fb10fed7fb01b83b" }, - "distant.nvim": { "branch": "master", "commit": "9dd21f8fa25795e56756e1ea27a1586ceee35582" }, + "distant.nvim": { "branch": "v0.3", "commit": "17bcd37f8d91dcb987456be456d8a95db1a772ba" }, "dracula.nvim": { "branch": "main", "commit": "9fe831e685a76e1a1898a694623b33247c4d036c" }, - "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" }, - "gitsigns.nvim": { "branch": "main", "commit": "287fffb410ce82d19da2d503a1f1570adf7b7874" }, + "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, "hologram.nvim": { "branch": "main", "commit": "f5194f71ec1578d91b2e3119ff08e574e2eab542" }, "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" }, "kanagawa.nvim": { "branch": "master", "commit": "1749cea392acb7d1548a946fcee1e6f1304cd3cb" }, "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, - "lsp-zero.nvim": { "branch": "v2.x", "commit": "73bc33fe9ad5a1d4501536fdd4755b3aa18c3392" }, + "lsp-zero.nvim": { "branch": "v2.x", "commit": "96974fe970c37bd3879ad8b6be4fe7ddfad75680" }, + "lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" }, "mason-null-ls.nvim": { "branch": "main", "commit": "ae0c5fa57468ac65617f1bf821ba0c3a1e251f0c" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, - "mason.nvim": { "branch": "main", "commit": "fe9e34a9ab4d64321cdc3ecab4ea1809239bb73f" }, + "mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" }, "melange-nvim": { "branch": "master", "commit": "11f35df3e091f35e966a335ed90b0d8a03851ffd" }, "mkdir.nvim": { "branch": "main", "commit": "c55d1dee4f099528a1853b28bb28caa802eba217" }, - "nightfly": { "branch": "master", "commit": "903da3ef1e41c6c763c9f98de6f2f9dc193ca5e7" }, + "neogen": { "branch": "main", "commit": "cb1f384df804c1bf729332c4f728253fe17962d4" }, + "nightfly": { "branch": "master", "commit": "e5638253af9bc27b81a129690cd9a9a7fcf79f4d" }, "nightfox.nvim": { "branch": "main", "commit": "a48f6d9a0273101df76eb25d2f5477baa277f935" }, "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" }, "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" }, @@ -43,17 +44,16 @@ "nvim-colorizer.lua": { "branch": "master", "commit": "dde3084106a70b9a79d48f426f6d6fec6fd203f7" }, "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" }, "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" }, - "nvim-lspconfig": { "branch": "master", "commit": "4b1a764c10c6c8679615fcb4f1e8b0f5513d900b" }, + "nvim-lspconfig": { "branch": "master", "commit": "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4" }, "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" }, "nvim-tree.lua": { "branch": "master", "commit": "904f95cd9db31d1800998fa428e78e418a50181d" }, - "nvim-treesitter": { "branch": "master", "commit": "ae88851cac32415c8239a04b7ee44d8f7625e186" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" }, + "nvim-treesitter": { "branch": "master", "commit": "80cee52d445363c8bd08eacca17be31e3837f4d0" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" }, "nvim-ts-rainbow": { "branch": "master", "commit": "ef95c15a935f97c65a80e48e12fe72d49aacf9b9" }, "nvim-ufo": { "branch": "main", "commit": "5be5b800b4f3512bca128f345e9c98574b5637c0" }, "nvim-web-devicons": { "branch": "master", "commit": "eb8f80f30fd5e9a6176dee5c46661ebd7437ac46" }, "obsidian.nvim": { "branch": "main", "commit": "8f1c896c4f084facddb235696a0dcc940411f3d5" }, - "oil.nvim": { "branch": "master", "commit": "eaa20a6aee7c4df89d80ec8208de63ec2fa4d38a" }, + "oil.nvim": { "branch": "master", "commit": "0e5fca35cdc743cf3a448cea1a6251cf25cebafa" }, "onedark.nvim": { "branch": "master", "commit": "09b71d84bd2524438e48c0aa5b54d855cc72af32" }, "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, "playground": { "branch": "master", "commit": "2b81a018a49f8e476341dfcb228b7b808baba68b" }, @@ -62,13 +62,14 @@ "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, "rainbow_csv": { "branch": "master", "commit": "7453a3f9679f0c753ec9d77f9ea8588778f35aeb" }, + "refactoring.nvim": { "branch": "master", "commit": "5359e74291164fcaeaaecdea9ba753ad54eb53d0" }, "rest.nvim": { "branch": "main", "commit": "22673c848768ff25517154a5aebfebc0c77d0b4f" }, "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, "sqls.nvim": { "branch": "main", "commit": "4b1274b5b44c48ce784aac23747192f5d9d26207" }, "tagbar": { "branch": "master", "commit": "be563539754b7af22bbe842ef217d4463f73468c" }, "telescope-color-names.nvim": { "branch": "main", "commit": "95b372b9a8ba0fc7cf6a67be637ee37453f322da" }, "telescope-emoji.nvim": { "branch": "master", "commit": "86248d97be84a1ce83f0541500ef9edc99ea2aa1" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "54de6e45b958e37a2eca4dca22572b6c08866177" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "251fdb32d21321fec7bd3c39a3a8bc87b04145d4" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9bc8237565ded606e6c366a71c64c0af25cd7a50" }, "telescope-media-files.nvim": { "branch": "master", "commit": "0826c7a730bc4d36068f7c85cf4c5b3fd9fb570a" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" }, @@ -82,7 +83,6 @@ "vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-markdown": { "branch": "master", "commit": "cc82d88e2a791f54d2b6e2b26e41f743351ac947" }, - "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" }, "vimwiki": { "branch": "dev", "commit": "f0fe154ede6b11e3db9b058b930005a056a3d1c6" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" } diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua deleted file mode 100644 index f39f47d..0000000 --- a/lua/plugins/fidget.lua +++ /dev/null @@ -1,57 +0,0 @@ -return { - { - "j-hui/fidget.nvim", - tag = "legacy", - event = "LspAttach", - opts = { - text = { - spinner = "pipe", -- animation shown when tasks are ongoing - done = "✔", -- character shown when all tasks are complete - commenced = "Started", -- message shown when task starts - completed = "Completed", -- message shown when task completes - }, - align = { - bottom = true, -- align fidgets along bottom edge of buffer - right = true, -- align fidgets along right edge of buffer - }, - timer = { - spinner_rate = 125, -- frame rate of spinner animation, in ms - fidget_decay = 2000, -- how long to keep around empty fidget, in ms - task_decay = 1000, -- how long to keep around completed task, in ms - }, - window = { - relative = "win", -- where to anchor, either "win" or "editor" - blend = 0, -- &winblend for the window - zindex = nil, -- the zindex value for the window - border = "none", -- style of border for the fidget window - }, - fmt = { - leftpad = true, -- right-justify text in fidget box - stack_upwards = true, -- list of tasks grows upwards - max_width = 0, -- maximum width of the fidget box - -- function to format fidget title - fidget = function(fidget_name, spinner) - return string.format("%s %s", spinner, fidget_name) - end, - -- function to format each task line - task = function(task_name, message, percentage) - return string.format( - "%s%s [%s]", - message, - percentage and string.format(" (%s%%)", percentage) or "", - task_name - ) - end, - }, - sources = { -- Sources to configure - ["*"] = { -- Name of source - ignore = false, -- Ignore notifications from this source - }, - }, - debug = { - logging = false, -- whether to enable logging, for debugging - strict = false, -- whether to interpret LSP strictly - }, - }, - }, -} diff --git a/lua/plugins/general.lua b/lua/plugins/general.lua index 9905903..6a51f24 100644 --- a/lua/plugins/general.lua +++ b/lua/plugins/general.lua @@ -1,18 +1,6 @@ return { { "folke/lazy.nvim" }, { "nvim-lua/plenary.nvim" }, -- Useful lua functions used by lots of plugins - { - "windwp/nvim-autopairs", -- Autopairs, integrates with both cmp and treesitter - opts = { - check_ts = true, -- treesitter integration - disable_filetype = { - "NvimTree", - "TelescopePrompt", - "alpha", - "lazy", - }, - }, - }, { "goolord/alpha-nvim", lazy = true }, -- TODO: replace alphh with veil @@ -45,7 +33,6 @@ return { }, { "alvan/vim-closetag" }, - { "tpope/vim-surround" }, { "mbbill/undotree", lazy = true }, { "preservim/tagbar" }, { "jghauser/mkdir.nvim", lazy = true }, @@ -65,7 +52,20 @@ return { { "rest-nvim/rest.nvim", lazy = true }, - { "chipsenkbeil/distant.nvim", lazy = true }, + { + "chipsenkbeil/distant.nvim", + branch = "v0.3", + config = function() + require("distant"):setup() + end, + }, + + { + "danymat/neogen", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + config = true, + version = "*", + }, { "kevinhwang91/nvim-ufo", @@ -73,31 +73,4 @@ return { "kevinhwang91/promise-async", }, }, - - { - "folke/noice.nvim", - event = "VeryLazy", - dependencies = { - "MunifTanjim/nui.nvim", - "rcarriga/nvim-notify", - }, - opts = { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, - }, - }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - 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/lua/plugins/git.lua b/lua/plugins/git.lua index 1f53517..d480da8 100644 --- a/lua/plugins/git.lua +++ b/lua/plugins/git.lua @@ -2,7 +2,6 @@ return { { "lewis6991/gitsigns.nvim", opts = { - signs = { add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" }, change = { diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index afdc91b..65fe1b1 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -31,6 +31,20 @@ return { }, }, + { + "windwp/nvim-autopairs", -- Autopairs, integrates with both cmp and treesitter + event = "InsertEnter", + opts = { + check_ts = true, -- treesitter integration + disable_filetype = { + "NvimTree", + "TelescopePrompt", + "alpha", + "lazy", + }, + }, + }, + { "jay-babu/mason-null-ls.nvim", event = { "BufReadPre", "BufNewFile" }, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 4486a8e..deaea30 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,26 +1,76 @@ return { { "nvim-lualine/lualine.nvim", - event = "VeryLazy", + dependencies = { + "arkav/lualine-lsp-progress", + }, opts = { - options = { - globalstatus = true, icons_enabled = true, theme = "auto", component_separators = { left = "", right = "" }, section_separators = { left = "", right = "" }, - disabled_filetypes = { "alpha", "dashboard" }, + disabled_filetypes = { + statusline = { "alpha", "dashboard" }, + winbar = {}, + }, + ignore_focus = {}, always_divide_middle = true, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch" }, - lualine_c = { "diff" }, - lualine_x = { "lsp_progress", "diagnostics" }, - lualine_y = { "filename" }, - lualine_z = { "location", "progress" }, + globalstatus = true, + refresh = { + statusline = 1000, + tabline = 1000, + winbar = 1000, + }, }, }, + config = function() + require("lualine").setup({ + --[[ Available components + + `branch` (git branch) + `buffers` (shows currently available buffers) + `diagnostics` (diagnostics count from your preferred source) + `diff` (git diff status) + `encoding` (file encoding) + `fileformat` (file format) + `filename` + `filesize` + `filetype` + `hostname` + `location` (location in file in line:column format) + `mode` (vim mode) + `progress` (%progress in file) + `searchcount` (number of search matches when hlsearch is active) + `selectioncount` (number of selected characters or lines) + `tabs` (shows currently available tabs) + `windows` (shows currently available windows) ]] + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch" }, + lualine_c = { "diff", "lsp_progress" }, + lualine_x = { + { + require("noice").api.statusline.mode.get, + cond = require("noice").api.statusline.mode.has, + color = { fg = "#e0af68" }, + }, + "diagnostics", + }, + lualine_y = { "filename" }, + lualine_z = { "location", "progress" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = {}, + lualine_c = { "filename" }, + lualine_x = { "location" }, + lualine_y = {}, + lualine_z = {}, + }, + tabline = {}, + extensions = {}, + }) + end, }, } diff --git a/lua/plugins/neorg.lua b/lua/plugins/neorg.lua new file mode 100644 index 0000000..684162f --- /dev/null +++ b/lua/plugins/neorg.lua @@ -0,0 +1,24 @@ +return { + require("lazy").setup({ + { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + require("neorg").setup({ + load = { + ["core.defaults"] = {}, -- Loads default behaviour + ["core.concealer"] = {}, -- Adds pretty icons to your documents + ["core.dirman"] = { -- Manages Neorg workspaces + config = { + workspaces = { + notes = "~/neorg", + }, + }, + }, + }, + }) + end, + }, + }), +} diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua new file mode 100644 index 0000000..e54d067 --- /dev/null +++ b/lua/plugins/noice.lua @@ -0,0 +1,207 @@ +return { + { + "folke/noice.nvim", + event = "VeryLazy", + dependencies = { + "MunifTanjim/nui.nvim", + "rcarriga/nvim-notify", + "nvim-treesitter/nvim-treesitter", + }, + opts = { + cmdline = { + enabled = true, -- enables the Noice cmdline UI + view = "cmdline_popup", -- view for rendering the cmdline. Change to `cmdline` to get a classic cmdline at the bottom + opts = {}, -- global options for the cmdline. See section on views + ---@type table + format = { + -- conceal: (default=true) This will hide the text in the cmdline that matches the pattern. + -- view: (default is cmdline view) + -- opts: any options passed to the view + -- icon_hl_group: optional hl_group for the icon + -- title: set to anything or empty string to hide + cmdline = { pattern = "^:", icon = "", lang = "vim" }, + search_down = { + kind = "search", + pattern = "^/", + icon = " ", + lang = "regex", + view = "cmdline_popup", + }, + search_up = { + kind = "search", + pattern = "^%?", + icon = " ", + lang = "regex", + view = "cmdline_popup", + }, + filter = { pattern = "^:%s*!", icon = "$", lang = "bash" }, + lua = { pattern = { "^:%s*lua%s+", "^:%s*lua%s*=%s*", "^:%s*=%s*" }, icon = "", lang = "lua" }, + help = { pattern = "^:%s*he?l?p?%s+", icon = "" }, + input = {}, -- Used by input() + -- lua = false, -- to disable a format, set to `false` + }, + }, + messages = { + -- NOTE: If you enable messages, then the cmdline is enabled automatically. + -- This is a current Neovim limitation. + enabled = true, -- enables the Noice messages UI + view = "notify", -- default view for messages + view_error = "notify", -- view for errors + view_warn = "notify", -- view for warnings + view_history = "messages", -- view for :messages + view_search = "virtualtext", -- view for search count messages. Set to `false` to disable + }, + popupmenu = { + enabled = true, -- enables the Noice popupmenu UI + ---@type 'nui'|'cmp' + backend = "nui", -- backend to use to show regular cmdline completions + ---@type NoicePopupmenuItemKind|false + -- Icons for completion item kinds (see defaults at noice.config.icons.kinds) + kind_icons = {}, -- set to `false` to disable icons + }, + -- default options for require('noice').redirect + -- see the section on Command Redirection + ---@type NoiceRouteConfig + redirect = { + view = "popup", + filter = { event = "msg_show" }, + }, + -- You can add any custom commands below that will be available with `:Noice command` + ---@type table + commands = { + history = { + -- options for the message history that you get with `:Noice` + view = "split", + opts = { enter = true, format = "details" }, + filter = { + any = { + { event = "notify" }, + { error = true }, + { warning = true }, + { event = "msg_show", kind = { "" } }, + { event = "lsp", kind = "message" }, + }, + }, + }, + -- :Noice last + last = { + view = "popup", + opts = { enter = true, format = "details" }, + filter = { + any = { + { event = "notify" }, + { error = true }, + { warning = true }, + { event = "msg_show", kind = { "" } }, + { event = "lsp", kind = "message" }, + }, + }, + filter_opts = { count = 1 }, + }, + -- :Noice errors + errors = { + -- options for the message history that you get with `:Noice` + view = "popup", + opts = { enter = true, format = "details" }, + filter = { error = true }, + filter_opts = { reverse = true }, + }, + }, + notify = { + -- Noice can be used as `vim.notify` so you can route any notification like other messages + -- Notification messages have their level and other properties set. + -- event is always "notify" and kind can be any log level as a string + -- The default routes will forward notifications to nvim-notify + -- Benefit of using Noice for this is the routing and consistent history view + enabled = true, + view = "notify", + }, + lsp = { + progress = { + enabled = false, + -- Lsp Progress is formatted using the builtins for lsp_progress. See config.format.builtin + -- See the section on formatting for more details on how to customize. + --- @type NoiceFormat|string + format = "lsp_progress", + --- @type NoiceFormat|string + format_done = "lsp_progress_done", + throttle = 1000 / 30, -- frequency to update lsp progress message + view = "mini", + }, + override = { + -- override the default lsp markdown formatter with Noice + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + -- override the lsp markdown formatter with Noice + ["vim.lsp.util.stylize_markdown"] = true, + -- override cmp documentation with Noice (needs the other options to work) + ["cmp.entry.get_documentation"] = true, + }, + hover = { + enabled = true, + silent = false, -- set to true to not show a message if hover is not available + view = nil, -- when nil, use defaults from documentation + ---@type NoiceViewOptions + opts = {}, -- merged with defaults from documentation + }, + signature = { + enabled = true, + auto_open = { + enabled = true, + trigger = true, -- Automatically show signature help when typing a trigger character from the LSP + luasnip = true, -- Will open signature help when jumping to Luasnip insert nodes + throttle = 50, -- Debounce lsp signature help request by 50ms + }, + view = nil, -- when nil, use defaults from documentation + ---@type NoiceViewOptions + opts = {}, -- merged with defaults from documentation + }, + message = { + -- Messages shown by lsp servers + enabled = true, + view = "notify", + opts = {}, + }, + -- defaults for hover and signature help + documentation = { + view = "hover", + ---@type NoiceViewOptions + opts = { + lang = "markdown", + replace = true, + render = "plain", + format = { "{message}" }, + win_options = { concealcursor = "n", conceallevel = 3 }, + }, + }, + }, + health = { + checker = true, -- Disable if you don't want health checks to run + }, + smart_move = { + -- noice tries to move out of the way of existing floating windows. + enabled = true, -- you can disable this behaviour here + -- add any filetypes here, that shouldn't trigger smart move. + excluded_filetypes = { "cmp_menu", "cmp_docs", "notify" }, + }, + ---@type NoicePresets + presets = { + -- you can enable a preset by setting it to true, or a table that will override the preset config + -- you can also add custom presets that you can enable/disable with enabled=true + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = true, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = true, -- add a border to hover docs and signature help + }, + throttle = 1000 / 30, -- how frequently does Noice need to check for ui updates? This has no effect when in blocking mode. + ---@type NoiceConfigViews + views = {}, ---@see section on views + ---@type NoiceRouteConfig[] + routes = {}, --- @see section on routes + ---@type table + status = {}, --- @see section on statusline components + ---@type NoiceFormatOptions + format = {}, --- @see section on formatting + }, + }, +} diff --git a/lua/plugins/refactor.lua b/lua/plugins/refactor.lua new file mode 100644 index 0000000..52fdad9 --- /dev/null +++ b/lua/plugins/refactor.lua @@ -0,0 +1,34 @@ +return { + { + + "ThePrimeagen/refactoring.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "nvim-treesitter/nvim-treesitter", + }, + opts = { + prompt_func_return_type = { + go = true, + java = true, + + cpp = true, + c = true, + h = true, + hpp = true, + cxx = true, + }, + prompt_func_param_type = { + go = true, + java = true, + + cpp = true, + c = true, + h = true, + hpp = true, + cxx = true, + }, + printf_statements = {}, + print_var_statements = {}, + }, + }, +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index c4f6b93..7e13389 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -95,6 +95,7 @@ return { telescope.load_extension("emoji") telescope.load_extension("ui-select") telescope.load_extension("color_names") + telescope.load_extension("noice") end, }, } diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua index be1814e..fa489c4 100644 --- a/lua/plugins/treesitter.lua +++ b/lua/plugins/treesitter.lua @@ -6,12 +6,10 @@ return { "nvim-treesitter/playground", "p00f/nvim-ts-rainbow", "mechatroner/rainbow_csv", - "nvim-treesitter/nvim-treesitter-textobjects", "JoosepAlviste/nvim-ts-context-commentstring", }, config = function() require("nvim-treesitter.configs").setup({ - -- A list of parser names, or "all" (the five listed parsers should always be installed) ensure_installed = "all", -- one of "all" or a list of languages -- Install parsers synchronously (only applied to `ensure_installed`) diff --git a/lua/solo/autocommands.lua b/lua/solo/autocommands.lua index 1b888ea..60c61d7 100644 --- a/lua/solo/autocommands.lua +++ b/lua/solo/autocommands.lua @@ -8,17 +8,6 @@ vim.api.nvim_create_autocmd({ "FileType" }, { end, }) --- Remove statusline and tabline when in Alpha --- vim.api.nvim_create_autocmd({ "User" }, { --- pattern = { "AlphaReady" }, --- callback = function() --- vim.cmd([[ --- set showtabline=0 | autocmd BufUnload set showtabline=2 --- set laststatus=0 | autocmd BufUnload set laststatus=3 --- ]]) --- end, --- }) - -- Set wrap and spell in markdown and gitcommit vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "gitcommit", "markdown", "vimwiki" }, diff --git a/lua/solo/keymaps.lua b/lua/solo/keymaps.lua index 38f845d..c2fb532 100644 --- a/lua/solo/keymaps.lua +++ b/lua/solo/keymaps.lua @@ -3,8 +3,6 @@ local opts = { silent = true } --Remap space as leader key bind("", "", "", opts) -bind("n", "q", "", opts) -bind("n", "Q", "", opts) vim.g.mapleader = " " -- Modes