youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Migrate git setting to newer nixpkgs module

Browse source
This commit is contained in:
ulic-youthlic 2025-10-22 00:59:37 +08:00
parent 61c886245a
commit ab9d32bd6c
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
home/modules/programs/git.nix
View file

@ -47,18 +47,19 @@
}; };
git = { git = {
enable = true; enable = true;
userEmail = cfg.email; settings.user = {
userName = cfg.name; inherit (cfg) email name;
delta = {
enable = true;
options = {
line-number = true;
hyperlinks = true;
side-by-side = true;
};
}; };
lfs.enable = true; lfs.enable = true;
}; };
delta = {
enable = true;
options = {
line-number = true;
hyperlinks = true;
side-by-side = true;
};
};
}; };
} }
(lib.mkIf (cfg.signKey != null) { (lib.mkIf (cfg.signKey != null) {
@ -69,7 +70,7 @@
}; };
}) })
(lib.mkIf cfg.encrypt-credential { (lib.mkIf cfg.encrypt-credential {
programs.git.extraConfig = { programs.git.settings = {
credential = { credential = {
helper = "store --file=${config.sops.secrets."git-credential".path}"; helper = "store --file=${config.sops.secrets."git-credential".path}";
}; };

1
home/modules/programs/jujutsu.nix
View file

@ -38,7 +38,6 @@ in
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
delta
watchman watchman
]; ];
programs.jujutsu = { programs.jujutsu = {