From e3da09f163575690f6e60de01eda18d0784bf863 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 24 Mar 2025 09:53:33 -0500
Subject: [PATCH] zellij: default integration disabled again
Surprises most users and various issues requesting default change.
---
modules/misc/news.nix | 12 ++++++++++++
modules/programs/zellij.nix | 18 ++++++++++++------
2 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index cdff6d820..672930883 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -2157,6 +2157,18 @@ in {
See https://github.com/WGUNDERWOOD/tex-fmt for more information.
'';
}
+
+ {
+ time = "2025-03-24T22:31:45+00:00";
+ message = ''
+ The following default values change from 'true' to
+ 'false':
+
+ - programs.zellij.enableBashIntegration
+ - programs.zellij.enableFishIntegration
+ - programs.zellij.enableZshIntegration
+ '';
+ }
];
};
}
diff --git a/modules/programs/zellij.nix b/modules/programs/zellij.nix
index 4460228b6..4643e8c11 100644
--- a/modules/programs/zellij.nix
+++ b/modules/programs/zellij.nix
@@ -5,6 +5,12 @@ let
cfg = config.programs.zellij;
yamlFormat = pkgs.formats.yaml { };
+
+ mkShellIntegrationOption = option:
+ option // {
+ default = false;
+ example = true;
+ };
in {
meta.maintainers = [ lib.maintainers.khaneliman lib.hm.maintainers.mainrs ];
@@ -61,14 +67,14 @@ in {
'';
};
- enableBashIntegration =
- lib.hm.shell.mkBashIntegrationOption { inherit config; };
+ enableBashIntegration = mkShellIntegrationOption
+ (lib.hm.shell.mkBashIntegrationOption { inherit config; });
- enableFishIntegration =
- lib.hm.shell.mkFishIntegrationOption { inherit config; };
+ enableFishIntegration = mkShellIntegrationOption
+ (lib.hm.shell.mkFishIntegrationOption { inherit config; });
- enableZshIntegration =
- lib.hm.shell.mkZshIntegrationOption { inherit config; };
+ enableZshIntegration = mkShellIntegrationOption
+ (lib.hm.shell.mkZshIntegrationOption { inherit config; });
};
config = let