Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
vishnu.prabu committed Dec 17, 2023
2 parents 3de52e7 + 271c9c3 commit 0bbdbe2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lua/astronvim/autocmds.lua
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ autocmd("BufReadPre", {

local terminal_settings_group = augroup("terminal_settings", { clear = true })
-- TODO: drop when dropping support for Neovim v0.9
if vim.fn.has "nvim-0.9.4" == 0 then
if vim.fn.has "nvim-0.9" == 1 and vim.fn.has "nvim-0.9.4" == 0 then
-- HACK: Disable custom statuscolumn for terminals because truncation/wrapping bug
-- https://github.com/neovim/neovim/issues/25472
autocmd("TermOpen", {
Expand Down
8 changes: 4 additions & 4 deletions lua/lazy_snapshot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ return {
{ "NvChad/nvim-colorizer.lua", commit = "dde3084106a70b9a79d48f426f6d6fec6fd203f7", optional = true },
{ "Shatur/neovim-session-manager", commit = "68dde355a4304d83b40cf073f53915604bdd8e70", optional = true },
{ "akinsho/toggleterm.nvim", version = "^2", optional = true },
{ "b0o/SchemaStore.nvim", commit = "177cae4f44ddf7c166ef263956378ae308ff77ff", optional = true },
{ "b0o/SchemaStore.nvim", commit = "3927fbff75d5777660bfc4d29ff8d5b4a0cae2af", optional = true },
{ "echasnovski/mini.bufremove", commit = "f53c7f27e36009fe61563c11cde154b94a0e5b94", optional = true },
{ "folke/lazy.nvim", version = "^10", optional = true },
{ "folke/neoconf.nvim", version = "^1", optional = true },
Expand All @@ -17,7 +17,7 @@ return {
{ "hrsh7th/cmp-buffer", commit = "3022dbc9166796b644a841a02de8dd1cc1d311fa", optional = true },
{ "hrsh7th/cmp-nvim-lsp", commit = "5af77f54de1b16c34b23cba810150689a3a90312", optional = true },
{ "hrsh7th/cmp-path", commit = "91ff86cd9c29299a64f968ebb45846c485725f23", optional = true },
{ "hrsh7th/nvim-cmp", commit = "41d7633e4146dce1072de32cea31ee31b056a131", optional = true },
{ "hrsh7th/nvim-cmp", commit = "538e37ba87284942c1d76ed38dd497e54e65b891", optional = true },
{ "jay-babu/mason-null-ls.nvim", version = "^2", optional = true },
{ "jay-babu/mason-nvim-dap.nvim", version = "^2", optional = true },
{ "jose-elias-alvarez/null-ls.nvim", commit = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7", optional = true },
Expand All @@ -28,14 +28,14 @@ return {
{ "max397574/better-escape.nvim", commit = "7031dc734add47bb71c010e0551829fa5799375f", optional = true },
{ "mfussenegger/nvim-dap", version = "^0.7", optional = true },
{ "mrjones2014/smart-splits.nvim", version = "^1", optional = true },
{ "neovim/nvim-lspconfig", commit = "f451052bd6804e9e5ccd0ac874d7df8d3d4c55b9", optional = true },
{ "neovim/nvim-lspconfig", commit = "84f2dd42efffa20d505ac44c78568d778ca7e0a1", optional = true },
{ "numToStr/Comment.nvim", version = "^0.8", optional = true },
{ "nvim-lua/plenary.nvim", version = "^0.1", optional = true },
{ "nvim-neo-tree/neo-tree.nvim", version = "^3", optional = true },
{ "nvim-telescope/telescope-fzf-native.nvim", commit = "6c921ca12321edaa773e324ef64ea301a1d0da62", optional = true },
{ "nvim-telescope/telescope.nvim", version = "^0.1", optional = true },
{ "nvim-tree/nvim-web-devicons", commit = "a1425903ab52a0a0460622519e827f224e5b4fee", optional = true },
{ "nvim-treesitter/nvim-treesitter", commit = "42381aae7c1f785e4658cdb34a750be9851ba9af", optional = true },
{ "nvim-treesitter/nvim-treesitter", commit = "194b3f0047816132b08bcc2857b23a49fa967d04", optional = true },
{ "nvim-treesitter/nvim-treesitter-textobjects", commit = "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a", optional = true },
{ "onsails/lspkind.nvim", commit = "57610d5ab560c073c465d6faf0c19f200cb67e6e", optional = true },
{ "rafamadriz/friendly-snippets", commit = "53d3df271d031c405255e99410628c26a8f0d2b0", optional = true },
Expand Down

0 comments on commit 0bbdbe2

Please sign in to comment.