diff --git a/git/config b/git/config index 23b655d..02bc884 100644 --- a/git/config +++ b/git/config @@ -5,6 +5,8 @@ autocrlf = input editor = nvim pager = diff-so-fancy | less --tabs=4 -RFX +[sequence] + editor = interactive-rebase-tool [alias] aliases = config --get-regexp alias branchsort = branch --sort='-committerdate' --format='%(HEAD) %(color:blue)%(committerdate:short)%(color:reset) - %(if)%(worktreepath)%(then)%(color:reverse yellow)%(refname:short)%(color:reset)%(else)%(color:yellow)%(refname:short)%(color:reset)%(end)' diff --git a/install/install-brew-packages.sh b/install/install-brew-packages.sh index 6acf142..e874581 100755 --- a/install/install-brew-packages.sh +++ b/install/install-brew-packages.sh @@ -11,6 +11,8 @@ brew install \ fd \ fish \ fzf \ + git \ + interactive-rebase-tool \ neovim \ ripgrep \ tree diff --git a/install/install-nix-packages.sh b/install/install-nix-packages.sh index 3c79fd6..8e8a293 100755 --- a/install/install-nix-packages.sh +++ b/install/install-nix-packages.sh @@ -7,7 +7,9 @@ NIX_ENV="$HOME/.nix-profile/bin/nix-env" if [ -x "$NIX_ENV" ]; then "$NIX_ENV" -iA \ nixpkgs.bat \ + nixpkgs.gitMinimal \ nixpkgs.gitAndTools.diff-so-fancy \ + nixpkgs.gitAndTools.git-interactive-rebase-tool \ nixpkgs.fd \ nixpkgs.fish \ nixpkgs.fzf \