users: difftastic + signing

moni-dz · Dec 28, 2024 · 4b4921f · 4b4921f
1 parent 451354c
commit 4b4921f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 9 deletions.
diff --git a/dev/module.nix b/dev/module.nix
@@ -5,7 +5,7 @@
 
   perSystem = _: {
     treefmt = {
-      projectRootFile = ".git/config";
+      projectRootFile = "flake.nix";
       programs.nixfmt.enable = true;
 
       settings.global.excludes = [
@@ -17,6 +17,7 @@
         "*.png"
         "*.toml"
         "*.yml"
+        ".jj/*"
       ];
     };
   };

diff --git a/modules/shared/home-manager/vcs.nix b/modules/shared/home-manager/vcs.nix
@@ -2,13 +2,11 @@
   config,
   lib,
   pkgs,
-  self',
   ...
 }:
 
 {
   home.packages = __attrValues {
-    inherit (pkgs) difftastic;
     inherit (pkgs.gitAndTools) gh;
   };
 
@@ -43,19 +41,19 @@
 
     jujutsu = {
       inherit (config.programs.git) enable;
-      #package = self'.packages.jujutsu.overrideAttrs { doCheck = false; };
 
       settings = {
         core.fsmonitor = "watchman";
         format.tree-level-conflicts = true;
 
         aliases = {
-          l = [
-            "log"
-            "-r"
-            "reachable(@, mutable())"
+          ds = [
+            "desc"
+            "-m"
           ];
 
+          df = [ "diff" ];
+
           lm = [
             "log"
             "-r"
@@ -95,9 +93,27 @@
           push-bookmark-prefix = "moni/";
         };
 
+        signing = {
+          sign-all = "true";
+          backend = "ssh";
+          key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBlr5SHXali3ttWt8ygyWgCW2usWVsBhXebeyi2XKO2Z";
+        };
+
         ui = {
           editor = "nvim";
-          default-command = "log";
+
+          default-command = [
+            "log"
+            "-r"
+            "reachable(@, mutable())"
+          ];
+
+          diff.tool = [
+            "${lib.getExe pkgs.difftastic}"
+            "--color=always"
+            "$left"
+            "$right"
+          ];
 
           diff-editor = [
             "nvim"