Compare commits

1 Commits

Author SHA1 Message Date
eb17aca1fc feat: change from pyright to basedpyright 2025-10-17 16:53:34 +02:00
16 changed files with 57 additions and 120 deletions

View File

@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2025 Matej Janežič
Copyright (c) Matej Janežič
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

View File

@@ -19,11 +19,4 @@ now_if_args(function()
sh = true,
typescript = true,
}
-- remap default <M-\> to first close pumenu if open
local function suggest()
if vim.fn.pumvisible() == 1 then vim.fn.complete(vim.fn.col("."), {}) end
return vim.fn["copilot#Suggest"]()
end
vim.keymap.set("i", "<M-\\>", suggest)
end)

View File

@@ -1,11 +0,0 @@
MiniDeps.now(function()
MiniDeps.add("j-hui/fidget.nvim")
local opts = {
notification = {
override_vim_notify = true,
},
}
require("fidget").setup(opts)
end)

View File

@@ -1,8 +1,8 @@
MiniDeps.later(function()
MiniDeps.add("ibhagwan/fzf-lua")
local fzf_lua = require("fzf-lua")
fzf_lua.setup({
local fzf = require("fzf-lua")
fzf.setup({
files = {
no_ignore = true,
toggle_ignore_flag = "--no-ignore-vcs",
@@ -13,12 +13,11 @@ MiniDeps.later(function()
},
})
vim.keymap.set("n", "<leader>sf", fzf_lua.files)
vim.keymap.set("n", "<leader>sg", fzf_lua.live_grep)
vim.keymap.set("n", "<leader>sw", fzf_lua.grep_cword)
vim.keymap.set("v", "<leader>sg", fzf_lua.grep_visual)
vim.keymap.set("n", "<leader>sj", fzf_lua.jumps)
vim.keymap.set("n", "<leader>sh", fzf_lua.helptags)
vim.keymap.set("n", "<leader>sr", fzf_lua.resume)
vim.keymap.set("n", "<leader>sb", fzf_lua.builtin)
vim.keymap.set("n", "<leader>sf", fzf.files)
vim.keymap.set("n", "<leader>sg", fzf.live_grep)
vim.keymap.set("n", "<leader>sw", fzf.grep_cword)
vim.keymap.set("v", "<leader>sg", fzf.grep_visual)
vim.keymap.set("n", "<leader>sr", fzf.resume)
vim.keymap.set("n", "<leader>sb", fzf.builtin)
end)

11
lua/plugins/git_blame.lua Normal file
View File

@@ -0,0 +1,11 @@
MiniDeps.later(function()
MiniDeps.add("f-person/git-blame.nvim")
require("gitblame").setup({
enabled = false,
message_template = " <sha>: <author> <date> <summary>",
date_format = "%Y-%m-%d",
})
vim.keymap.set("n", "<leader>gt", ":GitBlameToggle<CR>")
vim.keymap.set("n", "<leader>gs", ":GitBlameCopySHA<CR>")
end)

View File

@@ -1,8 +1,6 @@
MiniDeps.later(function()
MiniDeps.add({
source = "ruifm/gitlinker.nvim",
depends = { "nvim-lua/plenary.nvim" },
})
MiniDeps.add("nvim-lua/plenary.nvim")
MiniDeps.add("ruifm/gitlinker.nvim")
require("gitlinker").setup({
callbacks = {
["git.aflabs.org"] = require("gitlinker.hosts").get_gitlab_type_url,

View File

@@ -9,12 +9,4 @@ MiniDeps.later(function()
changedelete = { text = "~" },
},
})
-- blame
vim.keymap.set({ "n", "v" }, "<leader>gb", ":Gitsigns blame<CR>")
vim.keymap.set({ "n", "v" }, "<leader>gt", ":Gitsigns blame_line<CR>")
-- hunks
vim.keymap.set({ "n", "v" }, "<leader>ga", ":Gitsigns stage_hunk<CR>")
vim.keymap.set({ "n", "v" }, "<leader>gr", ":Gitsigns reset_hunk<CR>")
end)

View File

@@ -2,7 +2,7 @@ MiniDeps.later(function()
MiniDeps.add("neovim/nvim-lspconfig")
vim.lsp.enable({
"pyright",
"basedpyright",
"ts_ls",
"rust_analyzer",
"clangd",
@@ -59,7 +59,7 @@ MiniDeps.later(function()
)
local tD_dH = vim.lsp.protocol.Methods.textDocument_documentHighlight
if client and client:supports_method(tD_dH) then
if client and client.supports_method(tD_dH) then
local ag = vim.api.nvim_create_augroup
local ac = vim.api.nvim_create_autocmd
local g = ag("custom-lsp-tD_dH-highlight", { clear = false })

View File

@@ -1,12 +0,0 @@
MiniDeps.later(function()
require("mini.cursorword").setup()
local function disable(args)
local client = vim.lsp.get_client_by_id(args.data.client_id)
local tD_dH = vim.lsp.protocol.Methods.textDocument_documentHighlight
if client and not client:supports_method(tD_dH) then return end
vim.b[args.buf].minicursorword_disable = true
end
vim.api.nvim_create_autocmd("LspAttach", { callback = disable })
end)

View File

@@ -12,10 +12,15 @@ MiniDeps.later(function()
"qf",
}
local disable_set = {}
for _, v in ipairs(disable) do
disable_set[v] = true
end
local function term_disable(args) vim.b[args.buf].miniindentscope_disable = true end
local function ft_disable(args)
local ft = vim.bo[args.buf].filetype
if not vim.tbl_contains(disable, ft) then return end
if disable_set[ft] == nil then return end
vim.b[args.buf].miniindentscope_disable = true
end

View File

@@ -0,0 +1,4 @@
MiniDeps.now(function()
require("mini.notify").setup()
vim.notify = MiniNotify.make_notify()
end)

View File

@@ -0,0 +1 @@
MiniDeps.later(function() require("mini.pairs").setup() end)

View File

@@ -12,60 +12,24 @@ local function reinstall_treesitter()
ts.install(ts.get_installed(), { force = true })
end
local function deps_section()
local mini_deps = require("mini.deps")
local nr_deps = #vim.iter(mini_deps):enumerate():totable()
local items = {
{
name = "number of dependencies " .. nr_deps,
action = "",
section = "dependencies",
},
}
local function mk_dep_item(name, action)
return { name = name, action = action, section = "dependencies" }
end
local deps_actions = {
mk_dep_item("update dependencies", "DepsUpdate"),
mk_dep_item("snap dependencies", "DepsSnapSave"),
mk_dep_item("load dependencies", "DepsSnapLoad"),
mk_dep_item("clean dependencies", "DepsClean"),
}
if vim.fn.getcwd() == vim.fn.stdpath("config") then
for _, item in ipairs(deps_actions) do
table.insert(items, item)
end
end
return items
end
MiniDeps.now(function()
local builtins = {
{ name = "edit new buffer", action = "enew", section = "builtin actions" },
{ name = "quit neovim", action = "qall", section = "builtin actions" },
}
require("mini.starter").setup({
query_updaters = "abcdefghijklmnopqrstuvwxyz0123456789_.",
evaluate_single = true,
header = default_header,
footer = "",
items = {
--stylua: ignore start
-- builtins
builtins,
{ name = "edit new buffer", action = "enew", section = "builtin actions" },
{ name = "quit neovim", action = "qall", section = "builtin actions" },
-- dependencies
deps_section,
{ name = "update dependencies", action = "DepsUpdate", section = "dependencies" },
{ name = "snap dependencies", action = "DepsSnapSave", section = "dependencies" },
{ name = "load dependencies", action = "DepsSnapLoad", section = "dependencies" },
-- debug
{
name = "reinstall treesitter parsers",
action = reinstall_treesitter,
section = "debug",
},
{ name = "reinstall treesitter parsers", action = reinstall_treesitter, section = "debug" },
--stylua: ignore end
},
})
end)

View File

@@ -1,4 +0,0 @@
MiniDeps.later(function()
MiniDeps.add("windwp/nvim-autopairs")
require("nvim-autopairs").setup()
end)

View File

@@ -1,7 +1,5 @@
MiniDeps.now(function()
MiniDeps.add({
source = "folke/todo-comments.nvim",
depends = { "nvim-lua/plenary.nvim" },
})
MiniDeps.add("folke/todo-comments.nvim")
MiniDeps.add("nvim-lua/plenary.nvim")
require("todo-comments").setup()
end)

View File

@@ -1,17 +1,16 @@
return {
["copilot.vim"] = "f89e977c87180519ba3b942200e3d05b17b1e2fc",
["fidget.nvim"] = "e32b672d8fd343f9d6a76944fedb8c61d7d8111a",
["fzf-lua"] = "e9c8828f216e419d3b7fa1292d18378b14368492",
["copilot.vim"] = "da369d90cfd6c396b1d0ec259836a1c7222fb2ea",
["fzf-lua"] = "db3ccffe79480543d8e0f7b0cac0d9b220f9486e",
["git-blame.nvim"] = "54da04264ec5313d602aebea7c5dc90141696ad7",
["gitlinker.nvim"] = "cc59f732f3d043b626c8702cb725c82e54d35c25",
["gitsigns.nvim"] = "5813e4878748805f1518cee7abb50fd7205a3a48",
["gruvbox-material"] = "cc47341018320a2c82262958a1af889e5eeacd6e",
["gitsigns.nvim"] = "1ee5c1fd068c81f9dd06483e639c2aa4587dc197",
["gruvbox-material"] = "834dbf21836862300ced7444db4262b796330ab7",
["guess-indent.nvim"] = "84a4987ff36798c2fc1169cbaff67960aed9776f",
["mini.nvim"] = "6bd3a01aaf7d248aea1b78aacdd5d44bffa002c1",
["nvim-autopairs"] = "d9e44e54384e5b0f3536339c65484f2e41b528e3",
["nvim-lspconfig"] = "f3979663c9c8cd9ad258344b9cfb5ad83cff61c1",
["nvim-treesitter"] = "d3218d988f72ed34414959c9ccd802d393432d6e",
["oil.nvim"] = "cbcb3f997f6f261c577b943ec94e4ef55108dd95",
["mini.nvim"] = "5e1dd6e3d5f758eccf6c51461559da785dba688c",
["nvim-lspconfig"] = "ac98db2f9f06a56498ec890a96928774eae412c3",
["nvim-treesitter"] = "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68",
["oil.nvim"] = "919e155fdf38e9148cdb5304faaaf53c20d703ea",
["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
["rainbow-delimiters.nvim"] = "8aafe2cbd89cd4090f573a98cab6b20366576fde",
["todo-comments.nvim"] = "31e3c38ce9b29781e4422fc0322eb0a21f4e8668"
["rainbow-delimiters.nvim"] = "3277ad5f96eb03c9d618c88e24f683e4364e578c",
["todo-comments.nvim"] = "19d461ddd543e938eb22505fb03fa878800270b6"
}