From 4363c1312ebaea9c00a70a9663a6123cc87849d4 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 15 Mar 2021 20:52:12 +0000
Subject: [PATCH 1/2] home: git: sort configuration attributes

---
 home/git/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/home/git/default.nix b/home/git/default.nix
index 2350281..3abb83c 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";
       };
 

From 3e9ccdbca7507ec555aea4d2f4363ff3a7c2d96c Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 15 Mar 2021 20:52:12 +0000
Subject: [PATCH 2/2] home: git: clean up ignore file handling

---
 home/git/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/home/git/default.nix b/home/git/default.nix
index 3abb83c..da5efae 100644
--- a/home/git/default.nix
+++ b/home/git/default.nix
@@ -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;