1
Fork 0
mirror of https://github.com/thegeneralist01/config.git synced 2026-05-30 08:37:01 +02:00
This commit is contained in:
TheGeneralist 2026-04-01 16:50:27 +02:00
parent 609179ec34
commit 082a4ad541
Signed by: thegeneralist01
SSH key fingerprint: SHA256:pp9qddbCNmVNoSjevdvQvM5z0DHN7LTa8qBMbcMq/R4

View file

@ -1,15 +1,20 @@
{ lib, pkgs, ... }: let { lib, pkgs, ... }:
let
inherit (lib) getExe; inherit (lib) getExe;
in { in
{
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnupg gnupg
difftastic
]; ];
home-manager.sharedModules = [{ home-manager.sharedModules = [
{
programs = { programs = {
gpg.enable = true; gpg.enable = true;
gh.enable = true; gh.enable = true;
gh-dash.enable = true; gh-dash.enable = true;
git = { git = {
enable = true; enable = true;
@ -23,9 +28,28 @@ in {
gpg.format = "ssh"; gpg.format = "ssh";
gpg.program = getExe pkgs.gnupg; gpg.program = getExe pkgs.gnupg;
user.signingKey = "~/.ssh/id_ed25519"; user.signingKey = "~/.ssh/id_ed25519";
diff.algorithm = "histogram";
diff.colorMoved = "default";
pull.rebase = true;
push.autoSetupRemote = true;
merge.conflictStyle = "zdiff3";
rebase.autoSquash = true;
rebase.autoStash = true;
rebase.updateRefs = true;
rerere.enabled = true;
fetch.fsckObjects = true;
receive.fsckObjects = true;
transfer.fsckobjects = true;
# https://bernsteinbear.com/git
alias.recent = "! git branch --sort=-committerdate --format=\"%(committerdate:relative)%09%(refname:short)\" | head -10";
}; };
}; };
}; };
}]; }
];
} }