nixos-config/home/yt/common.nix
cy 4fa0aed92e git enable signoff and change mergetool
Signed-off-by: cy <cy@cy7.sh>
2025-01-24 05:58:02 -05:00

64 lines
1.2 KiB
Nix

{ pkgs, ... }:
{
imports = [
../tmux.nix
../zsh
../nixvim
];
home.sessionVariables = {
"EDITOR" = "nvim";
};
home.packages = with pkgs; [
man-pages
man-pages-posix
man
man-db
attic-client
bottom
btop
];
programs.zoxide.options = [ "--cmd cd" ];
programs.fzf = {
enable = true;
defaultCommand = "rg";
};
programs.zoxide.enable = true;
programs.eza.enable = true;
programs.git = {
enable = true;
userName = "cy";
userEmail = "cy@cy7.sh";
delta = {
enable = true;
options = {
navigate = true;
};
};
extraConfig = {
init.defaultBranch = "main";
push.autoSetupRemote = true; # assume -u on first push
pull = {
rebase = true;
autostash = true;
};
merge = {
tool = "vimdiff";
keepBackup = false;
prompt = false;
};
rebase = {
stat = true;
autoStash = true;
autoSquash = true;
updateRefs = true;
};
help.autocorrect = 1;
"mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
};
};
programs.ripgrep.enable = true;
programs.man.generateCaches = true;
}