cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

chore(git): fix deprecated settings

Browse Source
This commit is contained in:
cnst
2025-10-23 19:13:12 +02:00
parent ec9a3bd845
commit 1dd06ef3f5
3 changed files with 87 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
modules/home/programs/git/default.nix
View File

@@ -15,47 +15,54 @@ in
};
config = mkIf cfg.enable {
home.packages = [ pkgs.gh ];
programs.git = {
enable = true;
userName = osConfig.settings.accounts.username;
userEmail = osConfig.settings.accounts.mail;
programs = {
git = {
enable = true;
settings = {
# user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
user = {
name = osConfig.settings.accounts.username;
email = osConfig.settings.accounts.mail;
signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
};
signing = {
format = lib.mkDefault "ssh";
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
signByDefault = true;
};
gpg = {
# format = lib.mkDefault "ssh";
ssh.allowedSignersFile =
config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
};
commit = {
verbose = true;
gpgSign = false;
};
init.defaultBranch = "main";
merge.conflictStyle = "diff3";
diff.algorithm = "histogram";
log.date = "iso";
column.ui = "auto";
branch.sort = "committerdate";
push.autoSetupRemote = true;
rerere.enabled = true;
};
lfs.enable = true;
ignores = [
".direnv"
"result"
".jj"
];
};
delta = {
enableGitIntegration = true;
enable = true;
options.dark = true;
};
extraConfig = {
# user.signingkey = "${config.home.homeDirectory}/.ssh/id_ed25519.pub";
user.signingkey = "${config.home.homeDirectory}/.config/git/allowed_signers";
signing = {
format = lib.mkDefault "ssh";
key = "${config.home.homeDirectory}/.ssh/id_ed25519";
signByDefault = true;
};
gpg = {
# format = lib.mkDefault "ssh";
ssh.allowedSignersFile =
config.home.homeDirectory + "/" + config.xdg.configFile."git/allowed_signers".target;
};
commit = {
verbose = true;
gpgSign = false;
};
init.defaultBranch = "main";
merge.conflictStyle = "diff3";
diff.algorithm = "histogram";
log.date = "iso";
column.ui = "auto";
branch.sort = "committerdate";
push.autoSetupRemote = true;
rerere.enabled = true;
};
lfs.enable = true;
ignores = [
".direnv"
"result"
".jj"
];
};
xdg.configFile."git/allowed_signers".text = ''
${osConfig.settings.accounts.mail} namespaces="git" ${osConfig.settings.accounts.sshKey}
'';

1
modules/nixos/programs/pkgs/default.nix
View File

@@ -82,7 +82,6 @@ in
]
(mkIf cfg.common.enable [
qt6.full
swappy
wayfreeze
imagemagick