Skip to content

Commit ebc2a02

Browse files
UzaaftUzaaft
authored
Merge branch 'main' into add-prettier
2 parents ffb1efe + 8e359d7 commit ebc2a02

15 files changed

Lines changed: 165 additions & 113 deletions

File tree

‎lua/astrocommunity/code-runner/sniprun/init.lua‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
return {
22
"michaelb/sniprun",
3+
keys = {
4+
{ "<Plug>SnipRun", mode = { "n", "v" } },
5+
"<Plug>SnipRunOperator",
6+
"<Plug>SnipInfo",
7+
"<Plug>SnipReset",
8+
"<Plug>SnipReplMemoryClean",
9+
"<Plug>SnipClose",
10+
"<Plug>SnipLive",
11+
},
312
opts = {},
413
build = "bash ./install.sh 1",
514
cmd = "SnipRun",

‎lua/astrocommunity/colorscheme/catppuccin/init.lua‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,12 @@ return {
33
name = "catppuccin",
44
lazy = true,
55
---@type CatppuccinOptions
6+
---@diagnostic disable: missing-fields
67
opts = {
8+
auto_integrations = true,
79
integrations = {
8-
aerial = true,
9-
alpha = true,
10-
blink_cmp = true,
11-
cmp = true,
12-
dap = true,
13-
dap_ui = true,
14-
gitsigns = true,
15-
illuminate = true,
16-
indent_blankline = true,
17-
markdown = true,
18-
mason = true,
19-
native_lsp = { enabled = true },
20-
neotree = true,
21-
notify = true,
22-
semantic_tokens = true,
23-
symbols_outline = true,
24-
telescope = true,
25-
treesitter = true,
26-
ts_rainbow = false,
27-
ufo = true,
28-
which_key = true,
29-
window_picker = true,
30-
colorful_winsep = { enabled = true, color = "lavender" },
10+
colorful_winsep = { color = "lavender" },
3111
snacks = {
32-
enabled = true,
3312
indent_scope_color = "lavender",
3413
},
3514
},

‎lua/astrocommunity/editing-support/copilotchat-nvim/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@
33
Chat with GitHub Copilot in Neovim
44

55
**Repository:** <https://github.com/CopilotC-Nvim/CopilotChat.nvim>
6-
7-
Note: This will need to have Copilot setup, this uses the same auth as `zbirenbaum/copilot.lua` with `:Copilot setup`

‎lua/astrocommunity/editing-support/copilotchat-nvim/init.lua‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---@type LazySpec
22
return {
33
"CopilotC-Nvim/CopilotChat.nvim",
4-
version = "^3",
4+
version = "^4",
55
cmd = {
66
"CopilotChat",
77
"CopilotChatOpen",
@@ -11,19 +11,16 @@ return {
1111
"CopilotChatReset",
1212
"CopilotChatSave",
1313
"CopilotChatLoad",
14-
"CopilotChatDebugInfo",
1514
"CopilotChatModels",
16-
"CopilotChatAgents",
1715
"CopilotChatExplain",
1816
"CopilotChatReview",
1917
"CopilotChatFix",
2018
"CopilotChatOptimize",
2119
"CopilotChatDocs",
22-
"CopilotChatFixTests",
20+
"CopilotChatTests",
2321
"CopilotChatCommit",
2422
},
2523
dependencies = {
26-
{ "zbirenbaum/copilot.lua" },
2724
{ "nvim-lua/plenary.nvim" },
2825
{
2926
"AstroNvim/astrocore",

‎lua/astrocommunity/editing-support/mcphub-nvim/init.lua‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,7 @@ return {
55
},
66
event = "User AstroFile",
77
cmd = "MCPHub",
8-
opts = {
9-
port = 3000,
10-
config = vim.fn.expand "~/mcpservers.json",
11-
log = {
12-
level = vim.log.levels.WARN,
13-
to_file = false,
14-
file_path = nil,
15-
prefix = "MCPHub",
16-
},
17-
},
8+
opts = {},
189
specs = {
1910
{
2011
"olimorris/codecompanion.nvim",
@@ -38,7 +29,7 @@ return {
3829
opts = {
3930
system_prompt = function()
4031
local hub = require("mcphub").get_hub_instance()
41-
return hub:get_active_servers_prompt()
32+
return hub and hub:get_active_servers_prompt() or ""
4233
end,
4334
-- The custom_tools type supports both a list and a function that returns a list. Using a function here prevents requiring mcphub before it's loaded
4435
custom_tools = function()
@@ -49,4 +40,18 @@ return {
4940
},
5041
},
5142
},
43+
{
44+
"CopilotC-Nvim/CopilotChat.nvim",
45+
optional = true,
46+
opts = {
47+
extensions = {
48+
copilotchat = {
49+
enabled = true,
50+
convert_tools_to_functions = true,
51+
convert_resources_to_functions = true,
52+
add_mcp_prefix = false,
53+
},
54+
},
55+
},
56+
},
5257
}

‎lua/astrocommunity/lsp/coc-nvim/init.lua‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,18 @@ return {
7272
end,
7373
desc = "Hover symbol details",
7474
}
75+
76+
maps.i["<C-Space>"] = { "coc#refresh()", desc = "Trigger completion", expr = true, silent = true }
77+
maps.i["<CR>"] = {
78+
[[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]],
79+
expr = true,
80+
noremap = true,
81+
silent = true,
82+
}
83+
maps.i["<Tab>"] =
84+
{ [[coc#pum#visible() ? coc#pum#next(1) : "\<Tab>"]], expr = true, noremap = true, silent = true }
85+
maps.i["<S-Tab>"] =
86+
{ [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], expr = true, noremap = true, silent = true }
7587
end,
7688
},
7789
specs = {
@@ -164,5 +176,7 @@ return {
164176
{ "rafamadriz/friendly-snippets", optional = true, enabled = false },
165177
-- blink
166178
{ "Saghen/blink.cmp", optional = true, enabled = false },
179+
-- autopairs
180+
{ "windwp/nvim-autopairs", optional = true, enabled = false },
167181
},
168182
}

‎lua/astrocommunity/markdown-and-latex/vimtex/init.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@ return {
4646
{ "tsD", desc = "Reverse Cycle (), \\left(\\right) [, ...]" },
4747
{ "tse", desc = "Toggle star of environment" },
4848
{ "tsf", desc = "Toggle a/b vs \\frac{a}{b}" },
49+
{ "tsb", desc = "Toggle line break" },
50+
{ "tss", desc = "Toggle starred environment" },
4951
{ "[/", desc = "Previous start of a LaTeX comment" },
5052
{ "[*", desc = "Previous end of a LaTeX comment" },
5153
{ "[[", desc = "Previous beginning of a section" },

‎lua/astrocommunity/pack/hurl/init.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ return {
3232
"AstroNvim/astrocore",
3333
opts = function(_, opts)
3434
local maps = opts.mappings
35-
maps.n[prefix] = { desc = require("astroui").get_icon("HurlNvim", 1, true) .. "HurlNvim" }
35+
maps.n[prefix] = { desc = require("astroui").get_icon("HurlNvim", 1, true) .. "Hurl" }
3636
maps.n[prefix .. "R"] = { "<cmd>HurlRunner<cr>", desc = "Run all requests in the file" }
3737
maps.n[prefix .. "r"] = { "<cmd>HurlRunnerAt<cr>", desc = "Run request under the cursor" }
3838
maps.n[prefix .. "e"] = { "<cmd>HurlRunnerToEntry<cr>", desc = "Run request to the entry" }

‎lua/astrocommunity/pack/jj/init.lua‎

Lines changed: 56 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,74 @@
11
return {
22
{
3-
"zschreur/telescope-jj.nvim",
4-
config = function() require("telescope").load_extension "jj" end,
5-
dependencies = {
3+
"nvim-telescope/telescope.nvim",
4+
optional = true,
5+
specs = {
66
{
7-
"AstroNvim/astrocore",
8-
opts = {
9-
mappings = {
10-
n = {
11-
["<Leader>jf"] = {
12-
function()
13-
local jj_pick_status, jj_res = pcall(require("telescope").extensions.jj.files)
14-
if jj_pick_status then return end
7+
"zschreur/telescope-jj.nvim",
8+
config = function() require("telescope").load_extension "jj" end,
9+
dependencies = {
10+
{
11+
"AstroNvim/astrocore",
12+
opts = {
13+
mappings = {
14+
n = {
15+
["<Leader>jf"] = {
16+
function()
17+
local jj_pick_status, jj_res = pcall(require("telescope").extensions.jj.files)
18+
if jj_pick_status then return end
1519

16-
-- Git fallback
17-
local git_files_status, git_res = pcall(require("telescope.builtin").git_files)
18-
if not git_files_status then
19-
error("Could not launch jj or git files: \n" .. jj_res .. "\n" .. git_res)
20-
end
21-
end,
22-
desc = "jj files",
20+
-- Git fallback
21+
local git_files_status, git_res = pcall(require("telescope.builtin").git_files)
22+
if not git_files_status then
23+
error("Could not launch jj or git files: \n" .. jj_res .. "\n" .. git_res)
24+
end
25+
end,
26+
desc = "jj files",
27+
},
28+
["<Leader>jc"] = {
29+
function() require("telescope").extensions.jj.conflicts() end,
30+
desc = "jj conflicts",
31+
},
32+
["<Leader>jd"] = { function() require("telescope").extensions.jj.diff() end, desc = "jj diff" },
33+
},
2334
},
24-
["<Leader>jc"] = { function() require("telescope").extensions.jj.conflicts() end, desc = "jj conflicts" },
25-
["<Leader>jd"] = { function() require("telescope").extensions.jj.diff() end, desc = "jj diff" },
2635
},
2736
},
2837
},
2938
},
3039
},
3140
},
3241
{
33-
"Cretezy/neo-tree-jj.nvim",
34-
dependencies = {
42+
"nvim-neo-tree/neo-tree.nvim",
43+
optional = true,
44+
specs = {
3545
{
36-
"nvim-neo-tree/neo-tree.nvim",
37-
opts = function(_, opts)
38-
table.insert(opts.sources, "jj")
46+
"Cretezy/neo-tree-jj.nvim",
47+
dependencies = {
48+
{
49+
"nvim-neo-tree/neo-tree.nvim",
50+
opts = function(_, opts)
51+
table.insert(opts.sources, "jj")
3952

40-
-- Replace git tab in neo-tree when in jj repo
41-
if require("neo-tree.sources.jj.utils").get_repository_root() then
42-
-- Remove git tab
43-
for i, source in ipairs(opts.source_selector.sources) do
44-
if source.source == "git_status" then
45-
table.remove(opts.source_selector.sources, i)
46-
break
47-
end
48-
end
53+
-- Replace git tab in neo-tree when in jj repo
54+
if require("neo-tree.sources.jj.utils").get_repository_root() then
55+
-- Remove git tab
56+
for i, source in ipairs(opts.source_selector.sources) do
57+
if source.source == "git_status" then
58+
table.remove(opts.source_selector.sources, i)
59+
break
60+
end
61+
end
4962

50-
-- Add jj tab
51-
table.insert(opts.source_selector.sources, {
52-
display_name = "󰊢 JJ",
53-
source = "jj",
54-
})
55-
end
56-
end,
63+
-- Add jj tab
64+
table.insert(opts.source_selector.sources, {
65+
display_name = "󰊢 JJ",
66+
source = "jj",
67+
})
68+
end
69+
end,
70+
},
71+
},
5772
},
5873
},
5974
},

‎lua/astrocommunity/pack/nushell/README.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Nushell Language pack
2+
Requires:
3+
4+
- A local [nufmt](https://github.com/nushell/nufmt) installation
5+
- A local [nushell](https://www.nushell.sh/) installation for the LSP
6+
7+
This plugin pack does the following:
8+
9+
- Adds `nushell` treesitter parsers
10+
- Adds [`nushell`](https://github.com/nushell/nushell/tree/main/crates/nu-lsp) language server
11+
- Adds `nufmt` as the default formatter for nushell

0 commit comments

Comments
 (0)