5 files changed, 105 insertions, 36 deletions
diff --git a/mac/.config/htop/htoprc b/mac/.config/htop/htoprc
new file mode 100644
index 0000000..8666417
--- /dev/null
+++ b/mac/.config/htop/htoprc
@@ -0,0 +1,53 @@
+# Beware! This file is rewritten by htop when settings are changed in the interface.
+# The parser is also very primitive, and not human-friendly.
+.all_branches_collapsed=0
+.sort_direction=-1
+.sort_key=PERCENT_CPU
+.tree_sort_direction=1
+.tree_sort_key=PID
+.tree_view=0
+.tree_view_always_by_pid=0
+account_guest_in_cpu_meter=0
+all_branches_collapsed=0
+color_scheme=5
+column_meter_modes_0=1 1 1 2 2 2 1
+column_meter_modes_1=
+column_meters_0=LeftCPUs Memory Swap Uptime LoadAverage Tasks RightCPUs
+column_meters_1=
+config_reader_min_version=3
+cpu_count_from_one=0
+delay=15
+detailed_cpu_time=0
+enable_mouse=1
+fields=0 48 17 18 38 39 2 46 46 47 49 1
+find_comm_in_cmdline=1
+header_layout=two_50_50
+header_margin=1
+hide_function_bar=0
+hide_kernel_threads=1
+hide_running_in_container=0
+hide_userland_threads=0
+highlight_base_name=1
+highlight_changes=1
+highlight_changes_delay_secs=1
+highlight_deleted_exe=1
+highlight_megabytes=1
+highlight_threads=1
+htop_version=3.3.0-dev
+screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command
+screen_tabs=1
+shadow_distribution_path_prefix=0
+shadow_other_users=1
+show_cpu_frequency=1
+show_cpu_usage=1
+show_merged_command=0
+show_program_path=1
+show_thread_names=0
+sort_direction=-1
+sort_key=46
+strip_exe_from_cmdline=1
+tree_sort_direction=1
+tree_sort_key=0
+tree_view=0
+tree_view_always_by_pid=0
+update_process_names=0
diff --git a/mac/.config/shell/profile b/mac/.config/shell/profile
index da5b702..3e1ca79 100644
--- a/mac/.config/shell/profile
+++ b/mac/.config/shell/profile
@@ -137,6 +137,12 @@ export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
 ### --- MOZILLA --- ###
 export MOZ_USE_XINPUT2=1 # Mozilla smooth scrolling/touchpads.
 
+### --- MYSQL --- ###
+export MYSQL_HISTFILE="$XDG_DATA_HOME/history/mysql_history"
+
+### --- NODE.JS --- ###
+export NODE_REPL_HISTORY="$XDG_DATA_HOME/history/node_repl_history"
+
 ### --- NOTMUCH --- ###
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config"
 
@@ -161,11 +167,21 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS="true"
 # export PASSWORD_STORE_EXTENSIONS_DIR="$PASSWORD_STORE_DIR/.extensions"
 # export BASH_COMPLETION_USER_DIR=$XDG_DATA_HOME/bash-completion/completions
 
+### --- PHP --- ###
+export PHP_HISTFILE="$XDG_STATE_HOME/history/php_history"
+
+### --- POSTGRESQL --- ###
+export PSQLRC="$XDG_CONFIG_HOME/pg/psqlrc"
+export PSQL_HISTORY="$XDG_STATE_HOME/history/psql_history"
+export PGPASSFILE="$XDG_CONFIG_HOME/pg/pgpass"
+export PGSERVICEFILE="$XDG_CONFIG_HOME/pg/pg_service.conf"
+
 ### --- POWERLEVEL10K --- ###
 export POWERLEVEL9K_INSTALLATION_DIR="/usr/share/zsh-theme-powerlevel10k"
 
 ### --- PYTHON --- ###
-export PYTHONPYCACHEPREFIX=$XDG_CACHE_HOME/python
+export PYTHON_HISTORY="$XDG_DATA_HOME/history/python_history"
+export PYTHONPYCACHEPREFIX="$XDG_CACHE_HOME/python"
 export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc"
 export PIPX_BIN_DIR="$XDG_SCRIPTS_HOME"
 export PIPX_MAN_DIR="$XDG_DATA_HOME/man"
@@ -229,13 +245,13 @@ export SDCV_PAGER='less --quit-if-one-screen -RX'
 ### --- ENV PATH --- ###
 ###################################################
 # Add all directories in each subdirectory to $PATH
-export PATH="$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -):$PATH"
-export PATH="$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -):$PATH"
+[ -d ~/.local/bin ] && export PATH="$(find ~/.local/bin -path '*/.git*' -prune -o \( -type f -o -type l \) -perm -u=x -exec dirname {} \; | sort -u | paste -sd ':' -):$PATH"
+[ -d ~/.local/share/.password-store ] && export PATH="$(find ~/.local/share/.password-store -type d -name '.extensions' | paste -sd ':' -):$PATH"
 export PATH="$ASDF_DATA_DIR/shims:$PATH"
 export PATH="/opt/homebrew/bin:$PATH"
-export PATH="$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
-export PATH="$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
-export PATH="$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
+[ -d /opt/homebrew/Caskroom ] && export PATH="$(find -L /opt/homebrew/Caskroom \( -name bin -o -name MacOS \) -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
+[ -d /opt/homebrew/Cellar ] && export PATH="$(find -L /opt/homebrew/Cellar -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
+[ -d /opt/homebrew/opt ] && export PATH="$(find -L /opt/homebrew/opt -name bin -type d -print 2>/dev/null | sort -u | paste -s -d ':' -):$PATH"
 
 unsetopt PROMPT_SP 2>/dev/null
 
diff --git a/mac/.config/vim/vimrc b/mac/.config/vim/vimrc
index 0a76953..a782a14 100644
--- a/mac/.config/vim/vimrc
+++ b/mac/.config/vim/vimrc
@@ -335,8 +335,8 @@ set nocursorcolumn
 set shiftwidth=4
 set tabstop=4
 
-" If the current file type is HTML, set indentation to 2 spaces.
-autocmd Filetype html setlocal tabstop=2 shiftwidth=2 expandtab
+" If the current file type is HTML, CSS, JS, JSX, TS, TSX set indentation to 2 spaces.
+autocmd Filetype html,css,js,jsx,ts,tsx setlocal tabstop=2 shiftwidth=2 expandtab
 
 " Do not save backup files.
 set nobackup
diff --git a/mac/.local/bin/fzffiles b/mac/.local/bin/fzffiles
index 44634a2..97047e9 100755
--- a/mac/.local/bin/fzffiles
+++ b/mac/.local/bin/fzffiles
@@ -53,7 +53,7 @@ files=$(fzf-tmux \
   --bind "ctrl-g:change-prompt(   )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . $HOME/Private/repos $HOME/Public/repos)" \
   --bind "ctrl-h:change-prompt( 🏠 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . $HOME)" \
   --bind "ctrl-k:change-prompt( 🖥️ )+reload(fd -H -L -t f -E .Trash -E .git -E .cache . ${XDG_DESKTOP_DIR:-${HOME}/Desktop})" \
-  --bind "ctrl-r:change-prompt( 👟 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache -E zsh . ${XDG_BIN_HOME:-${HOME}/.local/bin})" \
+  --bind "ctrl-r:change-prompt( 👟 )+reload(fd -H -L -t f -E .Trash -E .git -E .cache -E zsh . ${XDG_SCRIPTS_HOME:-${HOME}/.local/bin})" \
   --bind "ctrl-s:change-prompt( 🛠  )+reload(find ${XDG_SOURCES_HOME:-${HOME}/.local/src}/suckless -maxdepth 2 -type f -not -path '*/.git/*')" \
   --bind "ctrl-u:change-prompt( 📝 )+reload(if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then top=\$(git rev-parse --show-toplevel 2>/dev/null); git -C \"\$top\" status --porcelain | awk -v root=\"\$top\" '{
     staged=substr(\$0,1,1);
diff --git a/mac/.local/bin/hugow b/mac/.local/bin/hugow
index 0460174..e9113a0 100755
--- a/mac/.local/bin/hugow
+++ b/mac/.local/bin/hugow
@@ -18,33 +18,33 @@ fi
 
 tmp="$(mktemp "$out.XXXXXXXX.tmp")"
 
-awk -v defaults="$defaults" '
-BEGIN {
-  n = split(defaults, a, /[[:space:]]+/)
-  insert = ""
-  for (i = 1; i <= n; i++) {
-    if (a[i] == "") continue
-    name = a[i] ".mp4"
-    insert = insert \
-"  <li>\n" \
-"    <a href=\"/recordings/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
-"  </li>\n"
-  }
-  injected = 0
-}
-{
-  print
-  if (!injected && $0 ~ /<ul[^>]*id=["'\''"]list["'\''"][^>]*>/) {
-    printf("%s", insert)
-    injected = 1
-  }
-}
-END { if (!injected) exit 2 }
-' "$out" >"$tmp"
-
-mv "$tmp" "$out"
-echo "Injected defaults into: $out"
-
+# awk -v defaults="$defaults" '
+# BEGIN {
+#   n = split(defaults, a, /[[:space:]]+/)
+#   insert = ""
+#   for (i = 1; i <= n; i++) {
+#     if (a[i] == "") continue
+#     name = a[i] ".mp4"
+#     insert = insert \
+# "  <li>\n" \
+# "    <a href=\"/recordings/" name "\" data-name=\"" name "\" class=\"vid\">" name "</a>\n" \
+# "  </li>\n"
+#   }
+#   injected = 0
+# }
+# {
+#   print
+#   if (!injected && $0 ~ /<ul[^>]*id=["'\''"]list["'\''"][^>]*>/) {
+#     printf("%s", insert)
+#     injected = 1
+#   }
+# }
+# END { if (!injected) exit 2 }
+# ' "$out" >"$tmp"
+#
+# mv "$tmp" "$out"
+# echo "Injected defaults into: $out"
+#
 ssh "$server" "mkdir -p '$dest'"
 
 if [ -n "${THESIAH_SSH_OPTS:-}" ]; then