Compare commits

..

3 Commits

3 changed files with 16 additions and 4 deletions

View File

@@ -62,7 +62,7 @@
light = true
side-by-side = true
line-numbers = true
map-styles = bold purple => syntax magenta, bold cyan => syntax blue
#map-styles = bold purple => syntax magenta, bold cyan => syntax blue
[branch]
autosetuprebase = always

View File

@@ -1,8 +1,9 @@
customCommands:
- key: "<c-P>"
context: "global"
command: "git push --force-with-lease"
- command: "git push --force-with-lease"
context: "commits,localBranches"
description: "Force push with lease."
key: "x"
promptToReturnFromSubprocess: false # removes "press enter to return to lazygit" popup
git:
autoForwardBranches: "none"
os:

View File

@@ -0,0 +1,11 @@
-- This can be removed once the fix is merged upstream.
-- See https://github.com/LazyVim/LazyVim/pull/6354
return {
"akinsho/bufferline.nvim",
init = function()
local bufline = require("catppuccin.groups.integrations.bufferline")
function bufline.get()
return bufline.get_theme()
end
end,
}