refactor(modules): introduce cfg local bindings and submodule option types

1 files changed, 18 insertions, 16 deletions

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}";
+  };
 }