bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: update to 23.11

Browse source
This commit is contained in:
Filippo Berto 2023-12-01 15:24:25 +01:00
parent ab9c5297fc
commit 330d7c2338
No known key found for this signature in database
GPG key ID: FE98AE5EC52B1056
22 changed files with 765 additions and 835 deletions
Download patch file Download diff file Expand all files Collapse all files

73
modules/hm/git.nix
View file

@ -90,39 +90,46 @@ let
};
in
{
programs.git = {
enable = true;
userName = "Filippo Berto";
userEmail = "berto.f@protonmail.com";
# signing = {
# key = "berto.f@protonmail.com";
# signByDefault = true;
# };
extraConfig = {
"add.interactive".useBuiltin = false;
commit.gpgSign = true;
core.editor = "hx";
# credential.helper = "git-credential-libsecret";
delta.side-by-side = true;
delta.line-numbers = true;
delta.navigate = true;
delta.wrap-max-lines = "unlimited";
diff.colorMoved = "default";
diff.guitool = "meld";
diff.tool = "meld";
# init.defaultBranch = "main";
merge.conflictstyle = "diff3";
merge.guitool = "meld";
merge.tool = "meld";
pull.rebase = true;
rebase.autoStash = true;
user.signingKey = "berto.f@protonmail.com";
programs = {
git = {
enable = true;
userName = "Filippo Berto";
userEmail = "berto.f@protonmail.com";
# signing = {
# key = "berto.f@protonmail.com";
# signByDefault = true;
# };
extraConfig = {
"add.interactive".useBuiltin = false;
commit.gpgSign = true;
core.editor = "hx";
# credential.helper = "git-credential-libsecret";
delta = {
line-numbers = true;
navigate = true;
side-by-side = true;
wrap-max-lines = "unlimited";
};
diff = {
colorMoved = "default";
guitool = "meld";
tool = "meld";
};
# init.defaultBranch = "main";
merge = {
conflictstyle = "diff3";
guitool = "meld";
tool = "meld";
};
pull.rebase = true;
rebase.autoStash = true;
user.signingKey = "berto.f@protonmail.com";
};
lfs.enable = true;
delta.enable = true;
};
lfs.enable = true;
delta.enable = true;
bash.shellAliases = shellAliases;
zsh.shellAliases = shellAliases;
};
programs.bash.shellAliases = shellAliases;
programs.zsh.shellAliases = shellAliases;
home.packages =
builtins.attrValues { inherit (pkgs) gh git-secret glab meld; };
home.packages = builtins.attrValues { inherit (pkgs) gh git-secret glab meld; };
}