mirror of
https://github.com/pratiktri/dotfiles.git
synced 2026-05-06 19:43:40 +05:30
Compare commits
6 Commits
c889e65b3b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
87169ab4ed
|
|||
|
288a93e253
|
|||
|
7828f4de3f
|
|||
|
8fb3f6ea0b
|
|||
|
f1129233d1
|
|||
|
f33504b9c4
|
@@ -9,6 +9,8 @@ vim.keymap.set({ "n" }, "<C-,>", "<cmd>edit " .. vim.fn.expand(vim.fn.stdpath("c
|
||||
|
||||
vim.keymap.set({ "n", "v" }, "<leader>y", '"+y', { desc = "Copy to system clipboard" })
|
||||
vim.keymap.set({ "n", "v" }, "<leader>p", '"+p', { desc = "Paste from system clipboard" })
|
||||
-- Disable [Ctrl + p] to paste in edit mode; avoids accidentally pressing `p` when actually doing `Ctrl + [`
|
||||
vim.keymap.set("i", "<C-p>", "<Nop>", { noremap = true, silent = true })
|
||||
|
||||
-- Remap for dealing with word wrap
|
||||
vim.keymap.set({ "n", "x" }, "j", "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
|
||||
|
||||
@@ -285,18 +285,18 @@ return {
|
||||
})
|
||||
|
||||
-- Incremental selection is NATIVE in 0.12 (no plugin config)
|
||||
-- 0.12 defaults: gnn (init), grn (expand node), grm (shrink), grc (scope)
|
||||
-- Remap to your existing keys:
|
||||
vim.keymap.set("n", "<C-space>", "gnn", { remap = true, desc = "Init treesitter selection" })
|
||||
vim.keymap.set("x", "<C-CR>", "grc", { remap = true, desc = "Expand scope selection" })
|
||||
vim.keymap.set("x", "<bs>", "grm", { remap = true, desc = "Shrink node selection" })
|
||||
-- 0.12 defaults:
|
||||
-- v:
|
||||
-- an (expand out)
|
||||
-- in (shrink in)
|
||||
-- ]n (next sibling)
|
||||
-- [n (previous sibling)
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
branch = "main",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
config = function()
|
||||
require("nvim-treesitter-textobjects").setup({
|
||||
select = {
|
||||
@@ -311,38 +311,59 @@ return {
|
||||
["ic"] = { query = "@class.inner", desc = "Select inside of the class" },
|
||||
["al"] = { query = "@loop.outer", desc = "Select around the loop" },
|
||||
["il"] = { query = "@loop.inner", desc = "Select inside of the loop" },
|
||||
["as"] = { query = "@scope", query_group = "locals", desc = "Select around the scope" },
|
||||
["as"] = { query = "@local.scope", query_group = "locals", desc = "Select around the scope" },
|
||||
},
|
||||
},
|
||||
move = {
|
||||
enable = true,
|
||||
goto_next_start = {
|
||||
["]f"] = { query = "@function.outer", desc = "Goto next function start" },
|
||||
["]o"] = { query = "@loop.*", desc = "Goto next loop start" },
|
||||
["]a"] = { query = "@parameter.inner", desc = "Goto next parameter" },
|
||||
},
|
||||
goto_next_end = {
|
||||
["]F"] = { query = "@function.outer", desc = "Goto next function end" },
|
||||
["]C"] = { query = "@class.outer", desc = "Goto next class end" },
|
||||
["]O"] = { query = "@loop.*", desc = "Goto next loop end" },
|
||||
},
|
||||
goto_previous_start = {
|
||||
["[f"] = { query = "@function.outer", desc = "Goto previous function start" },
|
||||
["[o"] = { query = "@loop.*", desc = "Goto previous loop start" },
|
||||
["[a"] = { query = "@parameter.inner", desc = "Goto previous parameter" },
|
||||
},
|
||||
goto_previous_end = {
|
||||
["[F"] = { query = "@function.outer", desc = "Goto previous function end" },
|
||||
["[C"] = { query = "@class.outer", desc = "Goto previous class end" },
|
||||
["[O"] = { query = "@loop.*", desc = "Goto previous loop end" },
|
||||
},
|
||||
},
|
||||
lsp_interop = {
|
||||
enable = true,
|
||||
border = "none",
|
||||
floating_preview_opts = {},
|
||||
set_jumps = true,
|
||||
},
|
||||
})
|
||||
|
||||
local move = require("nvim-treesitter-textobjects.move")
|
||||
|
||||
-- goto_next_start
|
||||
vim.keymap.set({ "n", "x", "o" }, "]f", function()
|
||||
move.goto_next_start("@function.outer", "textobjects")
|
||||
end, { desc = "Goto next function start" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "]o", function()
|
||||
move.goto_next_start({ "@loop.inner", "@loop.outer" }, "textobjects")
|
||||
end, { desc = "Goto next loop start" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "]a", function()
|
||||
move.goto_next_start("@parameter.inner", "textobjects")
|
||||
end, { desc = "Goto next parameter" })
|
||||
|
||||
-- goto_next_end
|
||||
vim.keymap.set({ "n", "x", "o" }, "]F", function()
|
||||
move.goto_next_end("@function.outer", "textobjects")
|
||||
end, { desc = "Goto next function end" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "]C", function()
|
||||
move.goto_next_end("@class.outer", "textobjects")
|
||||
end, { desc = "Goto next class end" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "]O", function()
|
||||
move.goto_next_end({ "@loop.inner", "@loop.outer" }, "textobjects")
|
||||
end, { desc = "Goto next loop end" })
|
||||
|
||||
-- goto_previous_start
|
||||
vim.keymap.set({ "n", "x", "o" }, "[f", function()
|
||||
move.goto_previous_start("@function.outer", "textobjects")
|
||||
end, { desc = "Goto previous function start" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "[o", function()
|
||||
move.goto_previous_start({ "@loop.inner", "@loop.outer" }, "textobjects")
|
||||
end, { desc = "Goto previous loop start" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "[a", function()
|
||||
move.goto_previous_start("@parameter.inner", "textobjects")
|
||||
end, { desc = "Goto previous parameter" })
|
||||
|
||||
-- goto_previous_end
|
||||
vim.keymap.set({ "n", "x", "o" }, "[F", function()
|
||||
move.goto_previous_end("@function.outer", "textobjects")
|
||||
end, { desc = "Goto previous function end" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "[C", function()
|
||||
move.goto_previous_end("@class.outer", "textobjects")
|
||||
end, { desc = "Goto previous class end" })
|
||||
vim.keymap.set({ "n", "x", "o" }, "[O", function()
|
||||
move.goto_previous_end({ "@loop.inner", "@loop.outer" }, "textobjects")
|
||||
end, { desc = "Goto previous loop end" })
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
||||
@@ -7,20 +7,19 @@ return {
|
||||
"sindrets/diffview.nvim",
|
||||
"nvim-telescope/telescope.nvim",
|
||||
},
|
||||
config = true,
|
||||
config = function()
|
||||
local neogit = require("neogit")
|
||||
|
||||
neogit.setup({
|
||||
graph_style = "kitty",
|
||||
process_spinner = true,
|
||||
})
|
||||
end,
|
||||
keys = {
|
||||
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Git: Open Neogit", mode = { "n" } },
|
||||
},
|
||||
},
|
||||
|
||||
-- Git Diffview
|
||||
{
|
||||
"sindrets/diffview.nvim",
|
||||
keys = {
|
||||
{ "<leader>gD", "<cmd>DiffviewOpen<cr>", desc = "Git: Diffview Project against index/staging", mode = { "n" } },
|
||||
},
|
||||
},
|
||||
|
||||
-- Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
|
||||
@@ -7,7 +7,6 @@ return {
|
||||
config = function()
|
||||
require("mini.comment").setup()
|
||||
require("mini.pairs").setup()
|
||||
require("mini.ai").setup({ n_lines = 500 })
|
||||
|
||||
-- mini.surround
|
||||
-- functionality similar to tpope's vim-surround
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
extends: default
|
||||
rules:
|
||||
line-length: disable
|
||||
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user