add user options and remove dead code

This commit is contained in:
2025-07-03 11:07:01 +02:00
parent f45e2d61f4
commit 096ea286fe
3 changed files with 9 additions and 51 deletions

View File

@@ -1,51 +0,0 @@
{
config,
pkgs,
lib,
...
}: {
home.packages = [pkgs.gh];
programs.git = {
enable = true;
userName = config.accounts.username;
userEmail = config.accounts.mail;
delta = {
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 = ''
${config.accounts.mail} namespaces="git" ${config.accounts.sshKey}
'';
}

View File

@@ -34,6 +34,9 @@
fuzzel = {
enable = false;
};
git = {
enable = true;
};
ghostty = {
enable = false;
};

View File

@@ -25,6 +25,12 @@
fuzzel = {
enable = true;
};
git = {
enable = true;
};
ghostty = {
enable = false;
};
helix = {
enable = true;
};