From d9f0830541d33e8a047bbe208a326ad00d4dbe04 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Sun, 18 Feb 2024 18:46:53 +0100
Subject: common/git: format with alejandra

---
 common/commandline/git.nix | 88 ++++++++++++++++++++++------------------------
 1 file changed, 43 insertions(+), 45 deletions(-)

(limited to 'common/commandline/git.nix')

diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 291f5a9..0e04358 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -1,8 +1,9 @@
-inputs:
-
-{ config, pkgs, lib, ... }:
-
-{
+inputs: {
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
   environment = {
     systemPackages = with pkgs; [unstable.git-branchless unstable.gitoxide watchman];
     shellAliases.git = "git-branchless wrap --";
@@ -24,63 +25,60 @@ inputs:
         key = "minijackson@riseup.net";
       };
 
-      extraConfig =
-        let
-          deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
-        in
-        {
-          init.defaultBranch = "master";
-
-          core = {
-            whitespace = "trailing-space,space-before-tab";
-            pager = deltaCommand;
-            interactive.diffFilter = "${deltaCommand} --color-only";
-            untrackedCache = true;
-          };
+      extraConfig = let
+        deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
+      in {
+        init.defaultBranch = "master";
 
-          diff = {
-            colormoved = "default";
-            colorMovedWS = "allow-indentation-change";
-          };
+        core = {
+          whitespace = "trailing-space,space-before-tab";
+          pager = deltaCommand;
+          interactive.diffFilter = "${deltaCommand} --color-only";
+          untrackedCache = true;
+        };
 
-          pull.ff = "only";
+        diff = {
+          colormoved = "default";
+          colorMovedWS = "allow-indentation-change";
+        };
 
-          merge = { tool = "nvimdiff"; };
-          "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
+        pull.ff = "only";
 
-          delta = with config.theme.colors; {
-            line-numbers = true;
-            navigate = true;
+        merge = {tool = "nvimdiff";};
+        "mergetool \"nvimdiff\"" = {cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";};
 
-            whitespace-error-style = "reverse green";
+        delta = with config.theme.colors; {
+          line-numbers = true;
+          navigate = true;
 
-            minus-style = "normal red";
-            minus-non-emph-style = "normal red";
-            minus-emph-style = "normal brightred";
-            minus-empty-line-marker-style = "normal red";
+          whitespace-error-style = "reverse green";
 
-            plus-style = "reverse green";
-            plus-non-emph-style = "reverse green";
-            plus-emph-style = "reverse brightgreen";
-            plus-empty-line-marker-style = "reverse green";
+          minus-style = "normal red";
+          minus-non-emph-style = "normal red";
+          minus-emph-style = "normal brightred";
+          minus-empty-line-marker-style = "normal red";
 
-            line-numbers-minus-style = "brightred";
-            line-numbers-zero-style = "brightblack";
-            line-numbers-plus-style = "brightgreen";
+          plus-style = "reverse green";
+          plus-non-emph-style = "reverse green";
+          plus-emph-style = "reverse brightgreen";
+          plus-empty-line-marker-style = "reverse green";
 
-            file-style = "bright${dominantName}";
-            line-numbers-left-style = dominantName;
-            line-numbers-right-style = dominantName;
-          };
+          line-numbers-minus-style = "brightred";
+          line-numbers-zero-style = "brightblack";
+          line-numbers-plus-style = "brightgreen";
 
+          file-style = "bright${dominantName}";
+          line-numbers-left-style = dominantName;
+          line-numbers-right-style = dominantName;
         };
+      };
     };
   };
 
   # TODO: move common to NixOS' programs.git.config
   home-manager.users.root = {
+    # TODO: use `home-manager.sharedModules`?
     programs.git = with lib;
-      # TODO: use `home-manager.sharedModules`?
       mkMerge [
         (mkDefault config.home-manager.users.minijackson.programs.git)
         {
-- 
cgit v1.2.3