From b10ae57e05f4e95791ff754ce2da88ea55101ae8 Mon Sep 17 00:00:00 2001 From: Solomon Laing Date: Tue, 1 Nov 2022 14:41:13 +1030 Subject: [PATCH] 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")