From 30f8fea050f3242f0e6a2072779e706b5c8ceaf1 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Thu, 24 Sep 2026 03:42:25 +0530 Subject: refactor(modules): introduce cfg local bindings and submodule option types --- modules/terminal/zsh/default.nix | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'modules/terminal/zsh') diff --git a/modules/terminal/zsh/default.nix b/modules/terminal/zsh/default.nix index 8b7897c..4764618 100644 --- a/modules/terminal/zsh/default.nix +++ b/modules/terminal/zsh/default.nix @@ -2,8 +2,14 @@ { config, lib, + pkgs, ... }: +let + cfg = config.terminal.zsh; + + nixCommandWrappers = builtins.readFile ./nix-aliases.sh; +in { options.terminal.zsh = { enable = lib.mkEnableOption "Enables zsh."; @@ -15,21 +21,17 @@ }; }; - config = - let - nixCommandWrappers = builtins.readFile ./nix-aliases.sh; - in - lib.mkIf config.terminal.zsh.enable { - programs.zsh = { - enable = true; - dotDir = "${config.xdg.configHome}/zsh"; - history.path = "${config.xdg.cacheHome}/zsh/history"; - enableCompletion = true; - initContent = builtins.replaceStrings [ "@@NIX_COMMAND_WRAPPERS@@" ] [ nixCommandWrappers ] ( - builtins.readFile ./init.sh - ); - }; - - home.sessionVariables.SHELL = "${lib.getExe config.terminal.zsh.package}"; + config = lib.mkIf cfg.enable { + programs.zsh = { + enable = true; + dotDir = "${config.xdg.configHome}/zsh"; + history.path = "${config.xdg.cacheHome}/zsh/history"; + enableCompletion = true; + initContent = builtins.replaceStrings [ "@@NIX_COMMAND_WRAPPERS@@" ] [ nixCommandWrappers ] ( + builtins.readFile ./init.sh + ); }; + + home.sessionVariables.SHELL = "${lib.getExe cfg.package}"; + }; } -- cgit v1.2.3