mirrors_public/oddlama_nix-config
1
1
Fork 1
mirror of https://github.com/oddlama/nix-config.git synced 2025-10-11 07:10:39 +02:00
Code Activity

feat: add some necessary plumbing

Browse source
This commit is contained in:
oddlama 2022-12-15 17:46:53 +01:00
parent 449d9a2200
commit 5f6012faf1
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
9 changed files with 213 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

38
users/common/git.nix Normal file
View file

@ -0,0 +1,38 @@
{
lib,
pkgs,
...
}: {
programs.gitui.enable = true;
programs.git = {
enable = true;
difftastic.enable = true;
lfs.enable = lib.mkDefault false;
extraConfig = {
#diff = {
# colorMoved = "default";
# age.textconv = "${pkgs.rage}/bin/rage -i ~/.ssh/username --decrypt";
#};
difftool.prompt = true;
init.defaultBranch = "main";
merge.conflictstyle = "diff3";
mergetool.prompt = true;
};
aliases = {
unstash = "stash pop";
s = status;
tags = "tag -l";
t = "tag -s -m ''";
ci = "commit -v -S";
cam = "commit -v -S --amend";
};
};
home.shellAliases = rec {
g = "gitui";
gs = "git status";
ga = "git add";
gc = "git commit -v -S";
gca = "${gci} --amend";
};
}