From 708189e736d8f9ac7c80292be7074e2acf6bccd4 Mon Sep 17 00:00:00 2001 From: Steffen Rademacker Date: Mon, 3 Jan 2022 21:47:18 +0100 Subject: [PATCH] Lazygit integration + better floaterm/fzf in vim --- gitconfig | 2 +- lazygit/config.yml | 11 +++++++++++ nvim/lua/config/floaterm.lua | 5 +++-- nvim/lua/config/fzf.lua | 6 +++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gitconfig b/gitconfig index 5b42c4d9..d10ce4ba 100644 --- a/gitconfig +++ b/gitconfig @@ -5,7 +5,7 @@ excludesfile = ~/.gitignore autocrlf = input eol = lf - pager = diff-so-fancy | less + pager = diff-so-fancy [color] ui = auto diff --git a/lazygit/config.yml b/lazygit/config.yml index 56db291c..8849edcf 100644 --- a/lazygit/config.yml +++ b/lazygit/config.yml @@ -1,5 +1,16 @@ gui: showRandomTip: false showCommandLog: false + showFileTree: false + theme: + selectedLineBgColor: + - reverse + selectedRangeBgColor: + - reverse disableStartupPopups: true notARepository: 'skip' +git: + branchLogCmd: "git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit" + paging: + colorArg: always + pager: diff-so-fancy diff --git a/nvim/lua/config/floaterm.lua b/nvim/lua/config/floaterm.lua index 93959ffe..f95625f3 100644 --- a/nvim/lua/config/floaterm.lua +++ b/nvim/lua/config/floaterm.lua @@ -1,8 +1,9 @@ local cmd = vim.cmd local g = vim.g -g.floaterm_width = 0.8 -g.floaterm_height = 0.8 +g.floaterm_width = 0.98 +g.floaterm_height = 0.90 +g.floaterm_position = 'bottom' g.floaterm_autoclose = 1 g.floaterm_opener = 'edit' g.floaterm_borderchars = '─│─│╭╮╯╰' diff --git a/nvim/lua/config/fzf.lua b/nvim/lua/config/fzf.lua index 1eef0186..0d6245c1 100644 --- a/nvim/lua/config/fzf.lua +++ b/nvim/lua/config/fzf.lua @@ -11,9 +11,9 @@ require('fzf-lua').setup({ }, }, winopts = { - width = 0.80, - height = 0.78, - row = 0.45, + width = 0.98, + height = 0.89, + row = 0.55, col = 0.48, }, })