softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-08-31 23:06:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

initial changes to upgrade to flakes

Browse source
This commit is contained in:
Salar Rahmanian 2022-08-07 22:50:23 -07:00
parent 7194bbdb83
commit cc0fd60226
4 changed files with 159 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

28
programs/git/default.nix
View file

@ -7,6 +7,7 @@ let
pager = "diff-so-fancy | less --tabs=4 -RFX";
};
init.defaultBranch = "main";
merge.conflictStyle = "diff3";
merge.tool = "intellij";
mergetool = {
cmd = "idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";
@ -23,20 +24,24 @@ let
insteadOf = "https://github.com/";
};
};
fetch.prune = true;
pull = {
rebase = true;
};
};
in
{
programs.git = {
enable = true;
userEmail = "code@softinio.com";
userName = "Salar Rahmanian";
ignores = [
myAliases = {
ci = "commit";
co = "checkout";
main = "checkout main";
master = "checkout master";
};
myIgnores = [
"*~"
".DS_Store"
"*.bloop"
".direnv/"
".idea/"
".mypy_cache"
"*.metals"
"*.metals.sbt"
"*metals.sbt"
@ -47,7 +52,16 @@ in
"*.idea"
"*.vscode"
"*.python-version"
"result"
];
in
{
programs.git = {
enable = true;
userEmail = "code@softinio.com";
userName = "Salar Rahmanian";
aliases = myAliases;
ignores = myIgnores;
extraConfig = gitConfig;
};
}