Zellij: add fish completions & autostart options

modules/lib/maintainers.nix

@@ -551,6 +551,12 @@
     keys =
       [{ fingerprint = "75F0 AB7C FE01 D077 AEE6  CAFD 353E 4A18 EE0F AB72"; }];
   };
+  tennox = {
+    name = "Manu";
+    github = "tennox";
+    githubId = 2084639;
+    matrix = "@tennox:matrix.org";
+  };
   tensor5 = {
     github = "tensor5";
     githubId = 1545895;

modules/programs/git.nix

@@ -277,6 +277,13 @@ in {
 
         package = mkPackageOption pkgs "difftastic" { };
 
+        enableAsDifftool = mkEnableOption "" // {
+          description = ''
+            Enable the {command}`difftastic` syntax highlighter as a git difftool.
+            See <https://github.com/Wilfred/difftastic>.
+          '';
+        };
+
         background = mkOption {
           type = types.enum [ "light" "dark" ];
           default = "light";
@@ -590,18 +597,28 @@ in {
       };
     })
 
-    (mkIf cfg.difftastic.enable {
-      home.packages = [ cfg.difftastic.package ];
-
-      programs.git.iniContent = let
-        difftCommand = concatStringsSep " " [
-          "${getExe cfg.difftastic.package}"
-          "--color ${cfg.difftastic.color}"
-          "--background ${cfg.difftastic.background}"
-          "--display ${cfg.difftastic.display}"
-        ];
-      in { diff.external = difftCommand; };
-    })
+    (let
+      difftCommand = concatStringsSep " " [
+        "${getExe cfg.difftastic.package}"
+        "--color ${cfg.difftastic.color}"
+        "--background ${cfg.difftastic.background}"
+        "--display ${cfg.difftastic.display}"
+      ];
+    in (lib.mkMerge [
+      (mkIf cfg.difftastic.enable {
+        home.packages = [ cfg.difftastic.package ];
+        programs.git.iniContent = { diff.external = difftCommand; };
+      })
+      (mkIf cfg.difftastic.enableAsDifftool {
+        home.packages = [ cfg.difftastic.package ];
+        programs.git.iniContent = {
+          diff = { tool = lib.mkDefault "difftastic"; };
+          difftool = {
+            difftastic = { cmd = "${difftCommand} $LOCAL $REMOTE"; };
+          };
+        };
+      })
+    ]))
 
     (let
       deltaPackage = cfg.delta.package;

modules/programs/zellij.nix

@@ -9,7 +9,7 @@ let
   zellijCmd = getExe cfg.package;
 
 in {
-  meta.maintainers = [ hm.maintainers.mainrs ];
+  meta.maintainers = with hm.maintainers; [ mainrs tennox ];
 
   options.programs.zellij = {
     enable = mkEnableOption "zellij";
@@ -49,9 +49,27 @@ in {
       default = false;
     };
 
-    enableFishIntegration = mkEnableOption "Fish integration" // {
-      default = false;
+    enableFishIntegration = mkEnableOption
+      "enable fish integration (enables both enableFishAutoStart and enableFishCompletions)"
+      // {
+        default = false;
+      };
+    enableFishCompletions = mkEnableOption "load zellij completions" // {
+      default = true;
     };
+    enableFishAutoStart =
+      mkEnableOption "autostart zellij in interactive sessions" // {
+        default = false;
+      };
+    autoStartAttachIfSessionExists = mkEnableOption
+      "attach to the default session, if a zellij session already exists (otherwise starting a new session)"
+      // {
+        default = false;
+      };
+    autoStartExitShellOnZellijExit =
+      mkEnableOption "exit the shell when zellij exits." // {
+        default = false;
+      };
   };
 
   config = mkIf cfg.enable {
@@ -77,9 +95,22 @@ in {
       eval "$(${zellijCmd} setup --generate-auto-start zsh)"
     '');
 
-    programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration
-      (mkOrder 200 ''
-        eval (${zellijCmd} setup --generate-auto-start fish | string collect)
-      '');
+    home.sessionVariables = {
+      ZELLIJ_AUTO_ATTACH =
+        if cfg.autoStartAttachIfSessionExists then "true" else "false";
+      ZELLIJ_AUTO_EXIT =
+        if cfg.autoStartExitShellOnZellijExit then "true" else "false";
+    };
+
+    programs.fish.interactiveShellInit = mkIf (cfg.enableFishIntegration
+      || cfg.enableFishAutoStart || cfg.enableFishCompletions) (mkOrder 200
+        ((if cfg.enableFishIntegration || cfg.enableFishCompletions then ''
+          eval (${zellijCmd} setup --generate-completion fish | string collect)
+        '' else
+          "") + (if cfg.enableFishIntegration || cfg.enableFishAutoStart then ''
+            eval (${zellijCmd} setup --generate-auto-start fish | string collect)
+          '' else
+            "")));
+
   };
 }

tests/modules/programs/zellij/enable-shells.nix

@@ -7,6 +7,10 @@
       enableBashIntegration = true;
       enableZshIntegration = true;
       enableFishIntegration = true;
+      enableFishAutoStart = true;
+      enableFishCompletions = true;
+      autoStartAttachIfSessionExists = true;
+      autoStartExitShellOnZellijExit = true;
     };
     bash.enable = true;
     zsh.enable = true;
@@ -37,5 +41,15 @@
     assertFileContains \
       home-files/.config/fish/config.fish \
       'eval (@zellij@/bin/dummy setup --generate-auto-start fish | string collect)'
+    assertFileContains \
+      home-files/.config/fish/config.fish \
+      'eval (@zellij@/bin/dummy setup --generate-completion fish | string collect)'
+    assertFileExists home-path/etc/profile.d/hm-session-vars.sh
+    assertFileContains \
+      home-path/etc/profile.d/hm-session-vars.sh \
+      'export ZELLIJ_AUTO_ATTACH="true"'
+    assertFileContains \
+      home-path/etc/profile.d/hm-session-vars.sh \
+      'export ZELLIJ_AUTO_EXIT="true"'
   '';
 }