From bc84a4af0bedda61049ed2a8e9cf1076c4939039 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 15 Nov 2024 17:31:17 +0000 Subject: [PATCH 1/2] nixos/pay-respects: actually import the module I am unbelievably stupid sometimes. Signed-off-by: Fernando Rodrigues (cherry picked from commit 3cd382262c19cab764c8d31b70227fb742d63cdf) --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4977b6a73ec6..630fb176c253 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -263,6 +263,7 @@ ./programs/openvpn3.nix ./programs/obs-studio.nix ./programs/partition-manager.nix + ./programs/pay-respects.nix ./programs/plotinus.nix ./programs/pqos-wrapper.nix ./programs/projecteur.nix From b89e0bf06f6f9bc6952e2c9940f6b6824a477e7d Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Fri, 15 Nov 2024 17:56:54 +0000 Subject: [PATCH 2/2] nixos/pay-respects: fix interactiveShellInit for fish and zsh Signed-off-by: Fernando Rodrigues (cherry picked from commit c346fd5125298ddad629f1e38f86894a5c1a50e6) --- nixos/modules/programs/pay-respects.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix index a3fdcf5b8848..83822cdc2c7f 100644 --- a/nixos/modules/programs/pay-respects.nix +++ b/nixos/modules/programs/pay-respects.nix @@ -11,6 +11,7 @@ let mkEnableOption mkIf mkOption + optionalString types ; inherit (types) str; @@ -48,8 +49,8 @@ in programs = { bash.interactiveShellInit = initScript "bash"; - fish.interactiveShellInit = mkIf config.programs.fish.enable initScript "fish"; - zsh.interactiveShellInit = mkIf config.programs.zsh.enable initScript "zsh"; + fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish"); + zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh"); }; }; meta.maintainers = with maintainers; [ sigmasquadron ];