Compare commits

..

2 commits

Author SHA1 Message Date
Bruno BELANYI 3e9ccdbca7 home: git: clean up ignore file handling
All checks were successful
continuous-integration/drone/push Build is passing
2021-03-15 20:54:18 +00:00
Bruno BELANYI 4363c1312e home: git: sort configuration attributes 2021-03-15 20:53:52 +00:00

View file

@ -34,8 +34,8 @@ in
# Makes it a bit more readable # Makes it a bit more readable
blame = { blame = {
coloring = "repeatedLines"; coloring = "repeatedLines";
markUnblamables = true;
markIgnoredLines = true; markIgnoredLines = true;
markUnblamables = true;
}; };
# I want `pull --rebase` as a default # I want `pull --rebase` as a default
@ -45,20 +45,20 @@ in
# Shiny colors # Shiny colors
color = { color = {
ui = "auto";
branch = "auto"; branch = "auto";
diff = "auto"; diff = "auto";
interactive = "auto"; interactive = "auto";
status = "auto"; status = "auto";
ui = "auto";
}; };
# Pretty much the usual diff colors # Pretty much the usual diff colors
"color.diff" = { "color.diff" = {
commit = "yellow"; commit = "yellow";
meta = "yellow";
frag = "cyan"; frag = "cyan";
old = "red"; meta = "yellow";
new = "green"; new = "green";
old = "red";
whitespace = "red reverse"; whitespace = "red reverse";
}; };
@ -123,8 +123,10 @@ in
ignores = ignores =
let let
readLines = file: lib.splitString "\n" (builtins.readFile file); inherit (builtins) readFile;
removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); inherit (lib) filter hasPrefix splitString;
readLines = file: splitString "\n" (readFile file);
removeComments = filter (line: line != "" && !(hasPrefix "#" line));
getPaths = file: removeComments (readLines file); getPaths = file: removeComments (readLines file);
in in
getPaths ./default.ignore; getPaths ./default.ignore;