From b10ae57e05f4e95791ff754ce2da88ea55101ae8 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Tue, 1 Nov 2022 14:41:13 +1030 Subject: [PATCH 1/2] updates to nvim, added vim-surround and a couple of linters --- .config/nvim/init.lua | 9 ++++++--- .config/nvim/lua/user/autocmd.lua | 13 ++++++------- .config/nvim/lua/user/lsp/mason.lua | 20 +++++++++----------- .config/nvim/lua/user/lsp/null-ls.lua | 4 +++- .config/nvim/lua/user/lualine.lua | 22 ++++++++++++---------- .config/nvim/lua/user/notify.lua | 2 +- .config/nvim/lua/user/plugins.lua | 7 ++++++- 7 files changed, 43 insertions(+), 34 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 84ebe07..b65a553 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -12,7 +12,7 @@ require "user.colorizer" require "user.comment" require "user.dressing" require "user.dial" -require "user.fidget" +-- require "user.fidget" -- replaced with noice require "user.functions" require "user.gitsigns" require "user.harpoon" @@ -31,9 +31,12 @@ require "user.treesitter" require "user.whichkey" require "user.zen-mode" require "user.spectre" -require "user.bufferline" -require "user.winbar" +-- require "user.bufferline" -- replaced with cybu and bbye +-- disabled due to "Not enough room" issue see https://github.com/neovim/neovim/issues/19464 +-- and potential conflict with noice, I added it same time as updating so maybe not. +-- require "user.winbar" require "user.zk" require "user.tabout" require "user.cybu" require "user.dap" +require "user.noice" diff --git a/.config/nvim/lua/user/autocmd.lua b/.config/nvim/lua/user/autocmd.lua index a822220..71adba5 100644 --- a/.config/nvim/lua/user/autocmd.lua +++ b/.config/nvim/lua/user/autocmd.lua @@ -45,12 +45,12 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, { end, }) -vim.api.nvim_create_autocmd({ "BufWinEnter" }, { - pattern = { "*" }, - callback = function() - vim.cmd "checktime" - end, -}) +-- vim.api.nvim_create_autocmd({ "BufWinEnter" }, { +-- pattern = { "*" }, +-- callback = function() +-- vim.cmd "checktime" +-- end, +-- }) vim.api.nvim_create_autocmd({ "BufWritePost" }, { pattern = { "*.ts" }, @@ -84,4 +84,3 @@ vim.cmd [[autocmd VimLeave *.tex !texclear %]] vim.cmd [[ autocmd BufWritePost ~/repos/inks-scripts/** !~/repos/inks-scripts/install ]] - diff --git a/.config/nvim/lua/user/lsp/mason.lua b/.config/nvim/lua/user/lsp/mason.lua index 47ec534..a7613cb 100644 --- a/.config/nvim/lua/user/lsp/mason.lua +++ b/.config/nvim/lua/user/lsp/mason.lua @@ -50,6 +50,14 @@ mason_lspconfig.setup({ automatic_installation = true, }) +-- New way of setting up neodev, formally lua-dev by folke +local l_status_ok, neodev = pcall(require, "neodev") +if not l_status_ok then + return +end + +neodev.setup({}) + local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig") if not lspconfig_status_ok then print("lspconfig error!") @@ -72,17 +80,7 @@ for _, server in pairs(servers) do end if server == "sumneko_lua" then - local l_status_ok, lua_dev = pcall(require, "lua-dev") - if not l_status_ok then - return - end - local luadev = lua_dev.setup({ - lspconfig = { - on_attach = opts.on_attach, - capabilities = opts.capabilities, - }, - }) - lspconfig.sumneko_lua.setup(luadev) + lspconfig.sumneko_lua.setup({}) goto continue end diff --git a/.config/nvim/lua/user/lsp/null-ls.lua b/.config/nvim/lua/user/lsp/null-ls.lua index 84de120..cb37606 100644 --- a/.config/nvim/lua/user/lsp/null-ls.lua +++ b/.config/nvim/lua/user/lsp/null-ls.lua @@ -19,8 +19,10 @@ null_ls.setup { }, formatting.black.with { extra_args = { "--fast" } }, formatting.stylua, - formatting.shfmt, + -- formatting.shfmt, formatting.google_java_format, + formatting.bibclean, + formatting.beautysh, -- diagnostics.flake8, diagnostics.shellcheck, }, diff --git a/.config/nvim/lua/user/lualine.lua b/.config/nvim/lua/user/lualine.lua index f78b771..3c70683 100644 --- a/.config/nvim/lua/user/lualine.lua +++ b/.config/nvim/lua/user/lualine.lua @@ -27,15 +27,16 @@ local function process_sections(sections) end local function search_result() - if vim.v.hlsearch == 0 then - return '' - end - local last_search = vim.fn.getreg('/') - if not last_search or last_search == '' then - return '' - end - local searchcount = vim.fn.searchcount { maxcount = 9999 } - return last_search .. '(' .. searchcount.current .. '/' .. searchcount.total .. ')' + -- if vim.v.hlsearch == 0 then + -- return '' + -- end + -- local last_search = vim.fn.getreg('/') + -- if not last_search or last_search == '' then + -- return '' + -- end + -- local searchcount = vim.fn.searchcount { maxcount = 9999 } + -- return last_search .. '(' .. searchcount.current .. '/' .. searchcount.total .. ')' + return '' end local function modified() @@ -93,7 +94,8 @@ require('lualine').setup { }, lualine_c = {}, lualine_x = {}, - lualine_y = { search_result, 'filetype' }, + -- lualine_y = { search_result, 'filetype' }, + lualine_y = { 'filetype' }, lualine_z = { '%l:%c', '%p%%/%L' }, }, inactive_sections = { diff --git a/.config/nvim/lua/user/notify.lua b/.config/nvim/lua/user/notify.lua index 9c89436..bd000a7 100644 --- a/.config/nvim/lua/user/notify.lua +++ b/.config/nvim/lua/user/notify.lua @@ -19,7 +19,7 @@ notify.setup { render = "default", -- Default timeout for notifications - timeout = 5000, + timeout = 2000, -- For stages that change opacity this is treated as the highlight behind the window -- Set this to either a highlight group or an RGB hex value e.g. "#000000" diff --git a/.config/nvim/lua/user/plugins.lua b/.config/nvim/lua/user/plugins.lua index a193321..00c2148 100644 --- a/.config/nvim/lua/user/plugins.lua +++ b/.config/nvim/lua/user/plugins.lua @@ -45,6 +45,9 @@ return packer.startup(function(use) -- Plugin manager use("wbthomason/packer.nvim") -- Have packer manage inself + -- Noice :D + use("folke/noice.nvim") -- magic by folke. + -- Lua Development use("nvim-lua/plenary.nvim") -- useful lua functions use("nvim-lua/popup.nvim") @@ -113,6 +116,7 @@ return packer.startup(function(use) use("moll/vim-bbye") use("lewis6991/impatient.nvim") use("ghillb/cybu.nvim") + use("MunifTanjim/nui.nvim") -- Icons use("kyazdani42/nvim-web-devicons") @@ -150,7 +154,7 @@ return packer.startup(function(use) -- Editing Support use("windwp/nvim-autopairs") - use("vimwiki/vimwiki") + use("preservim/vim-markdown") use("folke/zen-mode.nvim") use("junegunn/vim-slash") use("andymass/vim-matchup") @@ -161,6 +165,7 @@ return packer.startup(function(use) wants = { "nvim-treesitter" }, }) use("windwp/nvim-spectre") + use("tpope/vim-surround") -- Keybinding use("folke/which-key.nvim") From 706035937034743599df58a3f2a97729ee3c31ed Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Tue, 1 Nov 2022 14:48:55 +1030 Subject: [PATCH 2/2] missing file --- .config/nvim/lua/user/noice.lua | 195 ++++++++++++++++++++++++++++++++ 1 file changed, 195 insertions(+) create mode 100644 .config/nvim/lua/user/noice.lua diff --git a/.config/nvim/lua/user/noice.lua b/.config/nvim/lua/user/noice.lua new file mode 100644 index 0000000..7201a5b --- /dev/null +++ b/.config/nvim/lua/user/noice.lua @@ -0,0 +1,195 @@ +local s_ok, noice = pcall(require, "noice") +if not s_ok then + return +end + +noice.setup({ + 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" }, + search_up = { kind = "search", pattern = "^%?", icon = " ", lang = "regex" }, + filter = { pattern = "^:%s*!", icon = "$", lang = "bash" }, + lua = { pattern = "^:%s*lua%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 + }, + -- 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 = true, + -- 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"] = false, + -- override cmp documentation with Noice (needs the other options to work) + ["cmp.entry.get_documentation"] = false, + }, + hover = { + enabled = true, + 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 }, + }, + }, + }, + markdown = { + hover = { + ["|(%S-)|"] = vim.cmd.help, -- vim help links + ["%[.-%]%((%S-)%)"] = require("noice.util").open, -- markdown links + }, + highlights = { + ["|%S-|"] = "@text.reference", + ["@%S+"] = "@parameter", + ["^%s*(Parameters:)"] = "@text.title", + ["^%s*(Return:)"] = "@text.title", + ["^%s*(See also:)"] = "@text.title", + ["{%S-}"] = "@parameter", + }, + }, + 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 = false, -- use a classic bottom cmdline for search + command_palette = false, -- position the cmdline and popupmenu together + long_message_to_split = false, -- 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 + }, + 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 +})