Yet another update

lua/plugins/fidget.lua

@@ -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
-			},
-		},
-	},
-}

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
-			},
-		},
-	},
 }

lua/plugins/git.lua

@@ -2,7 +2,6 @@ return {
 	{
 		"lewis6991/gitsigns.nvim",
 		opts = {
-
 			signs = {
 				add = { hl = "GitSignsAdd", text = "▎", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
 				change = {

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" },

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,
 	},
 }

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,
+		},
+	}),
+}

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<string, CmdlineFormat>
+				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<string, NoiceCommand>
+			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<string, NoiceFilter>
+			status = {}, --- @see section on statusline components
+			---@type NoiceFormatOptions
+			format = {}, --- @see section on formatting
+		},
+	},
+}

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 = {},
+		},
+	},
+}

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,
 	},
 }

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`)