Skip to content

Commit

Permalink
Merge branch 'main' into ps/rr/fix_nix___drop_none_ls_formatter
Browse files Browse the repository at this point in the history
  • Loading branch information
luxus authored Feb 2, 2025
2 parents a9f81f1 + 0e50b75 commit 1325456
Show file tree
Hide file tree
Showing 12 changed files with 210 additions and 12 deletions.
5 changes: 5 additions & 0 deletions lua/astrocommunity/debugging/nvim-dap-view/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# nvim-dap-view

minimalistic nvim-dap-ui alternative

**Repository:** <https://github.com/igorlfs/nvim-dap-view>
28 changes: 28 additions & 0 deletions lua/astrocommunity/debugging/nvim-dap-view/init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
return {
"igorlfs/nvim-dap-view",
lazy = true,
opts = {},
specs = {
{
"AstroNvim/astrocore",
opts = function(_, opts)
local maps = opts.mappings
maps.n["<Leader>d"] = vim.tbl_get(opts, "_map_sections", "d")
maps.n["<Leader>dE"] = { function() require("dap-view").add_expr() end, desc = "Add expression" }
maps.n["<Leader>du"] = { function() require("dap-view").toggle() end, desc = "Toggle Debugger UI" }
end,
},
{
"mfussenegger/nvim-dap",
optional = true,
dependencies = "igorlfs/nvim-dap-view",
opts = function()
local dap, dap_view = require "dap", require "dap-view"
dap.listeners.after.event_initialized.dapview_config = function() dap_view.open() end
dap.listeners.before.event_terminated.dapview_config = function() dap_view.close() end
dap.listeners.before.event_exited.dapview_config = function() dap_view.close() end
end,
},
{ "rcarriga/nvim-dap-ui", enabled = false },
},
}
1 change: 1 addition & 0 deletions lua/astrocommunity/editing-support/conform-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ return {
mappings = {
n = {
["<Leader>lf"] = { function() vim.cmd.Format() end, desc = "Format buffer" },
["<Leader>lc"] = { function() vim.cmd.ConformInfo() end, desc = "Conform information" },
["<Leader>uf"] = {
function()
if vim.b.autoformat == nil then
Expand Down
12 changes: 8 additions & 4 deletions lua/astrocommunity/editing-support/copilotchat-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ return {
dependencies = {
{ "zbirenbaum/copilot.lua" },
{ "nvim-lua/plenary.nvim" },
{ "nvim-telescope/telescope.nvim" },
{
"AstroNvim/astrocore",
---@param opts AstroCoreOpts
Expand Down Expand Up @@ -71,9 +70,14 @@ return {
-- Helper function to create mappings
local function create_mapping(action_type, selection_type)
return function()
require("CopilotChat.integrations.telescope").pick(require("CopilotChat.actions")[action_type] {
selection = require("CopilotChat.select")[selection_type],
})
local fzf_ok = pcall(require, "fzf-lua")
local snacks_ok = pcall(require, "snacks")

require("CopilotChat.integrations." .. (fzf_ok and "fzflua" or snacks_ok and "snacks" or "telescope")).pick(
require("CopilotChat.actions")[action_type] {
selection = require("CopilotChat.select")[selection_type],
}
)
end
end

Expand Down
21 changes: 19 additions & 2 deletions lua/astrocommunity/fuzzy-finder/fzf-lua/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ return {
local maps = opts.mappings
maps.n["<Leader>lD"] =
{ function() require("fzf-lua").diagnostics_document() end, desc = "Search diagnostics" }
if maps.n.gd then maps.n.gd[1] = function() require("fzf-lua").lsp_definitions() end end
if maps.n.gd then
maps.n.gd[1] = function() require("fzf-lua").lsp_definitions { jump_to_single_result = true } end
end
if maps.n.gI then maps.n.gI[1] = function() require("fzf-lua").lsp_implementations() end end
if maps.n["<Leader>lR"] then maps.n["<Leader>lR"][1] = function() require("fzf-lua").lsp_references() end end
if maps.n.gy then maps.n.gy[1] = function() require("fzf-lua").lsp_typedefs() end end
Expand Down Expand Up @@ -63,5 +65,20 @@ return {
end,
},
},
opts = { "default-title" },
opts = {
"default-title",
keymap = {
builtin = {
true,
["<C-d>"] = "preview-page-down",
["<C-u>"] = "preview-page-up",
},
fzf = {
true,
["ctrl-d"] = "preview-page-down",
["ctrl-u"] = "preview-page-up",
["ctrl-q"] = "select-all+accept",
},
},
},
}
5 changes: 5 additions & 0 deletions lua/astrocommunity/fuzzy-finder/snacks-picker/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# snacks.picker

Snacks now comes with a modern fuzzy-finder to navigate the Neovim universe.

**Repository:** <https://github.com/folke/snacks.nvim/blob/main/docs/picker.md>
119 changes: 119 additions & 0 deletions lua/astrocommunity/fuzzy-finder/snacks-picker/init.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
return {
"folke/snacks.nvim",
priority = 1000,
lazy = false,
dependencies = { "nvim-treesitter/nvim-treesitter" },
opts = { picker = { ui_select = true } },
specs = {
{
"AstroNvim/astrocore",
opts = function(_, opts)
local maps = opts.mappings
local astro = require "astrocore"
maps.n["<Leader>f"] = vim.tbl_get(opts, "_map_sections", "f")
if vim.fn.executable "git" == 1 then
maps.n["<Leader>g"] = vim.tbl_get(opts, "_map_sections", "g")
maps.n["<Leader>gb"] = { function() require("snacks").picker.git_branches() end, desc = "Git branches" }
maps.n["<Leader>gc"] = {
function() require("snacks").picker.git_log() end,
desc = "Git commits (repository)",
}
maps.n["<Leader>gC"] = {
function() require("snacks").picker.git_log { current_file = true, follow = true } end,
desc = "Git commits (current file)",
}
maps.n["<Leader>gt"] = { function() require("snacks").picker.git_status() end, desc = "Git status" }
end
maps.n["<Leader>f<CR>"] = { function() require("snacks").picker.resume() end, desc = "Resume previous search" }
maps.n["<Leader>f'"] = { function() require("snacks").picker.marks() end, desc = "Find marks" }
maps.n["<Leader>fl"] = {
function() require("snacks").picker.lines() end,
desc = "Find lines",
}
maps.n["<Leader>fa"] = {
function() require("snacks").picker.files { dirs = { vim.fn.stdpath "config" }, desc = "Config Files" } end,
desc = "Find AstroNvim config files",
}
maps.n["<Leader>fb"] = { function() require("snacks").picker.buffers() end, desc = "Find buffers" }
maps.n["<Leader>fc"] = { function() require("snacks").picker.grep_word() end, desc = "Find word under cursor" }
maps.n["<Leader>fC"] = { function() require("snacks").picker.commands() end, desc = "Find commands" }
maps.n["<Leader>ff"] = {
function()
require("snacks").picker.files {
hidden = vim.tbl_get((vim.uv or vim.loop).fs_stat ".git" or {}, "type") == "directory",
}
end,
desc = "Find files",
}
maps.n["<Leader>fF"] = {
function() require("snacks").picker.files { hidden = true, ignored = true } end,
desc = "Find all files",
}
maps.n["<Leader>fg"] = { function() require("snacks").picker.git_files() end, desc = "Find git files" }
maps.n["<Leader>fh"] = { function() require("snacks").picker.help() end, desc = "Find help" }
maps.n["<Leader>fk"] = { function() require("snacks").picker.keymaps() end, desc = "Find keymaps" }
maps.n["<Leader>fm"] = { function() require("snacks").picker.man() end, desc = "Find man" }
if astro.plugin_opts("snacks.nvim").notifier then
maps.n["<Leader>fn"] =
{ function() require("snacks").picker.notifications() end, desc = "Find notifications" }
end
maps.n["<Leader>fo"] = { function() require("snacks").picker.recent() end, desc = "Find old files" }
maps.n["<Leader>fO"] =
{ function() require("snacks").picker.recent { filter = { cwd = true } } end, desc = "Find old files (cwd)" }
maps.n["<Leader>fr"] = { function() require("snacks").picker.registers() end, desc = "Find registers" }
maps.n["<Leader>fs"] = { function() require("snacks").picker.smart() end, desc = "Find buffers/recent/files" }
maps.n["<Leader>ft"] = { function() require("snacks").picker.colorschemes() end, desc = "Find themes" }
if vim.fn.executable "rg" == 1 then
maps.n["<Leader>fw"] = { function() require("snacks").picker.grep() end, desc = "Find words" }
maps.n["<Leader>fW"] = {
function() require("snacks").picker.grep { hidden = true, ignored = true } end,
desc = "Find words in all files",
}
end
maps.n["<Leader>lD"] = { function() require("snacks").picker.diagnostics() end, desc = "Search diagnostics" }
maps.n["<Leader>ls"] = { function() require("snacks").picker.lsp_symbols() end, desc = "Search symbols" }
end,
},
{
"folke/todo-comments.nvim",
optional = true,
dependencies = { "folke/snacks.nvim" },
specs = {
{
"AstroNvim/astrocore",
opts = {
mappings = {
n = {
["<Leader>fT"] = {
function()
if not package.loaded["todo-comments"] then -- make sure to load todo-comments
require("lazy").load { plugins = { "todo-comments.nvim" } }
end
require("snacks").picker.todo_comments()
end,
desc = "Todo Comments",
},
},
},
},
},
},
},
{
"nvim-neo-tree/neo-tree.nvim",
optional = true,
opts = {
commands = {
find_in_dir = function(state)
local node = state.tree:get_node()
local path = node.type == "file" and node:get_parent_id() or node:get_id()
require("snacks").picker.files { cwd = path }
end,
},
window = { mappings = { F = "find_in_dir" } },
},
},
{ "nvim-telescope/telescope.nvim", enabled = false },
{ "stevearc/dressing.nvim", opts = { select = { enabled = false } } },
},
}
6 changes: 4 additions & 2 deletions lua/astrocommunity/markdown-and-latex/markview-nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ return {
end,
},
opts = {
hybrid_modes = { "n" },
headings = { shift_width = 0 },
preview = {
hybrid_modes = { "n" },
headings = { shift_width = 0 },
},
},
}
2 changes: 1 addition & 1 deletion lua/astrocommunity/media/cord-nvim/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cord.nvim

🚀 Discord Rich Presence plugin for Neovim written in Rust
🚀 Discord Rich Presence for Neovim

**Repository:** <https://github.com/vyfor/cord.nvim>
5 changes: 3 additions & 2 deletions lua/astrocommunity/media/cord-nvim/init.lua
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
return {
"vyfor/cord.nvim",
build = vim.fn.has "win32" == 0 and "./build" or ".\\build",
version = "^2",
build = ":Cord update",
event = "VeryLazy",
opts = {
editor = {
client = "astronvim",
tooltip = "An aesthetically pleasing and feature-rich Neovim configuration",
},
buttons = {
{ label = "View Repository", url = "git" },
{ label = "View Repository", url = function(opts) return opts.repo_url end },
{ label = "View AstroNvim", url = "https://astronvim.com" },
},
},
Expand Down
11 changes: 10 additions & 1 deletion lua/astrocommunity/pack/bash/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@ return {
optional = true,
opts = {
formatters_by_ft = {
sh = { "shfmt" },
sh = { "shfmt", "shellcheck" },
},
},
},
{
"mfussenegger/nvim-lint",
optional = true,
opts = {
linters_by_ft = {
sh = { "shellcheck" },
},
},
},
Expand Down
7 changes: 7 additions & 0 deletions lua/astrocommunity/pack/rust/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ local pack = {
rust_analyzer = {
settings = {
["rust-analyzer"] = {
files = {
excludeDirs = {
".direnv",
".git",
"target",
},
},
check = {
command = "clippy",
extraArgs = {
Expand Down

0 comments on commit 1325456

Please sign in to comment.