Make OMZ optional (#912)

* feat: make OMZ optional so that other options like zinit can be used

* fix: remove global alias for -h, fix #910

* chore: polish

* fix: use existing variable

* fix: use the correct var

Author: deepu105

Configs/.config/zsh/conf.d/hyde/env.zsh

@@ -8,7 +8,7 @@
 #! ╚═════╝░░╚════╝░  ╚═╝░░╚══╝░╚════╝░░░░╚═╝░░░  ╚══════╝╚═════╝░╚═╝░░░╚═╝░░░
 
 # Hyde's Shell Environment Initialization Script
-# If users used UWSM, uwsm will override any variables set anywhere in you shell configurations
+# If users used UWSM, uwsm will override any variables set anywhere in your shell configurations
 
 # Basic PATH prepending (user local bin)
 PATH="$HOME/.local/bin:$PATH"

Configs/.config/zsh/conf.d/hyde/terminal.zsh

@@ -12,17 +12,17 @@
 # And ensures that we have an obstruction-free .zshrc file
 # This also ensures that the proper HyDE $ENVs are loaded
 
-function _load_common() {
-
+function _load_functions() {
     # Load all custom function files // Directories are ignored
     for file in "${ZDOTDIR:-$HOME/.config/zsh}/functions/"*.zsh; do
         [ -r "$file" ] && source "$file"
     done
+}
 
+function _load_completions() {
     for file in "${ZDOTDIR:-$HOME/.config/zsh}/completions/"*.zsh; do
         [ -r "$file" ] && source "$file"
     done
-
 }
 
 function _dedup_zsh_plugins {
@@ -53,8 +53,8 @@ function _defer_omz_after_prompt_before_input() {
     fpath=($ZDOTDIR/completions "${fpath[@]}")
 
     _load_compinit
-
-    _load_common
+    _load_functions
+    _load_completions
 
     # zsh-autosuggestions won't work on first prompt when deferred
     if typeset -f _zsh_autosuggest_start >/dev/null; then
@@ -152,19 +152,18 @@ function _load_compinit() {
 
 function _load_prompt() {
     # Try to load prompts immediately
-    if ! source ${ZDOTDIR}/prompt.zsh >/dev/null 2>&1; then
+    if ! source ${ZDOTDIR}/prompt.zsh > /dev/null 2>&1; then
         [[ -f $ZDOTDIR/conf.d/hyde/prompt.zsh ]] && source $ZDOTDIR/conf.d/hyde/prompt.zsh
     fi
-
 }
 
-#? Override this environment variable in ~/.zshrc
+# Override this environment variable in ~/.zshrc
 # cleaning up home folder
 # ZSH Plugin Configuration
 
 HYDE_ZSH_DEFER="1"      #Unset this variable in $ZDOTDIR/user.zsh to disable HyDE's deferred Zsh loading.
 HYDE_ZSH_PROMPT="1"     #Unset this variable in $ZDOTDIR/user.zsh to disable HyDE's prompt customization.
-HYDE_ZSH_NO_PLUGINS="1" #Unset this variable in $ZDOTDIR/user.zsh to disable HyDE's deferred Zsh loading.
+HYDE_ZSH_NO_PLUGINS="0" #Set this variable to "1" in $ZDOTDIR/user.zsh to disable HyDE's Zsh plugin loading.
 
 ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
@@ -191,7 +190,8 @@ fi
 
 _load_compinit
 
-if [[ ${HYDE_ZSH_NO_PLUGINS} == "1" ]]; then
+
+if [[ ${HYDE_ZSH_NO_PLUGINS} != "1" ]]; then
     # Deduplicate omz plugins()
     _dedup_zsh_plugins
 
@@ -201,9 +201,16 @@ if [[ ${HYDE_ZSH_NO_PLUGINS} == "1" ]]; then
     else
         [[ -r $ZSH/oh-my-zsh.sh ]] && source $ZSH/oh-my-zsh.sh
         _load_prompt
-        _load_common
-
+        _load_functions
+        _load_completions
     fi
+else
+    _load_prompt
+    _load_functions
+    _load_completions
+
+    chmod +r $ZDOTDIR/.zshrc # Make sure .zshrc is readable
+    [[ -r $ZDOTDIR/.zshrc ]] && source $ZDOTDIR/.zshrc
 fi
 
 alias c='clear' \

Configs/.config/zsh/user.zsh

@@ -14,14 +14,16 @@ if [[ $- == *i* ]]; then
     fi
 fi
 
-#  Plugins 
-# manually add your oh-my-zsh plugins here
-plugins=(
-    "sudo"
-)
-
 #   Overrides 
-# unset HYDE_ZSH_NO_PLUGINS # Set to 1 to disable loading of oh-my-zsh plugins, useful if you want to use your zsh plugins system 
+# HYDE_ZSH_NO_PLUGINS=1 # Set to 1 to disable loading of oh-my-zsh plugins, useful if you want to use your zsh plugins system 
 # unset HYDE_ZSH_PROMPT # Uncomment to unset/disable loading of prompts from HyDE and let you load your own prompts
 # HYDE_ZSH_COMPINIT_CHECK=1 # Set 24 (hours) per compinit security check // lessens startup time
 # HYDE_ZSH_OMZ_DEFER=1 # Set to 1 to defer loading of oh-my-zsh plugins ONLY if prompt is already loaded
+
+if [[ ${HYDE_ZSH_NO_PLUGINS} != "1" ]]; then
+    #  OMZ Plugins 
+    # manually add your oh-my-zsh plugins here
+    plugins=(
+        "sudo"
+    )
+fi