diff --git a/install_programs b/install_programs index 694911e..bcfa8c0 100755 --- a/install_programs +++ b/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 diff --git a/installs_and_builds/fzf b/installs_and_builds/fzf index 66d7c9c..5a8f595 100755 --- a/installs_and_builds/fzf +++ b/installs_and_builds/fzf @@ -1,2 +1,2 @@ #!/bin/zsh -brew install fzf +${=BOX_SETUP_INSTALL_COMMAND} fzf diff --git a/installs_and_builds/git b/installs_and_builds/git index d9f9c66..1e8a363 100755 --- a/installs_and_builds/git +++ b/installs_and_builds/git @@ -1,2 +1,2 @@ #!/bin/zsh -brew install git +${=BOX_SETUP_INSTALL_COMMAND} git diff --git a/installs_and_builds/libs b/installs_and_builds/libs index 9b47564..bd56596 100755 --- a/installs_and_builds/libs +++ b/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 diff --git a/installs_and_builds/neovim b/installs_and_builds/neovim index 4493acc..84f1954 100755 --- a/installs_and_builds/neovim +++ b/installs_and_builds/neovim @@ -1,3 +1,3 @@ #!/bin/zsh -brew install neovim +${=BOX_SETUP_INSTALL_COMMAND} neovim diff --git a/installs_and_builds/neovim_from_source b/installs_and_builds/neovim_from_source index a0c17d6..0fad5e6 100755 --- a/installs_and_builds/neovim_from_source +++ b/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 diff --git a/installs_and_builds/tmux b/installs_and_builds/tmux index d1b2e08..0c59dd4 100755 --- a/installs_and_builds/tmux +++ b/installs_and_builds/tmux @@ -1,2 +1,2 @@ #!/bin/zsh -brew install tmux +${=BOX_SETUP_INSTALL_COMMAND} tmux diff --git a/installs_and_builds/utils b/installs_and_builds/utils index fc6f600..e3ac3de 100755 --- a/installs_and_builds/utils +++ b/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 diff --git a/make_config_dirs b/make_config_dirs new file mode 100755 index 0000000..db34d3f --- /dev/null +++ b/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 diff --git a/make_desired_dirs b/make_desired_dirs new file mode 100755 index 0000000..7033756 --- /dev/null +++ b/make_desired_dirs @@ -0,0 +1,4 @@ +#!/bin/zsh + +[[ ! -d $HOMEBOX ]] && mkdir $HOMEBOX +[[ ! -d $DEVDIR ]] && mkdir $DEVDIR diff --git a/post_config_01 b/post_config_01 deleted file mode 100755 index 4b3f91c..0000000 --- a/post_config_01 +++ /dev/null @@ -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 diff --git a/pre_install_01 b/pre_install_01 deleted file mode 100755 index c6f3718..0000000 --- a/pre_install_01 +++ /dev/null @@ -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 - diff --git a/set_env_vars b/set_env_vars new file mode 100644 index 0000000..c4eddd2 --- /dev/null +++ b/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" diff --git a/setup_this_box b/setup_this_box new file mode 100755 index 0000000..ba073cf --- /dev/null +++ b/setup_this_box @@ -0,0 +1,7 @@ +#!/bin/zsh + +source set_env_vars +./install_programs +./make_config_dirs +./copy_configs +./make_desired_dirs diff --git a/src_files/.local/bin/.tmux-session-hydrate b/src_files/.local/bin/.tmux-session-hydrate index 6e59d92..4a376c7 100644 --- a/src_files/.local/bin/.tmux-session-hydrate +++ b/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