diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua index 4d84667..91adfca 100644 --- a/nvim/lua/plugins/conform.lua +++ b/nvim/lua/plugins/conform.lua @@ -41,6 +41,7 @@ return { }, csharpier = function() return { + --- @diagnostic disable: param-type-mismatch cwd = require("conform.util").root_file(function(name) return name:match('.*%.sln$') or name:match('.*%.csproj$') end), diff --git a/nvim/lua/plugins/git.lua b/nvim/lua/plugins/git.lua index 231820b..dad1630 100644 --- a/nvim/lua/plugins/git.lua +++ b/nvim/lua/plugins/git.lua @@ -4,7 +4,9 @@ vim.keymap.set("n", "gA", "Git add -A", { desc = "Git add all" vim.keymap.set("n", "gc", "Git commit", { desc = "Git commit" }) vim.keymap.set("n", "gC", "Git commit --amend", { desc = "Git commit amend" }) vim.keymap.set("n", "gp", "Git! push", { desc = "Git push" }) -vim.keymap.set("n", "gP", "Git! push --force-with-lease --force-if-includes", { desc = "Git push force" }) +vim.keymap.set("n", "gP", "Git! push --force-with-lease --force-if-includes", + { desc = "Git push force" }) +vim.keymap.set("n", "gb", "Git blame", { desc = "Git fugitive status" }) vim.keymap.set("n", "gg", vim.cmd.Git, { desc = "Git fugitive status" }) return { diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 37b5129..97b2d9e 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -6,6 +6,10 @@ return { keys = { { "f", "Telescope find_files", desc = "Find Files" }, { "F", "Telescope ripgrep theme=ivy", desc = "Grep" }, + -- { "gl", "Telescope git_commits", desc = "Git log" }, + -- { "gh", "Telescope git_bcommits", desc = "Git history" }, + -- { "gB", "Telescope git_branches", desc = "Git branches" }, + -- { "gs", "Telescope git_status", desc = "Git status" }, { "gl", function() @@ -79,6 +83,7 @@ return { find_command = { "fd", "--type", "f", "--strip-cwd-prefix", "-E", ".git" }, }, git_commits = { + -- use_file_path = true, mappings = { i = { [""] = git_show, @@ -87,6 +92,7 @@ return { }, }, git_bcommits = { + -- use_file_path = true, mappings = { i = { [""] = git_show, @@ -94,6 +100,18 @@ return { }, }, }, + git_branches = { + -- use_file_path = true, + show_remote_tracking_branches = false, + mappings = { + mappings = { + i = { [""] = actions.git_switch_branch }, + }, + } + }, + git_status = { + -- use_file_path = true, + }, }, }) diff --git a/nvim/lua/plugins/ui.lua b/nvim/lua/plugins/ui.lua index 9a52cc6..1bcd406 100644 --- a/nvim/lua/plugins/ui.lua +++ b/nvim/lua/plugins/ui.lua @@ -52,7 +52,8 @@ return { ft = "qf", opts = { opts = { - list = false + list = false, + spell = false, }, highlight = { load_buffers = false, diff --git a/nvim/lua/telescope/_extensions/ripgrep.lua b/nvim/lua/telescope/_extensions/ripgrep.lua index ec1ff06..c0ae16c 100644 --- a/nvim/lua/telescope/_extensions/ripgrep.lua +++ b/nvim/lua/telescope/_extensions/ripgrep.lua @@ -26,7 +26,7 @@ local ripgrep = function(opts) local g = split[2] local glob_flag = "--iglob" - -- switch to case sensitive glob if there's an upercase letter. + -- switch to case sensitive glob if there's an uppercase letter. if g:match("%u") then glob_flag = "--glob" end