Compare commits
17 Commits
67b668bf60
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
2228e08a7d
|
|||
|
e52cd237a3
|
|||
|
886b010ce9
|
|||
|
a8fca163a5
|
|||
|
df31db15d9
|
|||
|
ceca94e5db
|
|||
|
7ed9fb4e40
|
|||
|
f34ddbac36
|
|||
|
b3495ef161
|
|||
|
e7aaee0dd6
|
|||
|
513f2e3e20
|
|||
|
ad93476190
|
|||
|
620dd92101
|
|||
|
0904b788b1
|
|||
|
cdf15743c3
|
|||
|
29eb480ac0
|
|||
|
3148fa47c2
|
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
||||
MIT License
|
||||
|
||||
Copyright (c) Matej Janežič
|
||||
Copyright (c) 2025 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
|
||||
|
||||
@@ -13,6 +13,9 @@ vim.o.mouse = ""
|
||||
vim.o.mousescroll = "ver:0,hor:0"
|
||||
vim.o.writebackup = false
|
||||
vim.o.undofile = true
|
||||
vim.o.updatetime = 250
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
|
||||
-- ui
|
||||
vim.o.breakindent = true
|
||||
|
||||
@@ -5,6 +5,7 @@ MiniDeps.now(function()
|
||||
vim.g.gruvbox_material_background = "light"
|
||||
vim.g.gruvbox_material_better_performance = 1
|
||||
vim.g.gruvbox_material_diagnostic_line_highlight = 1
|
||||
vim.g.gruvbox_material_diagnostic_text_highlight = 1
|
||||
vim.g.gruvbox_material_diagnostic_virtual_text = "colored"
|
||||
vim.g.gruvbox_material_enable_bold = 1
|
||||
vim.g.gruvbox_material_enable_italic = 1
|
||||
|
||||
@@ -19,4 +19,11 @@ 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)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
MiniDeps.later(function()
|
||||
MiniDeps.add("ibhagwan/fzf-lua")
|
||||
|
||||
local fzf = require("fzf-lua")
|
||||
fzf.setup({
|
||||
local fzf_lua = require("fzf-lua")
|
||||
fzf_lua.setup({
|
||||
files = {
|
||||
no_ignore = true,
|
||||
toggle_ignore_flag = "--no-ignore-vcs",
|
||||
@@ -13,11 +13,12 @@ MiniDeps.later(function()
|
||||
},
|
||||
})
|
||||
|
||||
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)
|
||||
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)
|
||||
end)
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
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)
|
||||
@@ -1,6 +1,8 @@
|
||||
MiniDeps.later(function()
|
||||
MiniDeps.add("nvim-lua/plenary.nvim")
|
||||
MiniDeps.add("ruifm/gitlinker.nvim")
|
||||
MiniDeps.add({
|
||||
source = "ruifm/gitlinker.nvim",
|
||||
depends = { "nvim-lua/plenary.nvim" },
|
||||
})
|
||||
require("gitlinker").setup({
|
||||
callbacks = {
|
||||
["git.aflabs.org"] = require("gitlinker.hosts").get_gitlab_type_url,
|
||||
|
||||
@@ -9,4 +9,12 @@ 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)
|
||||
|
||||
@@ -58,6 +58,36 @@ MiniDeps.later(function()
|
||||
"format"
|
||||
)
|
||||
|
||||
local tD_dH = vim.lsp.protocol.Methods.textDocument_documentHighlight
|
||||
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 })
|
||||
|
||||
ac({ "CursorHold", "CursorHoldI" }, {
|
||||
buffer = bufnr,
|
||||
group = g,
|
||||
callback = vim.lsp.buf.document_highlight,
|
||||
})
|
||||
|
||||
ac({ "CursorMoved", "CursorMovedI" }, {
|
||||
buffer = bufnr,
|
||||
group = g,
|
||||
callback = vim.lsp.buf.clear_references,
|
||||
})
|
||||
|
||||
ac("LspDetach", {
|
||||
group = ag("custom-lsp-detach", { clear = true }),
|
||||
callback = function(e)
|
||||
vim.lsp.buf.clear_references()
|
||||
vim.api.nvim_clear_autocmds({
|
||||
group = "custom-lsp-tD_dH-highlight",
|
||||
buffer = e.buf,
|
||||
})
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
-- inlay hints
|
||||
if client and client.server_capabilities.inlayHintProvider then
|
||||
vim.lsp.inlay_hint.enable(true, { bufnr = bufnr })
|
||||
|
||||
12
lua/plugins/mini_cursorword.lua
Normal file
12
lua/plugins/mini_cursorword.lua
Normal file
@@ -0,0 +1,12 @@
|
||||
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)
|
||||
@@ -1,10 +1,24 @@
|
||||
MiniDeps.later(
|
||||
function()
|
||||
require("mini.indentscope").setup({
|
||||
draw = {
|
||||
delay = 0,
|
||||
animation = require("mini.indentscope").gen_animation.none(),
|
||||
},
|
||||
})
|
||||
MiniDeps.later(function()
|
||||
require("mini.indentscope").setup({
|
||||
draw = {
|
||||
delay = 0,
|
||||
animation = require("mini.indentscope").gen_animation.none(),
|
||||
},
|
||||
})
|
||||
|
||||
local disable = {
|
||||
"fzf",
|
||||
"fzflua_backdrop",
|
||||
"qf",
|
||||
}
|
||||
|
||||
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
|
||||
vim.b[args.buf].miniindentscope_disable = true
|
||||
end
|
||||
)
|
||||
|
||||
vim.api.nvim_create_autocmd("TermOpen", { callback = term_disable })
|
||||
vim.api.nvim_create_autocmd("Filetype", { callback = ft_disable })
|
||||
end)
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
MiniDeps.later(function() require("mini.pairs").setup() end)
|
||||
@@ -12,24 +12,60 @@ 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
|
||||
{ name = "edit new buffer", action = "enew", section = "builtin actions" },
|
||||
{ name = "quit neovim", action = "qall", section = "builtin actions" },
|
||||
builtins,
|
||||
-- dependencies
|
||||
{ name = "update dependencies", action = "DepsUpdate", section = "dependencies" },
|
||||
{ name = "snap dependencies", action = "DepsSnapSave", section = "dependencies" },
|
||||
{ name = "load dependencies", action = "DepsSnapLoad", section = "dependencies" },
|
||||
deps_section,
|
||||
-- debug
|
||||
{ name = "reinstall treesitter parsers", action = reinstall_treesitter, section = "debug" },
|
||||
--stylua: ignore end
|
||||
{
|
||||
name = "reinstall treesitter parsers",
|
||||
action = reinstall_treesitter,
|
||||
section = "debug",
|
||||
},
|
||||
},
|
||||
})
|
||||
end)
|
||||
|
||||
4
lua/plugins/nvim_autopairs.lua
Normal file
4
lua/plugins/nvim_autopairs.lua
Normal file
@@ -0,0 +1,4 @@
|
||||
MiniDeps.later(function()
|
||||
MiniDeps.add("windwp/nvim-autopairs")
|
||||
require("nvim-autopairs").setup()
|
||||
end)
|
||||
@@ -1,5 +1,7 @@
|
||||
MiniDeps.now(function()
|
||||
MiniDeps.add("folke/todo-comments.nvim")
|
||||
MiniDeps.add("nvim-lua/plenary.nvim")
|
||||
MiniDeps.add({
|
||||
source = "folke/todo-comments.nvim",
|
||||
depends = { "nvim-lua/plenary.nvim" },
|
||||
})
|
||||
require("todo-comments").setup()
|
||||
end)
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
return {
|
||||
["copilot.vim"] = "da369d90cfd6c396b1d0ec259836a1c7222fb2ea",
|
||||
["fzf-lua"] = "db3ccffe79480543d8e0f7b0cac0d9b220f9486e",
|
||||
["git-blame.nvim"] = "54da04264ec5313d602aebea7c5dc90141696ad7",
|
||||
["fzf-lua"] = "6bb2a266facf0d16e30371b6b433037d1828a674",
|
||||
["gitlinker.nvim"] = "cc59f732f3d043b626c8702cb725c82e54d35c25",
|
||||
["gitsigns.nvim"] = "1ee5c1fd068c81f9dd06483e639c2aa4587dc197",
|
||||
["gitsigns.nvim"] = "20ad4419564d6e22b189f6738116b38871082332",
|
||||
["gruvbox-material"] = "834dbf21836862300ced7444db4262b796330ab7",
|
||||
["guess-indent.nvim"] = "84a4987ff36798c2fc1169cbaff67960aed9776f",
|
||||
["mini.nvim"] = "5e1dd6e3d5f758eccf6c51461559da785dba688c",
|
||||
["nvim-lspconfig"] = "ac98db2f9f06a56498ec890a96928774eae412c3",
|
||||
["nvim-treesitter"] = "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68",
|
||||
["oil.nvim"] = "919e155fdf38e9148cdb5304faaaf53c20d703ea",
|
||||
["mini.nvim"] = "d1a91582bf2d16026ae84292874c70fb2d0ffe42",
|
||||
["nvim-autopairs"] = "7a2c97cccd60abc559344042fefb1d5a85b3e33b",
|
||||
["nvim-lspconfig"] = "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69",
|
||||
["nvim-treesitter"] = "738d9ced4ce5b4538c3a0e23ceca12c34c8d2e74",
|
||||
["oil.nvim"] = "7e1cd7703ff2924d7038476dcbc04b950203b902",
|
||||
["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
|
||||
["rainbow-delimiters.nvim"] = "3277ad5f96eb03c9d618c88e24f683e4364e578c",
|
||||
["rainbow-delimiters.nvim"] = "b6b3c9e3f8db02a56416b8ee25d3dbd079ebf26b",
|
||||
["todo-comments.nvim"] = "19d461ddd543e938eb22505fb03fa878800270b6"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user