michael/dotfiles
1
0
Fork 0
mirror of https://github.com/m-housh/dotfiles.git synced 2026-02-14 14:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added lazy git

Browse Source
This commit is contained in:
Michael Housh
2023-09-29 23:49:56 -04:00
parent be0bb66e09
commit c930fb7e7a
8 changed files with 208 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
nvim/m-housh/lua/user/plugin/diffview.lua
View File

@@ -1,48 +1,48 @@
return {
"sindrets/diffview.nvim",
cmd = {
"DiffviewOpen",
"DiffviewClose",
"DiffviewToggleFiles",
"DiffviewFocusFiles"
},
config = function()
local cb = require('diffview.config').diffview_callback
require('diffview').setup {
diff_binaries = false, -- Show diffs for binaries
use_icons = true, -- Requires nvim-web-devicons
file_panel = {
width = 35,
},
key_bindings = {
disable_defaults = false, -- Disable the default key bindings
-- The `view` bindings are active in the diff buffers, only when the current
-- tabpage is a Diffview.
view = {
["<tab>"] = cb("select_next_entry"), -- Open the diff for the next file
["<s-tab>"] = cb("select_prev_entry"), -- Open the diff for the previous file
["<leader>e"] = cb("focus_files"), -- Bring focus to the files panel
["<leader>b"] = cb("toggle_files"), -- Toggle the files panel.
},
file_panel = {
["j"] = cb("next_entry"), -- Bring the cursor to the next file entry
["<down>"] = cb("next_entry"),
["k"] = cb("prev_entry"), -- Bring the cursor to the previous file entry.
["<up>"] = cb("prev_entry"),
["<cr>"] = cb("select_entry"), -- Open the diff for the selected entry.
["o"] = cb("select_entry"),
["<2-LeftMouse>"] = cb("select_entry"),
["-"] = cb("toggle_stage_entry"), -- Stage / unstage the selected entry.
["S"] = cb("stage_all"), -- Stage all entries.
["U"] = cb("unstage_all"), -- Unstage all entries.
["R"] = cb("refresh_files"), -- Update stats and entries in the file list.
["<tab>"] = cb("select_next_entry"),
["<s-tab>"] = cb("select_prev_entry"),
["<leader>e"] = cb("focus_files"),
["<leader>b"] = cb("toggle_files"),
}
}
}
end
}
-- return {
-- "sindrets/diffview.nvim",
-- cmd = {
-- "DiffviewOpen",
-- "DiffviewClose",
-- "DiffviewToggleFiles",
-- "DiffviewFocusFiles"
-- },
-- config = function()
-- local cb = require('diffview.config').diffview_callback
--
-- require('diffview').setup {
-- diff_binaries = false, -- Show diffs for binaries
-- use_icons = true, -- Requires nvim-web-devicons
-- file_panel = {
-- width = 35,
-- },
-- key_bindings = {
-- disable_defaults = false, -- Disable the default key bindings
-- -- The `view` bindings are active in the diff buffers, only when the current
-- -- tabpage is a Diffview.
-- view = {
-- ["<tab>"] = cb("select_next_entry"), -- Open the diff for the next file
-- ["<s-tab>"] = cb("select_prev_entry"), -- Open the diff for the previous file
-- ["<leader>e"] = cb("focus_files"), -- Bring focus to the files panel
-- ["<leader>b"] = cb("toggle_files"), -- Toggle the files panel.
-- },
-- file_panel = {
-- ["j"] = cb("next_entry"), -- Bring the cursor to the next file entry
-- ["<down>"] = cb("next_entry"),
-- ["k"] = cb("prev_entry"), -- Bring the cursor to the previous file entry.
-- ["<up>"] = cb("prev_entry"),
-- ["<cr>"] = cb("select_entry"), -- Open the diff for the selected entry.
-- ["o"] = cb("select_entry"),
-- ["<2-LeftMouse>"] = cb("select_entry"),
-- ["-"] = cb("toggle_stage_entry"), -- Stage / unstage the selected entry.
-- ["S"] = cb("stage_all"), -- Stage all entries.
-- ["U"] = cb("unstage_all"), -- Unstage all entries.
-- ["R"] = cb("refresh_files"), -- Update stats and entries in the file list.
-- ["<tab>"] = cb("select_next_entry"),
-- ["<s-tab>"] = cb("select_prev_entry"),
-- ["<leader>e"] = cb("focus_files"),
-- ["<leader>b"] = cb("toggle_files"),
-- }
-- }
-- }
-- end
-- }

10
nvim/m-housh/lua/user/plugin/lazygit.lua Normal file
View File

@@ -0,0 +1,10 @@
return {
"kdheepak/lazygit.nvim",
dependencies = {
"nvim-telescope/telescope.nvim",
"nvim-lua/plenary.nvim"
},
config = function()
require("telescope").load_extension("lazygit")
end,
}

76
nvim/m-housh/lua/user/plugin/neogit.lua
View File

@@ -1,38 +1,38 @@
return {
"TimUntersberger/neogit",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim", -- optional
"sindrets/diffview.nvim", -- optional
},
opts = {
disable_signs = false,
disable_context_highlighting = false,
disable_commit_confirmation = true,
-- customize displayed signs
signs = {
-- { CLOSED, OPENED }
section = { ">", "v" },
item = { ">", "v" },
hunk = { "", "" },
},
integrations = {
diffview = true
},
-- override/add mappings
mappings = {
-- modify status buffer mappings
status = {
-- Adds a mapping with "B" as key that does the "BranchPopup" command
["B"] = "BranchPopup",
["C"] = "CommitPopup",
-- ["P"] = "PullPopup",
["S"] = "Stage",
-- ["D"] = "Discard",
-- Removes the default mapping of "s"
-- ["s"] = "",
}
}
},
cmd = "Neogit",
}
-- return {
-- "TimUntersberger/neogit",
-- dependencies = {
-- "nvim-lua/plenary.nvim",
-- "nvim-telescope/telescope.nvim", -- optional
-- "sindrets/diffview.nvim", -- optional
-- },
-- opts = {
-- disable_signs = false,
-- disable_context_highlighting = false,
-- disable_commit_confirmation = true,
-- -- customize displayed signs
-- signs = {
-- -- { CLOSED, OPENED }
-- section = { ">", "v" },
-- item = { ">", "v" },
-- hunk = { "", "" },
-- },
-- integrations = {
-- diffview = true
-- },
-- -- override/add mappings
-- mappings = {
-- -- modify status buffer mappings
-- status = {
-- -- Adds a mapping with "B" as key that does the "BranchPopup" command
-- ["B"] = "BranchPopup",
-- ["C"] = "CommitPopup",
-- -- ["P"] = "PullPopup",
-- ["S"] = "Stage",
-- -- ["D"] = "Discard",
-- -- Removes the default mapping of "s"
-- -- ["s"] = "",
-- }
-- }
-- },
-- cmd = "Neogit",
-- }