From 50e143ed09d7ba08b9206699223ec01ad6f6dd7e Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sun, 30 Mar 2025 17:40:39 +0200 Subject: fix(modules/{atuin,zsh}): Avoid atuin keymaps overriding mine --- modules/by-name/zs/zsh/module.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'modules/by-name/zs/zsh/module.nix') diff --git a/modules/by-name/zs/zsh/module.nix b/modules/by-name/zs/zsh/module.nix index cb1bb086..b50e72ac 100644 --- a/modules/by-name/zs/zsh/module.nix +++ b/modules/by-name/zs/zsh/module.nix @@ -10,9 +10,25 @@ zDotDir = ".config/zsh"; sourceFile = path: "source ${path}\n"; + + extraFiles = builtins.concatStringsSep "\n" ( + builtins.map sourceFile ( + builtins.attrValues cfg.integrations + ) + ); in { options.soispha.programs.zsh = { enable = lib.mkEnableOption "zsh"; + + integrations = lib.mkOption { + type = lib.types.attrsOf lib.types.path; + example = '' + { + atuin = ./integrations/atuin.zsh; + } + ''; + default = {}; + }; }; config = lib.mkIf cfg.enable { @@ -105,6 +121,9 @@ in { lib.modules.mkMerge [ start + + extraFiles + end ]; -- cgit 1.4.1