chore: refactor user modules

users/modules/shell/zsh.nix

@@ -5,9 +5,9 @@
   ...
 }:
 with lib; let
-  cfg = config.modules.zsh;
+  cfg = config.home.shell.zsh;
 in {
-  options.modules.zsh = {
+  options.home.shell.zsh = {
     enable = lib.mkEnableOption "Enables zsh";
     abbrs = lib.mkOption {
       type = types.attrsOf types.str;
@@ -24,70 +24,73 @@ in {
     };
   };
 
-  config.programs.zsh = lib.mkIf cfg.enable {
-    enable = true;
-    autocd = true;
-    autosuggestion = {
+  config = lib.mkIf cfg.enable {
+    programs.zsh = {
       enable = true;
-      strategy = ["match_prev_cmd" "completion"];
-    };
-    enableCompletion = true;
-    history = {
-      findNoDups = true;
-      ignoreAllDups = true;
-      ignoreDups = true;
-      ignoreSpace = true;
-      path = "${config.xdg.dataHome}/zsh/zsh_history";
-      saveNoDups = true;
-    };
-    historySubstringSearch.enable = true;
-    initContent = with lib;
-      concatLines [
-        ''
-          bindkey -e
-          bindkey '^p' history-search-backward
-          bindkey '^n' history-search-forward
+      autocd = true;
+      autosuggestion = {
+        enable = true;
+        strategy = ["match_prev_cmd" "completion"];
+      };
+      enableCompletion = true;
+      enableVteIntegration = true;
+      history = {
+        findNoDups = true;
+        ignoreAllDups = true;
+        ignoreDups = true;
+        ignoreSpace = true;
+        path = "${config.xdg.dataHome}/zsh/zsh_history";
+        saveNoDups = true;
+      };
+      historySubstringSearch.enable = true;
+      initContent = with lib;
+        concatLines [
+          ''
+            bindkey -e
+            bindkey '^p' history-search-backward
+            bindkey '^n' history-search-forward
 
-          # Completion styling
-          zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
-          zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
-          zstyle ':completion:*' menu no
-          zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
-        ''
-        (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'')
-        cfg.zshrcExtra
-      ];
-    oh-my-zsh = {
-      enable = true;
+            # Completion styling
+            zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
+            zstyle ':completion:*' list-colors "''${(s.:.)LS_COLORS}"
+            zstyle ':completion:*' menu no
+            zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
+          ''
+          (strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'')
+          cfg.zshrcExtra
+        ];
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          "dirhistory"
+          "sudo"
+        ];
+      };
       plugins = [
-        "dirhistory"
-        "sudo"
+        {
+          name = "fzf-tab";
+          src = pkgs.fetchFromGitHub {
+            owner = "Aloxaf";
+            repo = "fzf-tab";
+            rev = "v1.2.0";
+            sha256 = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
+          };
+        }
+        {
+          name = "zsh-autopair";
+          src = pkgs.fetchFromGitHub {
+            owner = "hlissner";
+            repo = "zsh-autopair";
+            rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d";
+            sha256 = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ=";
+          };
+        }
       ];
-    };
-    plugins = [
-      {
-        name = "fzf-tab";
-        src = pkgs.fetchFromGitHub {
-          owner = "Aloxaf";
-          repo = "fzf-tab";
-          rev = "v1.2.0";
-          sha256 = "sha256-q26XVS/LcyZPRqDNwKKA9exgBByE0muyuNb0Bbar2lY=";
-        };
-      }
-      {
-        name = "zsh-autopair";
-        src = pkgs.fetchFromGitHub {
-          owner = "hlissner";
-          repo = "zsh-autopair";
-          rev = "449a7c3d095bc8f3d78cf37b9549f8bb4c383f3d";
-          sha256 = "sha256-3zvOgIi+q7+sTXrT+r/4v98qjeiEL4Wh64rxBYnwJvQ=";
-        };
-      }
-    ];
-    syntaxHighlighting.enable = true;
-    zsh-abbr = {
-      enable = true;
-      abbreviations = cfg.abbrs;
+      syntaxHighlighting.enable = true;
+      zsh-abbr = {
+        enable = true;
+        abbreviations = cfg.abbrs;
+      };
     };
   };
 }