updates to nvim, added vim-surround and a couple of linters
This commit is contained in:
parent
5892a24f80
commit
b10ae57e05
@ -12,7 +12,7 @@ require "user.colorizer"
|
|||||||
require "user.comment"
|
require "user.comment"
|
||||||
require "user.dressing"
|
require "user.dressing"
|
||||||
require "user.dial"
|
require "user.dial"
|
||||||
require "user.fidget"
|
-- require "user.fidget" -- replaced with noice
|
||||||
require "user.functions"
|
require "user.functions"
|
||||||
require "user.gitsigns"
|
require "user.gitsigns"
|
||||||
require "user.harpoon"
|
require "user.harpoon"
|
||||||
@ -31,9 +31,12 @@ require "user.treesitter"
|
|||||||
require "user.whichkey"
|
require "user.whichkey"
|
||||||
require "user.zen-mode"
|
require "user.zen-mode"
|
||||||
require "user.spectre"
|
require "user.spectre"
|
||||||
require "user.bufferline"
|
-- require "user.bufferline" -- replaced with cybu and bbye
|
||||||
require "user.winbar"
|
-- 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.zk"
|
||||||
require "user.tabout"
|
require "user.tabout"
|
||||||
require "user.cybu"
|
require "user.cybu"
|
||||||
require "user.dap"
|
require "user.dap"
|
||||||
|
require "user.noice"
|
||||||
|
|||||||
@ -45,12 +45,12 @@ vim.api.nvim_create_autocmd({ "VimEnter" }, {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
|
-- vim.api.nvim_create_autocmd({ "BufWinEnter" }, {
|
||||||
pattern = { "*" },
|
-- pattern = { "*" },
|
||||||
callback = function()
|
-- callback = function()
|
||||||
vim.cmd "checktime"
|
-- vim.cmd "checktime"
|
||||||
end,
|
-- end,
|
||||||
})
|
-- })
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
vim.api.nvim_create_autocmd({ "BufWritePost" }, {
|
||||||
pattern = { "*.ts" },
|
pattern = { "*.ts" },
|
||||||
@ -84,4 +84,3 @@ vim.cmd [[autocmd VimLeave *.tex !texclear %]]
|
|||||||
vim.cmd [[
|
vim.cmd [[
|
||||||
autocmd BufWritePost ~/repos/inks-scripts/** !~/repos/inks-scripts/install
|
autocmd BufWritePost ~/repos/inks-scripts/** !~/repos/inks-scripts/install
|
||||||
]]
|
]]
|
||||||
|
|
||||||
|
|||||||
@ -50,6 +50,14 @@ mason_lspconfig.setup({
|
|||||||
automatic_installation = true,
|
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")
|
local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
|
||||||
if not lspconfig_status_ok then
|
if not lspconfig_status_ok then
|
||||||
print("lspconfig error!")
|
print("lspconfig error!")
|
||||||
@ -72,17 +80,7 @@ for _, server in pairs(servers) do
|
|||||||
end
|
end
|
||||||
|
|
||||||
if server == "sumneko_lua" then
|
if server == "sumneko_lua" then
|
||||||
local l_status_ok, lua_dev = pcall(require, "lua-dev")
|
lspconfig.sumneko_lua.setup({})
|
||||||
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)
|
|
||||||
goto continue
|
goto continue
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -19,8 +19,10 @@ null_ls.setup {
|
|||||||
},
|
},
|
||||||
formatting.black.with { extra_args = { "--fast" } },
|
formatting.black.with { extra_args = { "--fast" } },
|
||||||
formatting.stylua,
|
formatting.stylua,
|
||||||
formatting.shfmt,
|
-- formatting.shfmt,
|
||||||
formatting.google_java_format,
|
formatting.google_java_format,
|
||||||
|
formatting.bibclean,
|
||||||
|
formatting.beautysh,
|
||||||
-- diagnostics.flake8,
|
-- diagnostics.flake8,
|
||||||
diagnostics.shellcheck,
|
diagnostics.shellcheck,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -27,15 +27,16 @@ local function process_sections(sections)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function search_result()
|
local function search_result()
|
||||||
if vim.v.hlsearch == 0 then
|
-- 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 ''
|
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 .. ')'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
local function modified()
|
local function modified()
|
||||||
@ -93,7 +94,8 @@ require('lualine').setup {
|
|||||||
},
|
},
|
||||||
lualine_c = {},
|
lualine_c = {},
|
||||||
lualine_x = {},
|
lualine_x = {},
|
||||||
lualine_y = { search_result, 'filetype' },
|
-- lualine_y = { search_result, 'filetype' },
|
||||||
|
lualine_y = { 'filetype' },
|
||||||
lualine_z = { '%l:%c', '%p%%/%L' },
|
lualine_z = { '%l:%c', '%p%%/%L' },
|
||||||
},
|
},
|
||||||
inactive_sections = {
|
inactive_sections = {
|
||||||
|
|||||||
@ -19,7 +19,7 @@ notify.setup {
|
|||||||
render = "default",
|
render = "default",
|
||||||
|
|
||||||
-- Default timeout for notifications
|
-- Default timeout for notifications
|
||||||
timeout = 5000,
|
timeout = 2000,
|
||||||
|
|
||||||
-- For stages that change opacity this is treated as the highlight behind the window
|
-- 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"
|
-- Set this to either a highlight group or an RGB hex value e.g. "#000000"
|
||||||
|
|||||||
@ -45,6 +45,9 @@ return packer.startup(function(use)
|
|||||||
-- Plugin manager
|
-- Plugin manager
|
||||||
use("wbthomason/packer.nvim") -- Have packer manage inself
|
use("wbthomason/packer.nvim") -- Have packer manage inself
|
||||||
|
|
||||||
|
-- Noice :D
|
||||||
|
use("folke/noice.nvim") -- magic by folke.
|
||||||
|
|
||||||
-- Lua Development
|
-- Lua Development
|
||||||
use("nvim-lua/plenary.nvim") -- useful lua functions
|
use("nvim-lua/plenary.nvim") -- useful lua functions
|
||||||
use("nvim-lua/popup.nvim")
|
use("nvim-lua/popup.nvim")
|
||||||
@ -113,6 +116,7 @@ return packer.startup(function(use)
|
|||||||
use("moll/vim-bbye")
|
use("moll/vim-bbye")
|
||||||
use("lewis6991/impatient.nvim")
|
use("lewis6991/impatient.nvim")
|
||||||
use("ghillb/cybu.nvim")
|
use("ghillb/cybu.nvim")
|
||||||
|
use("MunifTanjim/nui.nvim")
|
||||||
|
|
||||||
-- Icons
|
-- Icons
|
||||||
use("kyazdani42/nvim-web-devicons")
|
use("kyazdani42/nvim-web-devicons")
|
||||||
@ -150,7 +154,7 @@ return packer.startup(function(use)
|
|||||||
|
|
||||||
-- Editing Support
|
-- Editing Support
|
||||||
use("windwp/nvim-autopairs")
|
use("windwp/nvim-autopairs")
|
||||||
use("vimwiki/vimwiki")
|
use("preservim/vim-markdown")
|
||||||
use("folke/zen-mode.nvim")
|
use("folke/zen-mode.nvim")
|
||||||
use("junegunn/vim-slash")
|
use("junegunn/vim-slash")
|
||||||
use("andymass/vim-matchup")
|
use("andymass/vim-matchup")
|
||||||
@ -161,6 +165,7 @@ return packer.startup(function(use)
|
|||||||
wants = { "nvim-treesitter" },
|
wants = { "nvim-treesitter" },
|
||||||
})
|
})
|
||||||
use("windwp/nvim-spectre")
|
use("windwp/nvim-spectre")
|
||||||
|
use("tpope/vim-surround")
|
||||||
|
|
||||||
-- Keybinding
|
-- Keybinding
|
||||||
use("folke/which-key.nvim")
|
use("folke/which-key.nvim")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user