Fiddle with jj settings

Author: RossSmyth

default.nix

@@ -9,7 +9,7 @@
   imports = [
     (import ./${hostname})
   ];
-  
+
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -39,7 +39,7 @@
     };
   };
   networking.hostName = hostname;
-  
+
   time.timeZone = "America/Detroit";
   systemd.coredump.enable = true;
 

flake.lock

@@ -48,7 +48,10 @@
     }:
       nixpkgs.lib.nixosSystem {
         system = target;
-        specialArgs = {inherit inputs; inherit hostname;};
+        specialArgs = {
+          inherit inputs;
+          inherit hostname;
+        };
         modules =
           [
             ./.

flake.nix

@@ -33,13 +33,28 @@
       settings = {
         user = {
           name = "Ross Smyth";
-          email = "";
+          # Email is a per-repo thing.
+        };
+        ui = {
+          default-command = ["log" "--reversed"];
+          pager = {
+            command = [(lib.getExe pkgs.less) "-FRX"];
+            env = {LESSCHARSET = "utf-8";};
+          };
         };
-
-        ui.paginate = "never";
-        ui.default-command = ["log" "--reversed"];
         git.subprocess = true;
-        diff.tool = ["${lib.getExe pkgs.difftastic}" "--color=always" "$left" "$right"];
+        diff.tool = "difft";
+        merge-tools.difft = {
+          program = lib.getExe pkgs.difftastic;
+          diff-args = ["--color=always" "$left" "$right"];
+        };
+        merge-tools.mergiraf = {
+          program = lib.getExe pkgs.mergiraf;
+          merge-args = ["merge" "$base" "$left" "$right" "-o" "$output" "--fast"];
+          merge-conflict-exit-code = [1];
+        };
+        git.colocate = true;
+        snapshot.auto-update-stale = true;
       };
     };
     git = {
@@ -92,7 +107,7 @@
         end
       '';
       shellAliases = {
-        cat = "bat --paging=never";
+        cat = "${lib.getExe pkgs.bat} --paging=never";
         nxswitch = "sudo nixos-rebuild switch --flake ${config.xdg.configHome}/nix";
         nxbuild = "sudo nixos-rebuild boot --flake ${config.xdg.configHome}/nix";
         nxedit = "${config.home.sessionVariables.EDITOR} ${config.xdg.configHome}/nix";