aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Bobov <anton@bobov.name>2024-06-18 23:09:45 +0500
committerAnton Bobov <anton@bobov.name>2024-06-18 23:09:45 +0500
commit76c95b3603e7a873fcc2a4d15303ef30d12a9f67 (patch)
treed43f2ace2d873faac232253f12e0bee6b7fa918c
parenta8b4132b7a5fe99ca1d5b9d575b377be078ee43e (diff)
[git] Updates
-rwxr-xr-x.gitignore2
-rw-r--r--files/.config/lazygit/config.yml4
-rw-r--r--files/.gitconfig1
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d2eaa22..f05ecef 100755
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,7 @@
/files/.vim/bundle
/files/.vim/plugged/
/files/.zsh/cache
-/files/.tmux/plugins/
+/files/.config/tmux/plugins/
/files/.reminders/*
!/files/.reminders/defaults.rem
diff --git a/files/.config/lazygit/config.yml b/files/.config/lazygit/config.yml
index 3a3b0c5..cd1d122 100644
--- a/files/.config/lazygit/config.yml
+++ b/files/.config/lazygit/config.yml
@@ -1,11 +1,15 @@
---
gui:
+ scrollHeight: 4
nerdFontsVersion: "3"
theme:
lightTheme: true
branchColors:
'develop': '#ff2222'
animateExplosion: false
+ spinner:
+ frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
+ rate: 100
git:
paging:
colorArg: always
diff --git a/files/.gitconfig b/files/.gitconfig
index 636e5d3..8ac9a69 100644
--- a/files/.gitconfig
+++ b/files/.gitconfig
@@ -90,6 +90,7 @@
ri = rebase --interactive
rc = rebase --continue
ra = rebase --abort
+ rx = rebase --exec
prebase = rebase -x 'pre-commit run --from-ref HEAD~ --to-ref HEAD'
# Gitlab merge requests helpers