zsh: refactor history to use setOptions

tests/modules/programs/fabric-ai/zshrc

@@ -14,26 +14,16 @@ SAVEHIST="10000"
 HISTFILE="/home/hm-user/.zsh_history"
 mkdir -p "$(dirname "$HISTFILE")"
 
-setopt HIST_FCNTL_LOCK
-
-# Enabled history options
-enabled_opts=(
-  HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+# Set shell options
+set_opts=(
+  HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+  NO_APPEND_HISTORY NO_EXTENDED_HISTORY NO_HIST_EXPIRE_DUPS_FIRST
+  NO_HIST_FIND_NO_DUPS NO_HIST_IGNORE_ALL_DUPS NO_HIST_SAVE_NO_DUPS
 )
-for opt in "${enabled_opts[@]}"; do
+for opt in "${set_opts[@]}"; do
   setopt "$opt"
 done
-unset opt enabled_opts
-
-# Disabled history options
-disabled_opts=(
-  APPEND_HISTORY EXTENDED_HISTORY HIST_EXPIRE_DUPS_FIRST HIST_FIND_NO_DUPS
-  HIST_IGNORE_ALL_DUPS HIST_SAVE_NO_DUPS
-)
-for opt in "${disabled_opts[@]}"; do
-  unsetopt "$opt"
-done
-unset opt disabled_opts
+unset opt set_opts
 
 
 

tests/modules/programs/zsh/aliases.nix

@@ -31,29 +31,20 @@
       HISTFILE="/home/hm-user/.zsh_history"
       mkdir -p "$(dirname "$HISTFILE")"
 
-      setopt HIST_FCNTL_LOCK
-
-      # Enabled history options
-      enabled_opts=(
-        HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+      # Set shell options
+      set_opts=(
+        HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+        NO_APPEND_HISTORY NO_EXTENDED_HISTORY NO_HIST_EXPIRE_DUPS_FIRST
+        NO_HIST_FIND_NO_DUPS NO_HIST_IGNORE_ALL_DUPS NO_HIST_SAVE_NO_DUPS
       )
-      for opt in "''${enabled_opts[@]}"; do
+      for opt in "''${set_opts[@]}"; do
         setopt "$opt"
       done
-      unset opt enabled_opts
-
-      # Disabled history options
-      disabled_opts=(
-        APPEND_HISTORY EXTENDED_HISTORY HIST_EXPIRE_DUPS_FIRST HIST_FIND_NO_DUPS
-        HIST_IGNORE_ALL_DUPS HIST_SAVE_NO_DUPS
-      )
-      for opt in "''${disabled_opts[@]}"; do
-        unsetopt "$opt"
-      done
-      unset opt disabled_opts
+      unset opt set_opts
 
       alias -- test1=alias
       alias -- test2=alias2
       alias -g -- global=test''}
+
   '';
 }

tests/modules/programs/zsh/history-substring-search-expected.zshrc

@@ -14,26 +14,16 @@ SAVEHIST="10000"
 HISTFILE="/home/hm-user/.zsh_history"
 mkdir -p "$(dirname "$HISTFILE")"
 
-setopt HIST_FCNTL_LOCK
-
-# Enabled history options
-enabled_opts=(
-  HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+# Set shell options
+set_opts=(
+  HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+  NO_APPEND_HISTORY NO_EXTENDED_HISTORY NO_HIST_EXPIRE_DUPS_FIRST
+  NO_HIST_FIND_NO_DUPS NO_HIST_IGNORE_ALL_DUPS NO_HIST_SAVE_NO_DUPS
 )
-for opt in "${enabled_opts[@]}"; do
+for opt in "${set_opts[@]}"; do
   setopt "$opt"
 done
-unset opt enabled_opts
-
-# Disabled history options
-disabled_opts=(
-  APPEND_HISTORY EXTENDED_HISTORY HIST_EXPIRE_DUPS_FIRST HIST_FIND_NO_DUPS
-  HIST_IGNORE_ALL_DUPS HIST_SAVE_NO_DUPS
-)
-for opt in "${disabled_opts[@]}"; do
-  unsetopt "$opt"
-done
-unset opt disabled_opts
+unset opt set_opts
 
 source @zsh-history-substring-search@/share/zsh-history-substring-search/zsh-history-substring-search.zsh
 bindkey "^[[A" history-substring-search-up

tests/modules/programs/zsh/smart-formatting-expected.zshrc

@@ -14,21 +14,11 @@ SAVEHIST="50000"
 HISTFILE="/home/hm-user/.zsh_history"
 mkdir -p "$(dirname "$HISTFILE")"
 
-setopt HIST_FCNTL_LOCK
-
-# Disabled history options
-disabled_opts=(
-  APPEND_HISTORY EXTENDED_HISTORY HIST_EXPIRE_DUPS_FIRST HIST_FIND_NO_DUPS
-  HIST_IGNORE_ALL_DUPS HIST_IGNORE_DUPS HIST_IGNORE_SPACE HIST_SAVE_NO_DUPS
-  SHARE_HISTORY
-)
-for opt in "${disabled_opts[@]}"; do
-  unsetopt "$opt"
-done
-unset opt disabled_opts
-
 # Set shell options
 set_opts=(
+  HIST_FCNTL_LOCK NO_APPEND_HISTORY NO_EXTENDED_HISTORY
+  NO_HIST_EXPIRE_DUPS_FIRST NO_HIST_FIND_NO_DUPS NO_HIST_IGNORE_ALL_DUPS
+  NO_HIST_IGNORE_DUPS NO_HIST_IGNORE_SPACE NO_HIST_SAVE_NO_DUPS NO_SHARE_HISTORY
   AUTO_LIST AUTO_PARAM_SLASH AUTO_PUSHD ALWAYS_TO_END CORRECT HIST_FCNTL_LOCK
   HIST_VERIFY INTERACTIVE_COMMENTS MENU_COMPLETE PUSHD_IGNORE_DUPS PUSHD_TO_HOME
   PUSHD_SILENT NOTIFY PROMPT_SUBST MULTIOS NOFLOWCONTROL NO_CORRECT_ALL

tests/modules/programs/zsh/zshrc-content-priorities.nix

@@ -49,26 +49,16 @@
           HISTFILE="/home/hm-user/.zsh_history"
           mkdir -p "$(dirname "$HISTFILE")"
 
-          setopt HIST_FCNTL_LOCK
-
-          # Enabled history options
-          enabled_opts=(
-            HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+          # Set shell options
+          set_opts=(
+            HIST_FCNTL_LOCK HIST_IGNORE_DUPS HIST_IGNORE_SPACE SHARE_HISTORY
+            NO_APPEND_HISTORY NO_EXTENDED_HISTORY NO_HIST_EXPIRE_DUPS_FIRST
+            NO_HIST_FIND_NO_DUPS NO_HIST_IGNORE_ALL_DUPS NO_HIST_SAVE_NO_DUPS
           )
-          for opt in "''${enabled_opts[@]}"; do
+          for opt in "''${set_opts[@]}"; do
             setopt "$opt"
           done
-          unset opt enabled_opts
-
-          # Disabled history options
-          disabled_opts=(
-            APPEND_HISTORY EXTENDED_HISTORY HIST_EXPIRE_DUPS_FIRST HIST_FIND_NO_DUPS
-            HIST_IGNORE_ALL_DUPS HIST_SAVE_NO_DUPS
-          )
-          for opt in "''${disabled_opts[@]}"; do
-            unsetopt "$opt"
-          done
-          unset opt disabled_opts
+          unset opt set_opts
 
           # Default priority
           echo "Default priority content"