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