ZSH: Add dot::defer cleanup system, simplify zshrc to dot::bootstrap

Author: jdevera

home/dot_config/zsh/exact_private_zsh.d/bootstrap.zsh

@@ -24,6 +24,7 @@ dot::timing::setup()
         ZSH_TIMES_FILE="/tmp/zshtimes.$$"
         echo -n > "$ZSH_TIMES_FILE"
     fi
+    dot::defer "dot::timing::teardown"
 }
 
 # Unset ZSH_TIME_STARTUP and ZSH_TIMES_FILE to leave the shell clean
@@ -37,6 +38,36 @@ dot::timing::teardown()
     done
 }
 
+# Deferred cleanup system {{{
+#
+# Register commands to run after all startup files have been sourced.
+# Deferred commands run in LIFO order (last registered, first executed).
+#
+# Usage (from any zsh.d/ file):
+#   dot::defer "unset _my_temp_var"
+#   dot::defer "unfunction _my_helper"
+#
+typeset -a _dot_deferred=()
+
+dot::defer()
+{
+    _dot_deferred+=("$1")
+}
+
+# Run all deferred commands in LIFO order, then clean up the defer
+# machinery itself.
+dot::run_deferred()
+{
+    local i
+    for (( i=${#_dot_deferred[@]}; i >= 1; i-- )); do
+        eval "${_dot_deferred[$i]}"
+    done
+    unset _dot_deferred
+    unfunction dot::defer
+    unfunction dot::run_deferred
+}
+# }}}
+
 dot::timing::timed_source()
 {
     local file before after
@@ -90,4 +121,12 @@ dot::source_zsh_d()
     dot::source_dir ~/.config/zsh/zsh.d
     dot::source_dir ~/.config/zsh/zsh.d/local/after
 }
+
+dot::bootstrap()
+{
+    dot::timing::setup
+    dot::defer "unfunction dot::source_file dot::source_dir dot::source_zsh_d dot::bootstrap"
+    dot::source_zsh_d
+    dot::run_deferred
+}
 # }}}

home/dot_config/zsh/exact_private_zsh.d/private_190_tool_fzf.zsh

@@ -0,0 +1,4 @@
+# Initialize fzf - fuzzy finder
+# https://github.com/junegunn/fzf
+
+[[ -f ~/.fzf.zsh ]] && source ~/.fzf.zsh

home/dot_zshrc

@@ -3,18 +3,8 @@
 # This is a thin loader: it sources the bootstrap which handles
 # the modular config under ~/.config/zsh/zsh.d/
 
-# Bootstrap config
-[[ -f ~/.config/zsh/zsh.d/bootstrap.zsh ]] && source ~/.config/zsh/zsh.d/bootstrap.zsh
-
-dot::timing::setup
-
-dot::source_zsh_d                 # Load all zsh.d files
-
-# Additional files that I generally want to source
-dot::source_file ~/.fzf.zsh
-
-# Timing teardown
-dot::timing::teardown
+source ~/.config/zsh/zsh.d/bootstrap.zsh
+dot::bootstrap
 
 # -----------------------------------------------------------------------------
 # This is where all sort of random commands will append their stuff