fix canola load path (#21)
Some checks are pending
quality / changes (push) Waiting to run
quality / Flake Check (push) Blocked by required conditions
quality / Nix Format Check (push) Blocked by required conditions
quality / Deploy netty (push) Blocked by required conditions

This commit is contained in:
Hari 2026-03-31 23:55:03 -04:00 committed by GitHub
parent 4981829a11
commit b87d614060
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 167 additions and 129 deletions

View file

@ -3,139 +3,14 @@ vim.pack.add({
"https://github.com/barrettruth/canola-collection",
}, { load = function() end })
local ns = vim.api.nvim_create_namespace("canola_git_trailing")
local symbols = {
M = { "M", "DiagnosticWarn" },
A = { "A", "DiagnosticOk" },
D = { "D", "DiagnosticError" },
R = { "R", "DiagnosticWarn" },
["?"] = { "?", "DiagnosticInfo" },
["!"] = { "!", "Comment" },
}
local function apply_git_status(buf)
if not vim.api.nvim_buf_is_valid(buf) then return end
vim.api.nvim_buf_clear_namespace(buf, ns, 0, -1)
local ok, canola = pcall(require, "canola")
if not ok then return end
local dir = canola.get_current_dir(buf)
if not dir then return end
local git_ok, git = pcall(require, "canola-git")
if not git_ok then return end
local dir_cache = git._cache[dir]
if not dir_cache or not dir_cache.status then return end
local lines = vim.api.nvim_buf_line_count(buf)
for lnum = 0, lines - 1 do
local entry = canola.get_entry_on_line(buf, lnum + 1)
if entry then
local status = dir_cache.status[entry.name]
if status then
local ch = status:sub(1, 1)
if ch == " " then ch = status:sub(2, 2) end
local sym = symbols[ch]
if sym then
vim.api.nvim_buf_set_extmark(buf, ns, lnum, 0, {
virt_text = { { " " .. sym[1], sym[2] } },
virt_text_pos = "eol",
invalidate = true,
})
end
end
end
end
end
local canola_config = require("config.canola")
return {
{
"barrettruth/canola.nvim",
cmd = "Canola",
before = function()
pcall(vim.cmd.packadd, "nvim-web-devicons")
pcall(vim.cmd.packadd, "nonicons.nvim")
vim.g.canola = {
columns = { "icon" },
hidden = { enabled = false },
highlights = { filename = {}, columns = true },
save = "auto",
extglob = true,
delete = { wipe = false, recursive = true },
float = { border = "single" },
keymaps = {
["g?"] = { callback = "actions.show_help", mode = "n" },
["<CR>"] = "actions.select",
["<C-v>"] = { callback = "actions.select", opts = { vertical = true } },
["<C-x>"] = { callback = "actions.select", opts = { horizontal = true } },
["<C-p>"] = "actions.preview",
["<C-c>"] = { callback = "actions.close", mode = "n" },
["-"] = { callback = "actions.parent", mode = "n" },
["g."] = { callback = "actions.toggle_hidden", mode = "n" },
["<C-t>"] = false,
},
}
end,
after = function()
vim.cmd.packadd("canola-collection")
local augroup = vim.api.nvim_create_augroup("UserCanolaConfig", { clear = true })
local detail_columns = { "git_status", "permissions", "owner", "size", "mtime" }
local base_columns = vim.deepcopy(vim.g.canola.columns or {})
local show_all = false
vim.api.nvim_create_autocmd("FileType", {
group = augroup,
pattern = "canola",
callback = function(args)
local bufnr = args.buf
vim.keymap.set("n", "gC", function()
show_all = not show_all
require("canola").set_columns(show_all and detail_columns or base_columns)
end, {
buffer = bufnr,
desc = "toggle canola columns",
})
vim.keymap.set("n", "gX", function()
local canola = require("canola")
local entry = canola.get_cursor_entry()
local dir = canola.get_current_dir()
if not entry or not dir then return end
vim.ui.input({ prompt = "chmod: ", default = "755" }, function(mode)
if not mode then return end
vim.uv.fs_chmod(dir .. entry.name, tonumber(mode, 8), function(err)
if err then
vim.schedule(function() vim.notify(err, vim.log.levels.ERROR) end)
return
end
vim.schedule(function() require("canola.actions").refresh.callback() end)
end)
end)
end, {
buffer = bufnr,
desc = "chmod entry",
})
end,
})
vim.api.nvim_create_autocmd("User", {
group = augroup,
pattern = "CanolaReadPost",
callback = function(args)
local buf = args.buf
apply_git_status(buf)
vim.defer_fn(function() apply_git_status(buf) end, 500)
end,
})
end,
before = canola_config.setup_globals,
after = canola_config.setup_integrations,
keys = {
{ "-", "<cmd>Canola<cr>" },
{ "<leader>e", "<cmd>Canola<cr>" },