Merge 39f1bebf54 into 6d3b6dc922

modules/programs/zellij.nix

@@ -52,6 +52,39 @@ in {
     enableFishIntegration = mkEnableOption "Fish integration" // {
       default = false;
     };
+
+    extraConfig = mkOption {
+      type = lib.types.lines;
+      default = "";
+      example = ''
+        keybinds {
+            // keybinds are divided into modes
+            normal {
+                // bind instructions can include one or more keys (both keys will be bound separately)
+                // bind keys can include one or more actions (all actions will be performed with no sequential guarantees)
+                bind "Ctrl g" { SwitchToMode "locked"; }
+                bind "Ctrl p" { SwitchToMode "pane"; }
+                bind "Alt n" { NewPane; }
+                bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
+            }
+            pane {
+                bind "h" "Left" { MoveFocus "Left"; }
+                bind "l" "Right" { MoveFocus "Right"; }
+                bind "j" "Down" { MoveFocus "Down"; }
+                bind "k" "Up" { MoveFocus "Up"; }
+                bind "p" { SwitchFocus; }
+            }
+            locked {
+                bind "Ctrl g" { SwitchToMode "normal"; }
+            }
+        }
+      '';
+      description = ''
+        Extra configuration lines
+        Versions prior to 0.32.0 use Yaml
+        Versions after 0.32.0 use KDL
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -60,14 +93,28 @@ in {
     # Zellij switched from yaml to KDL in version 0.32.0:
     # https://github.com/zellij-org/zellij/releases/tag/v0.32.0
     xdg.configFile."zellij/config.yaml" = mkIf
-      (cfg.settings != { } && (versionOlder cfg.package.version "0.32.0")) {
-        source = yamlFormat.generate "zellij.yaml" cfg.settings;
-      };
+      ((cfg.settings != { } || cfg.extraConfig != "")
+        && (versionOlder cfg.package.version "0.32.0")) {
+          source =
+            let settings = yamlFormat.generate "zellij.yaml" cfg.settings;
+            in ''
+              ${settings}
+
+              ${cfg.extraConfig}
+            '';
+        };
 
     xdg.configFile."zellij/config.kdl" = mkIf
-      (cfg.settings != { } && (versionAtLeast cfg.package.version "0.32.0")) {
-        text = lib.hm.generators.toKDL { } cfg.settings;
-      };
+      ((cfg.settings != { } || cfg.extraConfig != "")
+        && (versionAtLeast cfg.package.version "0.32.0")) {
+          text = let settings = lib.hm.generators.toKDL { } cfg.settings;
+          in ''
+            ${settings}
+
+            ${cfg.extraConfig}
+          '';
+
+        };
 
     programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 200 ''
       eval "$(${zellijCmd} setup --generate-auto-start bash)"

tests/modules/programs/zellij/default.nix

@@ -1 +1,4 @@
-{ zellij-enable-shells = ./enable-shells.nix; }
+{
+  zellij-enable-shells = ./enable-shells.nix;
+  zellij-extra-config = ./extra-config.nix;
+}

tests/modules/programs/zellij/extra-config.nix

@@ -0,0 +1,45 @@
+{ lib, ... }:
+
+let
+  testInput = ''
+    keybinds {
+        // keybinds are divided into modes
+        normal {
+            // bind instructions can include one or more keys (both keys will be bound separately)
+            // bind keys can include one or more actions (all actions will be performed with no sequential guarantees)
+            bind "Ctrl g" { SwitchToMode "locked"; }
+            bind "Ctrl p" { SwitchToMode "pane"; }
+            bind "Alt n" { NewPane; }
+            bind "Alt h" "Alt Left" { MoveFocusOrTab "Left"; }
+        }
+        pane {
+            bind "h" "Left" { MoveFocus "Left"; }
+            bind "l" "Right" { MoveFocus "Right"; }
+            bind "j" "Down" { MoveFocus "Down"; }
+            bind "k" "Up" { MoveFocus "Up"; }
+            bind "p" { SwitchFocus; }
+        }
+        locked {
+            bind "Ctrl g" { SwitchToMode "normal"; }
+        }
+    }
+  '';
+in {
+  programs = {
+    zellij = {
+      enable = true;
+      extraConfig = testInput;
+    };
+  };
+
+  test.stubs = {
+    zellij = { };
+  };
+
+  nmt.script = ''
+    assertFileExists home-files/.config/zellij/config.kdl
+    assertFileContains \
+      home-files/.config/zellij/config.kdl \
+      "${testInput}"
+  '';
+}