Add support for different OS package managers; simplify some logic

install_programs

@@ -17,9 +17,7 @@ while [[ $# > 0 ]]; do
     shift
 done
 
-local script_dir=$(cd $(dirname "${ZSH_SOURCE[0]}") &> /dev/null && pwd)
-log "install_programs // script_dir: $script_dir -- args: $single_script_filter"
-cd $script_dir
+log "install_programs // single_script_filter: $single_script_filter"
 local scripts=(`find ./installs_and_builds -maxdepth 1 -mindepth 1 -type f`)
 for script in $scripts; do
     if [[ -x $script ]]; then

installs_and_builds/fzf

@@ -1,2 +1,2 @@
 #!/bin/zsh
-brew install fzf
+${=BOX_SETUP_INSTALL_COMMAND} fzf

installs_and_builds/git

@@ -1,2 +1,2 @@
 #!/bin/zsh
-brew install git
+${=BOX_SETUP_INSTALL_COMMAND} git

installs_and_builds/libs

@@ -3,4 +3,4 @@
 local lua_package="lua5.1"
 [[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
 
-$BOX_SETUP_INSTALL_COMMAND cmake gettext "$lua_package" liblua5.1-0-dev
+${=BOX_SETUP_INSTALL_COMMAND} cmake gettext "$lua_package" liblua5.1-0-dev

installs_and_builds/neovim

@@ -1,3 +1,3 @@
 #!/bin/zsh
 
-brew install neovim
+${=BOX_SETUP_INSTALL_COMMAND} neovim

installs_and_builds/neovim_from_source

@@ -9,7 +9,6 @@
 # git -C $neovim_dir fetch --all
 # git -C $neovim_dir checkout $neovim_version
 # 
-# 
 # make -C $neovim_dir clean
 # make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
 # sudo make -C $neovim_dir install

installs_and_builds/tmux

@@ -1,2 +1,2 @@
 #!/bin/zsh
-brew install tmux
+${=BOX_SETUP_INSTALL_COMMAND} tmux

installs_and_builds/utils

@@ -2,4 +2,4 @@
 
 # likely on unix systems already: find xargs grep sed awk
 
-brew install jq parallel
+${=BOX_SETUP_INSTALL_COMMAND} jq parallel

make_config_dirs

@@ -0,0 +1,7 @@
+#!/bin/zsh
+
+[[ ! -d $HOME/.config ]] && mkdir $HOME/.config
+[[ ! -d $HOME/.local ]] && mkdir $HOME/.local
+[[ ! -d $HOME/.local/bin ]] && mkdir $HOME/.local/bin
+[[ ! -d $HOME/.local/build ]] && mkdir $HOME/.local/build
+[[ ! -d $HOME/.local/tmp ]] && mkdir $HOME/.local/tmp

make_desired_dirs

@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+[[ ! -d $HOMEBOX ]] && mkdir $HOMEBOX
+[[ ! -d $DEVDIR ]] && mkdir $DEVDIR

post_config_01

@@ -1,8 +0,0 @@
-#!/bin/zsh
-
-mkdirs_after_setting_shell_env_vars() {
-    [[ ! -d $HOMEBOX ]] && mkdir $HOMEBOX
-    [[ ! -d $DEVDIR ]] && mkdir $DEVDIR
-}
-
-mkdirs_after_setting_shell_env_vars

pre_install_01

@@ -1,22 +0,0 @@
-#!/bin/zsh
-
-mkdirs_before_copying_config_files() {
-    [[ ! -d $HOME/.config ]] && mkdir $HOME/.config
-    [[ ! -d $HOME/.local ]] && mkdir $HOME/.local
-    [[ ! -d $HOME/.local/bin ]] && mkdir $HOME/.local/bin
-    [[ ! -d $HOME/.local/build ]] && mkdir $HOME/.local/build
-    [[ ! -d $HOME/.local/tmp ]] && mkdir $HOME/.local/tmp
-}
-
-[[ -z $BOX_SETUP_OS ]] && echo "BOX_SETUP_OS must be set" && exit 1
-
-local install_cmd=''
-case $BOX_SETUP_OS in
-    (arch | artix) install_cmd="sudo pacman -S" ;;
-    (debian) export install_cmd="sudo apt install" ;;
-    (macos) export install_cmd="brew install" ;;
-esac
-export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
-
-mkdirs_before_copying_config_files
-

set_env_vars

@@ -0,0 +1,9 @@
+[[ -z $BOX_SETUP_OS ]] && echo "BOX_SETUP_OS must be set" && exit 1
+
+local install_cmd=''
+case $BOX_SETUP_OS in
+    (arch | artix) install_cmd="sudo pacman -S" ;;
+    (debian) export install_cmd="sudo apt install" ;;
+    (macos) export install_cmd="brew install" ;;
+esac
+export BOX_SETUP_INSTALL_COMMAND="$install_cmd"

setup_this_box

@@ -0,0 +1,7 @@
+#!/bin/zsh
+
+source set_env_vars
+./install_programs
+./make_config_dirs
+./copy_configs
+./make_desired_dirs

src_files/.local/bin/.tmux-session-hydrate

@@ -1,5 +1,3 @@
-#!/bin/zsh
-
 local omitted_dirs=(
     $HOME
     $HOMEBOX
@@ -13,3 +11,11 @@ local omitted_dirs=(
 
 clear
 
+## example template for custom override
+# tmux new-window -d -n cmd
+# tmux send-keys -t :cmd "echo 'in cmd'" c-M
+# tmux new-window -d -n another
+# tmux send-keys -t :another "echo 'in another'" c-M
+# tmux rename-window $EDITOR
+# $EDITOR .
+# clear