changes for the config
This commit is contained in:
pika
parent
aa324a3cc0
commit
acc5c649f3
4 changed files with 162 additions and 191 deletions
|
|
@ -1,3 +1,5 @@
|
|||
require("pika.core.options")
|
||||
require("pika.core.keymaps")
|
||||
require("pika.core.custom")
|
||||
require("pika.core.custom.terminalcmd")
|
||||
require("pika.core.custom.hugopaste")
|
||||
|
|
|
|||
|
|
@ -54,7 +54,10 @@ o.swapfile = false
|
|||
|
||||
-- Disable the tilde on empty lines
|
||||
-- enable slimline bubble chain ( )----( )
|
||||
o.fillchars = { eob = " ", stl = "─" }
|
||||
o.fillchars = {
|
||||
eob = " ",
|
||||
-- stl = "─",
|
||||
}
|
||||
|
||||
-- SudaRead automatic if file is inaccessible
|
||||
vim.g.suda_smart_edit = 1
|
||||
|
|
|
|||
|
|
@ -1,156 +1,162 @@
|
|||
return {
|
||||
{
|
||||
"tanvirtin/vgit.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
|
||||
-- Lazy loading on 'VimEnter' event is necessary.
|
||||
event = "VimEnter",
|
||||
config = function()
|
||||
require("vgit").setup(
|
||||
-- keymaps = {
|
||||
-- ["n <C-k>"] = {
|
||||
-- function()
|
||||
-- require("vgit").hunk_up()
|
||||
-- end,
|
||||
-- desc = "VGit Hunk Up",
|
||||
-- },
|
||||
-- ["n <C-j>"] = {
|
||||
-- function()
|
||||
-- require("vgit").hunk_down()
|
||||
-- end,
|
||||
-- desc = "VGit Hunk Down",
|
||||
-- },
|
||||
-- ["n <leader>gs"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_hunk_stage()
|
||||
-- end,
|
||||
-- desc = "VGit Stage Hunk",
|
||||
-- },
|
||||
-- ["n <leader>gr"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_hunk_reset()
|
||||
-- end,
|
||||
-- desc = "VGit Reset Hunk",
|
||||
-- },
|
||||
-- ["n <leader>gp"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_hunk_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Preview Hunk",
|
||||
-- },
|
||||
-- ["n <leader>gb"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_blame_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Blame Preview",
|
||||
-- },
|
||||
-- ["n <leader>gf"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_diff_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Diff Preview",
|
||||
-- },
|
||||
-- ["n <leader>gh"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_history_preview()
|
||||
-- end,
|
||||
-- desc = "VGit History Preview",
|
||||
-- },
|
||||
-- ["n <leader>gu"] = {
|
||||
-- function()
|
||||
-- require("vgit").buffer_reset()
|
||||
-- end,
|
||||
-- desc = "VGit Reset Buffer",
|
||||
-- },
|
||||
-- ["n <leader>gcm"] = {
|
||||
-- function()
|
||||
-- require("vgit").project_commit_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Commit Preview",
|
||||
-- },
|
||||
-- ["n <leader>gcc"] = {
|
||||
-- function()
|
||||
-- require("vgit").project_commits_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Commits Preview",
|
||||
-- },
|
||||
-- ["n <leader>gcl"] = {
|
||||
-- function()
|
||||
-- require("vgit").project_logs_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Logs Preview",
|
||||
-- },
|
||||
-- ["n <leader>gd"] = {
|
||||
-- function()
|
||||
-- require("vgit").project_diff_preview()
|
||||
-- end,
|
||||
-- desc = "VGit Project Diff",
|
||||
-- },
|
||||
-- ["n <leader>gx"] = {
|
||||
-- function()
|
||||
-- require("vgit").toggle_diff_preference()
|
||||
-- end,
|
||||
-- desc = "VGit Toggle Diff Preference",
|
||||
-- },
|
||||
-- },
|
||||
)
|
||||
end,
|
||||
|
||||
vim.keymap.set("n", "<C-k>", function()
|
||||
require("vgit").hunk_up()
|
||||
end, { desc = "VGit Hunk Up" }),
|
||||
|
||||
vim.keymap.set("n", "<C-j>", function()
|
||||
require("vgit").hunk_down()
|
||||
end, { desc = "VGit Hunk Down" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gs", function()
|
||||
require("vgit").buffer_hunk_stage()
|
||||
end, { desc = "VGit Stage Hunk" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gr", function()
|
||||
require("vgit").buffer_hunk_reset()
|
||||
end, { desc = "VGit Reset Hunk" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gp", function()
|
||||
require("vgit").buffer_hunk_preview()
|
||||
end, { desc = "VGit Preview Hunk" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gb", function()
|
||||
require("vgit").buffer_blame_preview()
|
||||
end, { desc = "VGit Blame Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gf", function()
|
||||
require("vgit").buffer_diff_preview()
|
||||
end, { desc = "VGit Diff Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gh", function()
|
||||
require("vgit").buffer_history_preview()
|
||||
end, { desc = "VGit History Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gu", function()
|
||||
require("vgit").buffer_reset()
|
||||
end, { desc = "VGit Reset Buffer" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gcm", function()
|
||||
require("vgit").project_commit_preview()
|
||||
end, { desc = "VGit Commit Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gcc", function()
|
||||
require("vgit").project_commits_preview()
|
||||
end, { desc = "VGit Commits Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gcl", function()
|
||||
require("vgit").project_logs_preview()
|
||||
end, { desc = "VGit Logs Preview" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gd", function()
|
||||
require("vgit").project_diff_preview()
|
||||
end, { desc = "VGit Project Diff" }),
|
||||
|
||||
vim.keymap.set("n", "<leader>gx", function()
|
||||
require("vgit").toggle_diff_preference()
|
||||
end, { desc = "VGit Toggle Diff Preference" }),
|
||||
"sindrets/diffview.nvim",
|
||||
opts = {},
|
||||
vim.keymap.set("n", "<leader>gd", "<CMD>DiffviewOpen<CR>", { desc = "Git DiffviewOpen" }),
|
||||
vim.keymap.set("n", "<leader>gc", "<CMD>DiffviewClose<CR>", { desc = "Git DiffviewClose" }),
|
||||
},
|
||||
-- {
|
||||
-- "tanvirtin/vgit.nvim",
|
||||
-- dependencies = { "nvim-lua/plenary.nvim", "nvim-tree/nvim-web-devicons" },
|
||||
-- -- Lazy loading on 'VimEnter' event is necessary.
|
||||
-- event = "VimEnter",
|
||||
-- config = function()
|
||||
-- require("vgit").setup(
|
||||
-- -- keymaps = {
|
||||
-- -- ["n <C-k>"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").hunk_up()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Hunk Up",
|
||||
-- -- },
|
||||
-- -- ["n <C-j>"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").hunk_down()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Hunk Down",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gs"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_hunk_stage()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Stage Hunk",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gr"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_hunk_reset()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Reset Hunk",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gp"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_hunk_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Preview Hunk",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gb"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_blame_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Blame Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gf"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_diff_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Diff Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gh"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_history_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit History Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gu"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").buffer_reset()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Reset Buffer",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gcm"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").project_commit_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Commit Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gcc"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").project_commits_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Commits Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gcl"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").project_logs_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Logs Preview",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gd"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").project_diff_preview()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Project Diff",
|
||||
-- -- },
|
||||
-- -- ["n <leader>gx"] = {
|
||||
-- -- function()
|
||||
-- -- require("vgit").toggle_diff_preference()
|
||||
-- -- end,
|
||||
-- -- desc = "VGit Toggle Diff Preference",
|
||||
-- -- },
|
||||
-- -- },
|
||||
-- )
|
||||
-- end,
|
||||
--
|
||||
-- vim.keymap.set("n", "<C-k>", function()
|
||||
-- require("vgit").hunk_up()
|
||||
-- end, { desc = "VGit Hunk Up" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<C-j>", function()
|
||||
-- require("vgit").hunk_down()
|
||||
-- end, { desc = "VGit Hunk Down" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gs", function()
|
||||
-- require("vgit").buffer_hunk_stage()
|
||||
-- end, { desc = "VGit Stage Hunk" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gr", function()
|
||||
-- require("vgit").buffer_hunk_reset()
|
||||
-- end, { desc = "VGit Reset Hunk" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gp", function()
|
||||
-- require("vgit").buffer_hunk_preview()
|
||||
-- end, { desc = "VGit Preview Hunk" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gb", function()
|
||||
-- require("vgit").buffer_blame_preview()
|
||||
-- end, { desc = "VGit Blame Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gf", function()
|
||||
-- require("vgit").buffer_diff_preview()
|
||||
-- end, { desc = "VGit Diff Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gh", function()
|
||||
-- require("vgit").buffer_history_preview()
|
||||
-- end, { desc = "VGit History Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gu", function()
|
||||
-- require("vgit").buffer_reset()
|
||||
-- end, { desc = "VGit Reset Buffer" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gcm", function()
|
||||
-- require("vgit").project_commit_preview()
|
||||
-- end, { desc = "VGit Commit Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gcc", function()
|
||||
-- require("vgit").project_commits_preview()
|
||||
-- end, { desc = "VGit Commits Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gcl", function()
|
||||
-- require("vgit").project_logs_preview()
|
||||
-- end, { desc = "VGit Logs Preview" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gd", function()
|
||||
-- require("vgit").project_diff_preview()
|
||||
-- end, { desc = "VGit Project Diff" }),
|
||||
--
|
||||
-- vim.keymap.set("n", "<leader>gx", function()
|
||||
-- require("vgit").toggle_diff_preference()
|
||||
-- end, { desc = "VGit Toggle Diff Preference" }),
|
||||
-- },
|
||||
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue