this repo has no description
Cleanup Home-Manager warnings
+20
-16
+20
-16
modules/git.nix
+20
-16
modules/git.nix
···
33
33
# pkgs.radicle-node
34
34
];
35
35
36
+
programs.diff-so-fancy = {
37
+
enable = true;
38
+
enableGitIntegration = true;
39
+
};
40
+
36
41
programs.git = {
37
42
enable = true;
38
43
39
-
diff-so-fancy.enable = true;
40
44
lfs.enable = true;
41
45
42
46
attributes = [
···
66
70
67
71
ignores = inputs.self.lib.readFileWithComments ./git/ignore;
68
72
69
-
aliases = {
70
-
b = "branch";
71
-
ca = "commit --amend";
72
-
ci = "commit";
73
-
co = "checkout";
74
-
rci = "commit --amend --reuse-message HEAD";
73
+
settings = {
74
+
alias = {
75
+
b = "branch";
76
+
ca = "commit --amend";
77
+
ci = "commit";
78
+
co = "checkout";
79
+
rci = "commit --amend --reuse-message HEAD";
75
80
76
-
lg = "log --color --graph --abbrev-commit --pretty=simple-oneline";
81
+
lg = "log --color --graph --abbrev-commit --pretty=simple-oneline";
77
82
78
-
squash = "!git rebase -i \"$(git merge-base HEAD \"$(git default-branch)\")\"";
83
+
squash = "!git rebase -i \"$(git merge-base HEAD \"$(git default-branch)\")\"";
79
84
80
-
st = "status -sb";
81
-
todo = "grep -Ee '\\\\bTODO:?\\\\b'";
82
-
fixme = "grep -Ee '\\\\bFIX(ME)?:?\\\\b'";
85
+
st = "status -sb";
86
+
todo = "grep -Ee '\\\\bTODO:?\\\\b'";
87
+
fixme = "grep -Ee '\\\\bFIX(ME)?:?\\\\b'";
83
88
84
-
default-branch = "!git symbolic-ref --short refs/remotes/origin/HEAD | sed 's|^origin/||'";
89
+
default-branch = "!git symbolic-ref --short refs/remotes/origin/HEAD | sed 's|^origin/||'";
85
90
86
-
cleanup = "!git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(if:notequals=\${1:-$(git default-branch)})%(refname:lstrip=2)%(then)%(refname:lstrip=2)%(end)%(end)\" --merged \"\$(git default-branch)\" | xargs -rpxL1 git branch -d";
87
-
};
91
+
cleanup = "!git branch --format=\"%(if:notequals=*)%(HEAD)%(then)%(if:notequals=\${1:-$(git default-branch)})%(refname:lstrip=2)%(then)%(refname:lstrip=2)%(end)%(end)\" --merged \"\$(git default-branch)\" | xargs -rpxL1 git branch -d";
92
+
};
88
93
89
-
extraConfig = {
90
94
core.commitGraph = true;
91
95
92
96
init.defaultBranch = "master";