Skip to content

Commit cdac788

Browse files
Uzaaftmehalter
andauthored
feat!: astronvim v5 compatibility (#1408)
* fix!: Remove nvim 0.09 support * feat: swap out alpha-nvim specs with snacks.nvim dashboard disabling * docs: Add todo comment for neovim 0.10 compat logic * fix(neogit): add check for `snacks.notifier` * refactor: remove `nvim-web-devicons`, assume user has something compatible * fix: add missing `mini.icons` configuration * fix: dressing mentions should be optional * fix(ccc-nvim): also disable `nvim-highlight-colors` * fix: resolve incorrect refactoring * fix(auto-session-restore): reinstate alpha support and fix snacks.dashboard support * feat: add support for blink.cmp where applicable * fix: remove telescope requirements where necessary and generalize picker support where possible --------- Co-authored-by: Micah Halter <[email protected]>
1 parent 0ac79db commit cdac788

File tree

46 files changed

+426
-278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+426
-278
lines changed

lua/astrocommunity/color/ccc-nvim/init.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ return {
33
event = { "User AstroFile", "InsertEnter" },
44
cmd = { "CccPick", "CccConvert", "CccHighlighterEnable", "CccHighlighterDisable", "CccHighlighterToggle" },
55
specs = {
6-
{ "NvChad/nvim-colorizer.lua", optional = true, enabled = false },
6+
{ "brenoprata10/nvim-highlight-colors", enabled = false },
7+
{ "NvChad/nvim-colorizer.lua", enabled = false },
78
},
89
dependencies = {
910
{

lua/astrocommunity/comment/ts-comments-nvim/init.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ return {
22
"folke/ts-comments.nvim",
33
opts = {},
44
event = "VeryLazy",
5-
enabled = vim.fn.has "nvim-0.10.0" == 1,
65
specs = {
76
{ "numToStr/Comment.nvim", optional = true, enabled = false },
87
{ "JoosepAlviste/nvim-ts-context-commentstring", optional = true, enabled = false },

lua/astrocommunity/completion/avante-nvim/init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ return {
1919
"AvanteStop",
2020
},
2121
dependencies = {
22-
"stevearc/dressing.nvim",
22+
{ "stevearc/dressing.nvim", optional = true },
2323
"nvim-lua/plenary.nvim",
2424
"MunifTanjim/nui.nvim",
2525
{ "AstroNvim/astrocore", opts = function(_, opts) opts.mappings.n[prefix] = { desc = " Avante" } end },
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "hrsh7th/cmp-calc", lazy = true },
5-
opts = function(_, opts)
6-
opts.sources = opts.sources or {}
7-
table.insert(opts.sources, { name = "calc" })
8-
end,
2+
"hrsh7th/cmp-calc",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "hrsh7th/cmp-calc", lazy = true },
9+
opts = function(_, opts)
10+
opts.sources = opts.sources or {}
11+
table.insert(opts.sources, { name = "calc" })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "hrsh7th/cmp-calc",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "calc" },
22+
providers = {
23+
calc = { name = "calc", module = "blink.compat.source", score_offset = -1 },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "hrsh7th/cmp-emoji" },
5-
opts = function(_, opts)
6-
if not opts.sources then opts.sources = {} end
7-
table.insert(opts.sources, { name = "emoji", priority = 700 })
8-
end,
2+
"hrsh7th/cmp-emoji",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "hrsh7th/cmp-emoji" },
9+
opts = function(_, opts)
10+
if not opts.sources then opts.sources = {} end
11+
table.insert(opts.sources, { name = "emoji", priority = 700 })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "hrsh7th/cmp-emoji",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "emoji" },
22+
providers = {
23+
emoji = { name = "emoji", module = "blink.compat.source", score_offset = -1 },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "kdheepak/cmp-latex-symbols" },
5-
opts = function(_, opts)
6-
if not opts.sources then opts.sources = {} end
7-
table.insert(opts.sources, { name = "latex_symbols", priority = 700 })
8-
end,
2+
"kdheepak/cmp-latex-symbols",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "kdheepak/cmp-latex-symbols" },
9+
opts = function(_, opts)
10+
if not opts.sources then opts.sources = {} end
11+
table.insert(opts.sources, { name = "latex_symbols", priority = 700 })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "kdheepak/cmp-latex-symbols",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "latex" },
22+
providers = {
23+
latex = { name = "latex_symbols", module = "blink.compat.source", score_offset = -1 },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "chrisgrieser/cmp-nerdfont" },
5-
opts = function(_, opts)
6-
if not opts.sources then opts.sources = {} end
7-
table.insert(opts.sources, { name = "nerdfont", priority = 700 })
8-
end,
2+
"chrisgrieser/cmp-nerdfont",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "chrisgrieser/cmp-nerdfont" },
9+
opts = function(_, opts)
10+
if not opts.sources then opts.sources = {} end
11+
table.insert(opts.sources, { name = "nerdfont", priority = 700 })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "chrisgrieser/cmp-nerdfont",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "nerdfont" },
22+
providers = {
23+
nerdfont = { name = "nerdfont", module = "blink.compat.source", score_offset = -1 },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "hrsh7th/cmp-nvim-lua", lazy = true },
5-
opts = function(_, opts)
6-
if not opts.sources then opts.sources = {} end
7-
table.insert(opts.sources, { name = "nvim_lua" })
8-
end,
2+
"hrsh7th/cmp-nvim-lua",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "hrsh7th/cmp-nvim-lua", lazy = true },
9+
opts = function(_, opts)
10+
if not opts.sources then opts.sources = {} end
11+
table.insert(opts.sources, { name = "nvim_lua" })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "hrsh7th/cmp-nvim-lua",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "nvim_lua" },
22+
providers = {
23+
nvim_lua = { name = "nvim_lua", module = "blink.compat.source" },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "f3fora/cmp-spell", lazy = true },
5-
opts = function(_, opts)
6-
opts.sources = opts.sources or {}
7-
table.insert(opts.sources, { name = "spell" })
8-
end,
2+
"f3fora/cmp-spell",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "f3fora/cmp-spell", lazy = true },
9+
opts = function(_, opts)
10+
opts.sources = opts.sources or {}
11+
table.insert(opts.sources, { name = "spell" })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "f3fora/cmp-spell",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "spell" },
22+
providers = {
23+
spell = { name = "spell", module = "blink.compat.source" },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}
Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,29 @@
11
return {
2-
"hrsh7th/nvim-cmp",
3-
optional = true,
4-
dependencies = { "andersevenrud/cmp-tmux", lazy = true },
5-
opts = function(_, opts)
6-
opts.sources = opts.sources or {}
7-
table.insert(opts.sources, { name = "tmux" })
8-
end,
2+
"andersevenrud/cmp-tmux",
3+
lazy = true,
4+
specs = {
5+
{
6+
"hrsh7th/nvim-cmp",
7+
optional = true,
8+
dependencies = { "andersevenrud/cmp-tmux", lazy = true },
9+
opts = function(_, opts)
10+
opts.sources = opts.sources or {}
11+
table.insert(opts.sources, { name = "tmux" })
12+
end,
13+
},
14+
{
15+
"Saghen/blink.cmp",
16+
optional = true,
17+
dependencies = "andersevenrud/cmp-tmux",
18+
specs = { "Saghen/blink.compat", version = "*", lazy = true, opts = {} },
19+
opts = {
20+
sources = {
21+
default = { "tmux" },
22+
providers = {
23+
tmux = { name = "tmux", module = "blink.compat.source", score_offset = -1 },
24+
},
25+
},
26+
},
27+
},
28+
},
929
}

0 commit comments

Comments
 (0)