diff --git a/home/git/default.nix b/home/git/default.nix index da5efae..2350281 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"; - markIgnoredLines = true; markUnblamables = true; + markIgnoredLines = 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"; - frag = "cyan"; meta = "yellow"; - new = "green"; + frag = "cyan"; old = "red"; + new = "green"; whitespace = "red reverse"; }; @@ -123,10 +123,8 @@ in ignores = let - inherit (builtins) readFile; - inherit (lib) filter hasPrefix splitString; - readLines = file: splitString "\n" (readFile file); - removeComments = filter (line: line != "" && !(hasPrefix "#" line)); + readLines = file: lib.splitString "\n" (builtins.readFile file); + removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line)); getPaths = file: removeComments (readLines file); in getPaths ./default.ignore;