Add partial config for music streaming player (ncspot)

Fix some asdf issues
small settings/keybindings updates for tmux, vim, zsh
2025-08-15 17:05:18 -05:00 · 2025-08-15 17:05:18 -05:00 · 2025-08-15 17:05:12 -05:00 · 2025-08-04 09:08:46 +02:00
94 changed files with 529 additions and 2073 deletions
--- a/README.md
+++ b/README.md
@@ -1,33 +1,53 @@
-# dotfiles, plus scripts for box setup
-
-### prereqs
- zsh and git installed
- git clone this repo
-
-#### specific prereqs, linux distros
- sudo access is configured for current user
-
-#### specific prereqs, macos
- install the package manager, [homebrew](https://brew.sh/)
- for aerospace window manager, have only 1 workspace/desktop
- manual settings, refer to [ref/macos-system-settings](ref/macos-system-settings.txt)
+# repo containing configs and scripts to set up a box

 ### script run
- to do the full setup, from git root dir, run: `./box_setup.sh`
- to copy dotfiles only, from git root dir, run: `./copy_dotfiles.sh`
+- [prerequisites below are fulfilled]
+- git clone this repo
+- from the repo's root directory, run `./box_setup`

-### after script run
- complete manual actions specified in [ref/post-run](ref/post-run.md)
+### prerequisites
+- package manager is configured (i.e. source repos, mirrors, etc. configured)
+- zsh is installed (scripts are written for zsh)
+- sudo access is configured for current user (2025-01-27, not needed on macos)
+- export the env var `BOX_SETUP_OS` to indicate the operating system
+    - options defined in `set_script_env_vars` file
+- system-specific items below are fulfilled

------------------------------------------------------------------------------------------
+##### prereqs, os specific, linux-placeholder
+- (currently none)
+
+##### prereqs, os specific, macos
+- install the package manager, [homebrew](https://brew.sh/)
+- for yabai window manager (so as to not mess with SIP settings)
+    - create 9 spaces/desktops
+    - system settings > keyboard shortcuts: set keys to switch between spaces/desktops
+    - system settings > desktop/dock/mission-control:
+        - `click wallpaper to reveal desktop`: set to "only in stage manager"
+        - all `drag windows to corner/edge/place` types of options: disabled
+        - `rearrange spaces based on recent use`: disabled
+        - `when switch to app... switch to space with open windows of app`: disabled
+        - `displays have separate spaces`: enabled
+        - `show files on desktop`: enabled

 ### todo items
- choose window manager for linux, then configure
- config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv
- decide on docker? or alternatives like podman? any license concerns?
- switch installation approach, use csv file with programs to install, install types,
-  any extra flags/opts, comments
-    - regarding the system-types idea i'd started to build in already, maybe have a
-      column for filtering in the csv file, or just have multiple csv files corresponding
-      to a base/core install, a music-studio install, a employer/work machine, etc.
- add command in tmux to perform cd to a given dir in all windows of the current session
+- add logic to the main run script to handle cloning of this repo
+- add logic to the main run script to set `BOX_SETUP_OS` var, either input param or detect
+- config for nvim
+- config for mpd, mpc, ncmpcpp
+- config for ghostty
+- config for mpv
+    - also, on macos, get it to open within terminal or just don't install it
+- config for gimp, `src_files/.config/GIMP` (dir)
+    - set things in gtkrc only? still need to nest that within a sub dir?
+    - or maybe just configure in gimp's gui, copy the whole resulting dir into
+      `src_files/.config/GIMP` (edit out and delete what i don't need) and call it a day
+- for whatever is causing it, editor/terminal/other, git rid of ligatures/name?
+    - for example, `>=` is two chars (`>` then `=`), not one char/symbol
+- decide on window manager for linux, then do config
+- look into xquartz for macos (x/xorg emulation or something?)
+- build in flags/logic for skipping certain installs/builds (and maybe configs?) on a
+    given system (i.e. don't install on a company box, on a server, etc.)
+- decide on and implement approach for languages and versioning
+    - docker? or alternatives like podman? any license concerns?
+    - asdf, or language-specific version managers?
+    - hybrid of the above?
--- a/9
+++ b/9
@@ -0,0 +1,9 @@
+#!/bin/zsh
+
+source set_script_env_vars
+source ./src_files/.config/zsh/.zshenv
+./make_config_dirs
+./copy_configs
+source $ZDOTDIR/.zshenv ; source $ZDOTDIR/.zshrc
+./make_org_structure_dirs
+./install_programs # TODO: moved this to after config copy, but does this work?
--- a/box_setup.sh
+++ b/box_setup.sh
@@ -1,58 +0,0 @@
-#!/bin/zsh
-
-[[ $1 = "--help" ]] && {
-    echo "\nusage: ./box_setup.sh [system-type]"
-    echo "\nsystem-type options: personal, studio-music, work-placeholder"
-    echo "\nexamples:\n    ./box_setup.sh\n    ./box_setup.sh studio-music\n"
-    exit 0
-}
-
-# determine OS and, if linux, distro
-[[ "$OSTYPE" = *"darwin"* ]] && setup_os="macos" || {
-    [[ "$OSTYPE" = *"linux"* ]] && setup_os="linux" && {
-        [[ -f /etc/os-release ]] && . /etc/os-release
-        setup_distro=$(echo "${NAME%% *}" | tr '[:upper:]' '[:lower:]')
-        [[ -z "$setup_distro" ]] && echo "OS: linux; distro not detected" && exit 1
-    }
-}
-[[ -z "$setup_os" ]] && echo "OS not detected" && exit 1
-
-# set package manager commands for installs
-[[ "$setup_os" = "macos" ]] && {
-    install_cmd="brew install"
-    update_pkg_manager_and_defs_cmd='brew update'
-    update_pkgs_cmd='brew upgrade'
-} || {
-    [[ "$setup_os" = "linux" ]] && {
-        case $setup_distro in
-            (arch | artix)
-                install_cmd="sudo pacman -S"
-                update_pkg_manager_and_defs_cmd='' # don't; update system instead?
-                update_pkgs_cmd='sudo pacman -Syu'
-        	;;
-            (debian)
-                install_cmd="sudo apt install"
-                update_pkg_manager_and_defs_cmd='sudo apt update'
-                update_pkgs_cmd='sudo apt upgrade'
-        	;;
-        esac
-    }
-}
-
-# export vars for scripts
-export BOX_SETUP_OS="$setup_os"
-export BOX_SETUP_DISTRO="$setup_distro"
-export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
-export BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD="$update_pkg_manager_and_defs_cmd"
-export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
-
-# make dirs and copy configs/dotfiles
-source ./src_files/.config/zsh/.zshenv
-./make_dirs.sh
-./copy_dotfiles.sh $1
-
-# install programs
-source $ZDOTDIR/.zshenv
-source $ZDOTDIR/.zshrc
-./install_programs.sh $1
-
--- a/52
+++ b/52
@@ -0,0 +1,52 @@
+#!/bin/zsh
+
+execute() { log "execute $@" && "$@" }
+log() { echo "$@" }
+
+copy_file() {
+    local from=$1
+    local to=$2
+    local filename=$(basename $from)
+    [[ -e $to/$filename ]] && execute rm $to/$filename
+    execute cp -p $from $to/$filename
+}
+
+copy_dir() {
+    local from=$1
+    local to=$2
+    pushd $from > /dev/null
+    local directories=(`find . -mindepth 1 -maxdepth 1 -type d`)
+    for dir in $directories; do
+        [[ -d $to/$dir ]] && execute rm -rf $to/$dir
+        execute cp -rp $dir $to/$dir
+    done
+    local files=(`find . -mindepth 1 -maxdepth 1 -type f`)
+    for file in $files; do
+        copy_file $file $to
+    done
+    popd > /dev/null
+}
+
+link_dir() {
+    local src_dir=$1
+    local link_dir=$2
+    log "deleting existing link/dir: $link_dir"
+    [[ -h "$link_dir" ]] && rm $link_dir
+    [[ -d "$link_dir" ]] && rm -rf $link_dir
+    log "sym-linking $link_dir -> $src_dir"
+    ln -s $src_dir $link_dir
+}
+
+log "---------------- dotfiles ----------------"
+
+copy_file src_files/.config/zsh/.zshenv $HOME # duplicate, copy anyway, ensures $ZDOTDIR
+
+copy_dir src_files/.config $XDG_CONFIG_HOME
+copy_dir src_files/.local/bin $DIR_BIN
+copy_dir src_files/.local/scripts $DIR_SCRIPTS
+
+# on macos, gimp defaults to app-support, so sym-link to actual config
+[[ "$BOX_SETUP_OS" = "macos" ]] &&
+    link_dir "$XDG_CONFIG_HOME/GIMP" "$HOME/Library/Application Support/GIMP"
+link_dir "$XDG_CONFIG_HOME/vim" "$HOME/.vim" # TODO: use vim wrapper or similar instead
+
--- a/copy_dotfiles.sh
+++ b/copy_dotfiles.sh
@@ -1,55 +0,0 @@
-#!/bin/zsh
-
-echo_and_execute() { echo "executing: $@" && "$@" }
-
-copy_file() {
-    local from=$1
-    local to=$2
-    local filename=$(basename $from)
-    [[ -e $to/$filename ]] && rm $to/$filename
-    echo_and_execute cp -p $from $to/$filename
-}
-
-copy_dir() {
-    local from=$1
-    local to=$2
-    pushd $from > /dev/null
-    local directories=(`find . -mindepth 1 -maxdepth 1 -type d`)
-    for dir in $directories; do
-        [[ -d $to/$dir ]] && rm -rf $to/$dir
-        echo_and_execute cp -rp $dir $to/$dir
-    done
-    local files=(`find . -mindepth 1 -maxdepth 1 -type f`)
-    for file in $files; do
-        copy_file $file $to
-    done
-    popd > /dev/null
-}
-
-link_dir() {
-    local src_dir=$1
-    local link_dir=$2
-    [[ -h "$link_dir" ]] && rm $link_dir
-    [[ -d "$link_dir" ]] && rm -rf $link_dir
-    echo_and_execute ln -s $src_dir $link_dir
-}
-
-echo "---- copying dotfiles ------------------------------------------------"
-
-copy_file src_files/.config/zsh/.zshenv $HOME # duplicate, copy anyway, ensures $ZDOTDIR
-
-copy_dir src_files/.config $XDG_CONFIG_HOME
-copy_dir src_files/.local/bin $DIR_BIN
-[[ "$OSTYPE" = *"darwin"* ]] && copy_dir src_files/bin_overrides_macos $DIR_BIN
-copy_dir src_files/.local/scripts $DIR_SCRIPTS
-
-for obs_dir in "${OBSIDIAN_WORKSPACES_TO_CONFIGURE[@]}"; do
-    [[ ! -d "$obs_dir/.obsidian" ]] && mkdir "$obs_dir/.obsidian"
-    copy_dir $XDG_CONFIG_HOME/obsidian "$obs_dir/.obsidian"
-done
-
-# [[ $1 = "studio-music" ]] {
-#     [[ "$OSTYPE" = *"darwin"* ]] &&
-#         link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" # TODO: get reaper config set up
-# }
-
--- a/31
+++ b/31
@@ -0,0 +1,31 @@
+#!/bin/zsh
+
+local single_script_filter=""
+local dry="0"
+
+execute() {
+    log "execute $@"
+    [[ $dry != "1" ]] && "$@"
+}
+
+log() {
+    [[ $dry != "1" ]] && echo "$@" || echo "[DRY RUN]: $@"
+}
+
+while [[ $# > 0 ]]; do
+    [[ $1 == "--dry" ]] && dry="1" || single_script_filter="$1"
+    shift
+done
+
+log "install_programs // single_script_filter: $single_script_filter"
+local scripts=$(find ./installs_and_builds -maxdepth 1 -mindepth 1 -type f | sort)
+for script in ${=scripts}; do
+    if [[ -x $script ]]; then
+        if echo "$script" | grep -qv "$single_script_filter"; then
+            log "filter is $single_script_filter // ignoring: $script"
+            continue
+        fi
+        execute ./$script
+    fi
+done
+
--- a/install_programs.sh
+++ b/install_programs.sh
@@ -1,34 +0,0 @@
-#!/bin/zsh
-
-find_scripts_in_dir() {
-    echo $(find $1 -maxdepth 1 -mindepth 1 -type f | sort)
-}
-
-install_scripts_from_list() {
-    for script in $@; do
-        if [[ -x $script ]]; then
-            echo "executing: $script"
-            ./$script
-        fi
-    done
-}
-
-system_types_list="base"
-scripts_from_dir=($(find_scripts_in_dir "./installs_and_builds"))
-[[ $1 = "personal" ]] && {
-    system_types_list+=", personal"
-    scripts_from_dir+=($(find_scripts_in_dir "./installs_and_builds/personal"))
-}
-[[ $1 = "studio-music" ]] && {
-    system_types_list+=", studio-music"
-    scripts_from_dir+=($(find_scripts_in_dir "./installs_and_builds/studio_music"))
-}
-[[ $1 = "work-placeholder" ]] && {
-    system_types_list+=", work-placeholder"
-    scripts_from_dir+=($(find_scripts_in_dir "./installs_and_builds/work_placeholder"))
-}
-
-echo "---- installing programs ---------------------------------------------"
-echo "-------- for system types: $system_types_list"
-install_scripts_from_list "${scripts_from_dir[@]}"
-
--- a/installs_and_builds/manual_runs/s99_neovim_from_source
+++ b/installs_and_builds/manual_runs/s99_neovim_from_source
@@ -1,17 +1,17 @@
 #!/bin/zsh

-install_neovim_dir=$HOME/.local/build/neovim
-install_neovim_version="v0.10.3"
-[ ! -z $NVIM_VERSION ] && install_neovim_version="$NVIM_VERSION"
-echo "install_neovim_version: \"$install_neovim_version\""
+local neovim_dir=$HOME/.local/build/neovim
+local neovim_version="v0.10.3"
+[ ! -z $NVIM_VERSION ] && neovim_version="$NVIM_VERSION"
+echo "neovim_version: \"$neovim_version\""

-[ ! -d $install_neovim_dir ] && git clone https://github.com/neovim/neovim.git $install_neovim_dir
-git -C $install_neovim_dir fetch --all
-git -C $install_neovim_dir checkout $install_neovim_version
+[ ! -d $neovim_dir ] && git clone https://github.com/neovim/neovim.git $neovim_dir
+git -C $neovim_dir fetch --all
+git -C $neovim_dir checkout $neovim_version

-make -C $install_neovim_dir clean
-make -C $install_neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
-sudo make -C $install_neovim_dir install
+make -C $neovim_dir clean
+make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
+sudo make -C $neovim_dir install

 # from primeagen's dev repo, uncomment/edit as needed
 # git clone https://github.com/ThePrimeagen/harpoon.git $HOME/personal/harpoon
--- a/installs_and_builds/s02_utils
+++ b/installs_and_builds/s02_utils
@@ -8,20 +8,7 @@ ${=BOX_SETUP_INSTALL_COMMAND} \
    fzf \
    make \
    cmake \
-    gettext \
-    grep \
-    ripgrep
-
-utils_package_name_pandoc="pandoc"
-case $BOX_SETUP_DISTRO in
-    (arch | alpine)
-        utils_package_name_pandoc="pandoc-cli"
-        ;;
-    (artix)
-        utils_package_name_pandoc="pandoc-bin"
-        ;;
-esac
-${=BOX_SETUP_INSTALL_COMMAND} $utils_package_name_pandoc
+    gettext

 [[ "$BOX_SETUP_OS" = "macos" ]] &&
-    ${=BOX_SETUP_INSTALL_COMMAND} coreutils findutils
+    ${=BOX_SETUP_INSTALL_COMMAND} coreutils
--- a/installs_and_builds/s04_terminal
+++ b/installs_and_builds/s04_terminal
@@ -1,6 +1,6 @@
 #!/bin/zsh

-install_option_prefix=''
-[[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
+local option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
 # NOTE: ghostty not currently in debian repos, maybe build from source
-${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" ghostty
+${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" ghostty
--- a/installs_and_builds/s06_window_manager
+++ b/installs_and_builds/s06_window_manager
@@ -1,18 +1,18 @@
 #!/bin/zsh

-linux_wm_and_utils() {
+local linux_wm_and_utils() {
    # TODO: pick wm for linux; options: dwm, i3, others?
    echo "linux_wm_and_utils not yet implemented"
 }

-macos_wm_and_utils() {
+local macos_wm_and_utils() {
+    brew install koekeishiya/formulae/yabai
    brew install koekeishiya/formulae/skhd
    skhd --start-service
+    yabai --start-service
    sleep 14 # time to give permission in accessibility settings
    skhd --restart-service
-
-    # NOTE: currently, aerospace seems to need system restart to take effect
-    brew install --cask nikitabobko/tap/aerospace
+    yabai --restart-service
 }

 [[ "$BOX_SETUP_OS" = "macos" ]] && macos_wm_and_utils || linux_wm_and_utils
--- a/installs_and_builds/s12_web_browser
+++ b/installs_and_builds/s12_web_browser
@@ -1,10 +1,7 @@
 #!/bin/zsh

-# TODO: get browser config and install set up
-# current idea: qutebrowser for general, tor for sensitive, brave as a backup option
-
-# install_option_prefix=''
-# [[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
-# firefox_package_name='firefox'
-# [[ "$BOX_SETUP_DISTRO" = "debian" ]] && firefox_package_name='firefox-esr'
-# ${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" "$firefox_package_name"
+local option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
+local firefox_package_name='firefox'
+[[ "$BOX_SETUP_OS" = "debian" ]] && firefox_package_name='firefox-esr'
+${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" "$firefox_package_name"
--- a/installs_and_builds/s18_file_manager
+++ b/installs_and_builds/s18_file_manager
@@ -1,4 +1,4 @@
 #!/bin/zsh

-# TODO: do i even want a filemanager? if yes, pick one; consider: lf, ranger, others?
+# TODO: pick filemanager; consider: lf, ranger, others?
 # ${=BOX_SETUP_INSTALL_COMMAND} zxcv-placeholder
--- a/installs_and_builds/s20_audio_editor
+++ b/installs_and_builds/s20_audio_editor
@@ -1,6 +1,6 @@
 #!/bin/zsh

 # only audio editor(s) in this file; daws are handled separately
-install_option_prefix=''
-[[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
-${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" audacity
+local option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
+${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" audacity
--- a/installs_and_builds/s22_image_editor
+++ b/installs_and_builds/s22_image_editor
@@ -1,7 +1,7 @@
 #!/bin/zsh

-install_option_prefix=''
-[[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
-${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" gimp
+local option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
+${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" gimp

 # ${=BOX_SETUP_INSTALL_COMMAND} imagemagick # TODO: consider this program too
--- a/installs_and_builds/s31_docker
+++ b/installs_and_builds/s31_docker
@@ -7,7 +7,15 @@ setup_docker_on_debian() {
    echo "setup_docker_on_debian function not implemented"
 }

-# TODO: decide on docker vs others
-[[ "$BOX_SETUP_DISTRO" = "debian" ]] && setup_docker_on_debian || {
-    ${=BOX_SETUP_INSTALL_COMMAND} docker
-}
+# TODO: decide on docker vs others; below is included just for reference
+# case $BOX_SETUP_OS in
+#     (arch | artix)
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+#     (debian)
+#         setup_docker_on_debian
+#         ;;
+#     (macos)
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+# esac
--- a/installs_and_builds/s49_languages_general
+++ b/installs_and_builds/s49_languages_general
@@ -1,13 +1,10 @@
 #!/bin/zsh

-[[ "$BOX_SETUP_OS" != "macos" ]] && {
-    ${=BOX_SETUP_INSTALL_COMMAND} gcc g++ clang clang++
-}
-
 # TODO: review and decide if the things below are needed
-# install_lua_package="lua5.1"
-#[[ "$BOX_SETUP_OS" = "macos" ]] && install_lua_package="lua@5.1"
-#${=BOX_SETUP_INSTALL_COMMAND} "$install_lua_package" liblua5.1-0-dev

-# TODO: do i want to install luarocks? lazy.nvim plugin manager currently expects it
+#local lua_package="lua5.1"
+#[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
+
+#${=BOX_SETUP_INSTALL_COMMAND} "$lua_package" liblua5.1-0-dev
+
 #luarocks install luacheck
--- a/14
+++ b/14
@@ -0,0 +1,14 @@
+#!/bin/zsh
+
+source ./src_files/.config/zsh/.zshenv # source these vars for use below
+
+[[ ! -d "$DIR_LOCAL" ]] && mkdir "$DIR_LOCAL"
+[[ ! -d "$DIR_BIN" ]] && mkdir "$DIR_BIN"
+[[ ! -d "$DIR_BUILD" ]] && mkdir "$DIR_BUILD"
+[[ ! -d "$DIR_SCRIPTS" ]] && mkdir "$DIR_SCRIPTS"
+[[ ! -d "$DIR_TMP" ]] && mkdir "$DIR_TMP"
+
+[[ ! -d "$XDG_CONFIG_HOME" ]] && mkdir "$XDG_CONFIG_HOME"
+[[ ! -d "$XDG_CACHE_HOME" ]] && mkdir "$XDG_CACHE_HOME"
+[[ ! -d "$XDG_DATA_HOME" ]] && mkdir "$XDG_DATA_HOME"
+[[ ! -d "$XDG_STATE_HOME" ]] && mkdir "$XDG_STATE_HOME"
--- a/make_dirs.sh
+++ b/make_dirs.sh
@@ -1,31 +0,0 @@
-#!/bin/zsh
-
-source ./src_files/.config/zsh/.zshenv # ensure env vars set for use below
-
-# some standard/common directories, some overlap/use in XDG directories
-[[ ! -d "$DIR_LOCAL" ]] && mkdir -p "$DIR_LOCAL"
-[[ ! -d "$DIR_BIN" ]] && mkdir -p "$DIR_BIN"
-[[ ! -d "$DIR_SCRIPTS" ]] && mkdir -p "$DIR_SCRIPTS"
-[[ ! -d "$DIR_TMP" ]] && mkdir -p "$DIR_TMP"
-[[ ! -d "$DIR_USER_OPT" ]] && mkdir -p "$DIR_USER_OPT"
-[[ ! -d "$DIR_USER_LIB" ]] && mkdir -p "$DIR_USER_LIB"
-
-# directories related to XDG Base Directory specification
-[[ ! -d "$XDG_CONFIG_HOME" ]] && mkdir -p "$XDG_CONFIG_HOME"
-[[ ! -d "$XDG_CACHE_HOME" ]] && mkdir -p "$XDG_CACHE_HOME"
-[[ ! -d "$XDG_DATA_HOME" ]] && mkdir -p "$XDG_DATA_HOME"
-[[ ! -d "$XDG_STATE_HOME" ]] && mkdir -p "$XDG_STATE_HOME"
-
-# additional directories for how i'm organizing my system
-[[ ! -d "$DIR_HOME_BOX" ]] && mkdir -p $DIR_HOME_BOX
-[[ ! -d "$DIR_MUSIC" ]] && mkdir -p $DIR_MUSIC
-[[ ! -d "$DIR_NOTES" ]] && mkdir -p $DIR_NOTES
-[[ ! -d "$DIR_DEV" ]] && mkdir -p $DIR_DEV
-[[ ! -d "$DIR_GIT_PROJECTS" ]] && mkdir -p $DIR_GIT_PROJECTS
-[[ ! -d "$DIR_GIT_PROJECTS/me" ]] && mkdir -p $DIR_DEV/git/me
-[[ ! -d "$DIR_GIT_PROJECTS/other" ]] && mkdir -p $DIR_DEV/git/other
-
-# directories for music/audio production
-[[ ! -d "$DIR_REAPER_PORTABLE_SHARED" ]] && mkdir -p $DIR_REAPER_PORTABLE_SHARED
-[[ ! -d "$DIR_REAPER_PORTABLE_LINUX" ]] && mkdir -p $DIR_REAPER_PORTABLE_LINUX
-[[ ! -d "$DIR_REAPER_PORTABLE_MACOS" ]] && mkdir -p $DIR_REAPER_PORTABLE_MACOS
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+#!/bin/zsh
+
+[[ ! -d "$DIR_HOME_BOX" ]] && mkdir $DIR_HOME_BOX
+
+[[ ! -d "$DIR_DEV" ]] && mkdir $DIR_DEV
+[[ ! -d "$DIR_DEV/git" ]] && mkdir $DIR_DEV/git
+[[ ! -d "$DIR_DEV/git/me" ]] && mkdir $DIR_DEV/git/me
+[[ ! -d "$DIR_DEV/git/other" ]] && mkdir $DIR_DEV/git/other
--- a/ref/macos-system-settings.txt
+++ b/ref/macos-system-settings.txt
@@ -1,14 +0,0 @@
-// settings for manual configuration in macOS system settings app
-// NOTE: some of these could be scripted, but for now i'm okay with this manual list
-
- desktop/dock/mission-control:
-    - `click wallpaper to reveal desktop`: set to "only in stage manager"
-    - all `drag windows to corner/edge/place` types of options: disabled
-    - `rearrange spaces based on recent use`: disabled
-    - `when switch to app... switch to space with open windows of app`: disabled
-    - `displays have separate spaces`: disabled
-    - `show files on desktop`: enabled
-    - `group windows by application`: enabled
-
- in general, just go through most pages/options and set them as desired
-
--- a/ref/post-run.md
+++ b/ref/post-run.md
@@ -1,3 +0,0 @@
-# Manual steps needed after dotfile copy and/or installs
-
-currently none, wooooo
--- a/ref/workflow-and-workspaces-scheme.md
+++ b/ref/workflow-and-workspaces-scheme.md
@@ -1,61 +0,0 @@
-# notes regarding my workflow and intended use of workspaces
-
-## workspaces layout
-
-idea from the ThePrimeagen: designated workspace/label/desktop per app/purpose
-
-### current layout/plan
-
-| workspace number                                             | wm layout/mode         |
-|--------------------------------------------------------------|------------------------|
-| 1. notes (stack: nvim, obsidian)                             | stack                  |
-| 2. music makeing - misc                                      | stack                  |
-| 3. music making - daw                                        | floating (workaround)  |
-| 4. drawing (currently: gimp)                                 | stack                  |
-| 5. music/audio listening                                     | stack                  |
-| 6. comms (stack: emails, chats, av/calls)                    | stack                  |
-| 7. web browser                                               | stack                  |
-| 8. terminal (primary; one-offs & tui apps can be anywhere)   | stack                  |
-| 9. programming - misc (whatever is not in terminal)          | stack                  |
-| 0. general - misc (catch-all)                                | stack                  |
-
-### ideas/guidelines:
- use this consistently accross all machines
-    - if something not applicable for a given machine, just don't have apps or screens
-      present, but maintain absolute position/numbering of each screen
- structure the above so that programs which i'm likely to use with one hand off of the
-  keyboard (i.e. to use a trackpad, mouse, stylus, etc) are on the screens that allow
-  for one hand (i.e. the one still on the keyboard) to navigate those screens
-    - for me, using peripherals with right hand, so put programs likely to be used with
-      peripherals where my left hand can switch to them single-handedly (screens 1 to 5)
-
-## workflow / use notes
-
- related to the layout above, my approach is to run almost every window in fullscreen
-    - note: on macOS, this is not mac's notion of fullscreen, which basically moves
-      windows to new workspaces/desktops when going to fullscreen mode; instead, when i
-      say 'fullscreen', the idea is taking up all of the normal screen (excluding the
-      menu bar at the top of the screen)
- key bindings are set for moving window focus up/down (vim style: mod + k/j)
-    - the mental model here is that every fullscreen window is in a stack, so i can move
-      focus up and down the stack (and i try to maintain consistent order in stacks,
-      e.g. in the comms workspace, email is always on the bottom and chat apps are above)
- for apps with tabs, pair the above mental model of a stack with a mental model of a
-  circular list being in any position in that stack
-    - so, keybindings are also set for previous/next tab (vim style: mod + h/l)
-    - specifically, mod+h is mapped to ctrl+shift+tab and mod+l is mapped to ctrl+tab,
-      so it should work anywhere ctrl+tab and ctrl+shift+tab work
- all this said, it is better to keep things simple when possible and avoid having too
-  many windows and/or tabs open at one time; however, with the designated purpose for
-  each workspace and the mental models above, it rarely takes me long to find what i need
-
-## example cases
-
- if i want a particular browser window, i jump to workspace 9, then move focus
-  up or down until i get to the window i want; if the window is right but i need
-  a different tab, i then just move "right or left" through my tabs
- if i want a particular music-playing app/tui, i jumpt to workspace 4 and move
-  focus up or down as needed to find it
- variation case: if i want a particular terminal workspace, i jump to workspace
-  8, but then i'm in tmux land and navigate via the methods i've set up for tmux
-
--- a/28
+++ b/28
@@ -0,0 +1,28 @@
+[[ -z $BOX_SETUP_OS ]] &&
+    echo "BOX_SETUP_OS must be set; options: arch, artix, debian, macos" &&
+    exit 1
+
+local install_cmd=''
+local update_pkg_manager_and_defs_cmd=''
+local update_pkgs_cmd=''
+case $BOX_SETUP_OS in
+    (arch | artix)
+        install_cmd="sudo pacman -S"
+        update_pkg_manager_and_defs_cmd='' # don't; update system instead?
+        update_pkgs_cmd='sudo pacman -Syu'
+	;;
+    (debian)
+        install_cmd="sudo apt install"
+        update_pkg_manager_and_defs_cmd='sudo apt update'
+        update_pkgs_cmd='sudo apt upgrade'
+	;;
+    (macos)
+        install_cmd="brew install"
+        update_pkg_manager_and_defs_cmd='brew update'
+        update_pkgs_cmd='brew upgrade'
+	;;
+esac
+
+export BOX_SETUP_INSTALL_COMMAND="$install_cmd"
+export BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD="$update_pkg_manager_and_defs_cmd"
+export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
--- a/src_files/.config/aerospace/aerospace.toml
+++ b/src_files/.config/aerospace/aerospace.toml
@@ -1,133 +0,0 @@
-# options commands : https://nikitabobko.github.io/AeroSpace/commands
-after-startup-command = []
-start-at-login = true # start aerospace at login
-
-# ref: https://nikitabobko.github.io/AeroSpace/guide#normalization
-enable-normalization-flatten-containers = true
-enable-normalization-opposite-orientation-for-nested-containers = true
-
-accordion-padding = 0 # ref: https://nikitabobko.github.io/AeroSpace/guide#layouts
-
-default-root-container-layout = 'accordion' # tiles|accordion
-default-root-container-orientation = 'vertical' # horizontal|vertical|auto
-
-# refs: https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
-#       https://nikitabobko.github.io/AeroSpace/commands#move-mouse
-on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
-
-# ref: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app
-automatically-unhide-macos-hidden-apps = true
-
-# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
-[key-mapping]
-    preset = 'qwerty' # qwerty|dvorak|colemak
-
-# ref: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
-# gaps between windows (inner-*) and between monitor edges (outer-*).
-[gaps]
-    inner.horizontal = 0
-    inner.vertical =   0
-    outer.left =       0
-    outer.bottom =     0
-    outer.top =        0
-    outer.right =      0
-
-# 'main' binding mode; ref: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
-[mode.main.binding] # 'main' binding mode must be always presented
-    # All possible keys:
-    # - Letters.        a, b, c, ..., z
-    # - Numbers.        0, 1, 2, ..., 9
-    # - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9
-    # - F-keys.         f1, f2, ..., f20
-    # - Special keys.   minus, equal, period, comma, slash, backslash, quote, semicolon,
-    #                   backtick, leftSquareBracket, rightSquareBracket, space, enter, esc,
-    #                   backspace, tab, pageUp, pageDown, home, end, forwardDelete,
-    #                   sectionSign (ISO keyboards only, european keyboards only)
-    # - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual,
-    #                   keypadMinus, keypadMultiply, keypadPlus
-    # - Arrows.         left, down, up, right
-
-    # All possible modifiers: cmd, alt, ctrl, shift
-    # All possible commands: https://nikitabobko.github.io/AeroSpace/commands
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget
-    # You can uncomment the following lines to open up terminal with alt + enter shortcut
-    # (like in i3)
-    # alt-enter = '''exec-and-forget osascript -e '
-    # tell application "Terminal"
-    #     do script
-    #     activate
-    # end tell'
-    # '''
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#layout
-    alt-comma = 'layout v_accordion'
-    alt-period = 'layout h_tiles'
-    alt-slash = 'layout horizontal vertical'
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#focus
-    # new windows are added to the stack "below" the current, so swap up and down
-    alt-j = 'focus up'
-    alt-k = 'focus down'
-    # bindings: alt-l -> ctrl-tab, alt-h -> ctrl-shift-tab
-    # alt-l = "exec-and-forget osascript -e 'tell application \"System Events\" to key code 48 using control down'"
-    # alt-h = "exec-and-forget osascript -e 'tell application \"System Events\" to key code 48 using {control down, shift down}'"
-
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#move
-    # new windows are added to the stack "below" the current, so swap up and down
-    alt-shift-j = 'move up'
-    alt-shift-k = 'move down'
-    alt-shift-h = 'move left'
-    alt-shift-l = 'move right'
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#resize
-    alt-minus = 'resize smart -50'
-    alt-equal = 'resize smart +50'
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#workspace
-    alt-1 = 'workspace 1'
-    alt-2 = 'workspace 2'
-    alt-3 = 'workspace 3'
-    alt-4 = 'workspace 4'
-    alt-5 = 'workspace 5'
-    alt-6 = 'workspace 6'
-    alt-7 = 'workspace 7'
-    alt-8 = 'workspace 8'
-    alt-9 = 'workspace 9'
-    alt-0 = 'workspace 0'
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace
-    alt-shift-1 = 'move-node-to-workspace 1'
-    alt-shift-2 = 'move-node-to-workspace 2'
-    alt-shift-3 = 'move-node-to-workspace 3'
-    alt-shift-4 = 'move-node-to-workspace 4'
-    alt-shift-5 = 'move-node-to-workspace 5'
-    alt-shift-6 = 'move-node-to-workspace 6'
-    alt-shift-7 = 'move-node-to-workspace 7'
-    alt-shift-8 = 'move-node-to-workspace 8'
-    alt-shift-9 = 'move-node-to-workspace 9'
-    alt-shift-0 = 'move-node-to-workspace 0'
-
-    # See: https://nikitabobko.github.io/AeroSpace/commands#mode
-    alt-shift-semicolon = 'mode service'
-
-# 'service' binding mode declaration.
-# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
-[mode.service.binding]
-    esc = ['reload-config', 'mode main']
-    backspace = ['close-all-windows-but-current', 'mode main']
-
-    r = ['flatten-workspace-tree', 'mode main'] # reset layout
-    f = ['flatten-workspace-tree', 'layout floating', 'mode main']
-    s = ['flatten-workspace-tree', 'layout v_accordion', 'mode main']
-    g = ['flatten-workspace-tree', 'layout h_tiles', 'mode main']
-
-    alt-shift-h = ['join-with left', 'mode main']
-    alt-shift-j = ['join-with down', 'mode main']
-    alt-shift-k = ['join-with up', 'mode main']
-    alt-shift-l = ['join-with right', 'mode main']
-
-    down = 'volume down'
-    up = 'volume up'
-    shift-down = ['volume set 0', 'mode main']
--- a/installs_and_builds/personal/placeholder-TODO
+++ b/installs_and_builds/personal/placeholder-TODO
--- a/src_files/.config/ghostty/config
+++ b/src_files/.config/ghostty/config
@@ -1,8 +1 @@
 font-feature = -calt, -liga, -dlig
-
-macos-titlebar-proxy-icon = hidden
-window-decoration = none
-title = ""
-
-# theme opts: tokyonight_night_manual, bamboo
-theme = tokyonight_night_manual
--- a/src_files/.config/ghostty/themes/bamboo
+++ b/src_files/.config/ghostty/themes/bamboo
@@ -1,25 +0,0 @@
-# primary
-background = #111c18
-foreground = #C1C497
-cursor-color = #D7C995
-cursor-text = #000000
-
-# normal colors
-palette = 0=#23372B
-palette = 1=#FF5345
-palette = 2=#549e6a
-palette = 3=#459451
-palette = 4=#509475
-palette = 5=#D2689C
-palette = 6=#2DD5B7
-palette = 7=#F6F5DD
-
-# bright colors
-palette = 8=#53685B
-palette = 9=#db9f9c
-palette = 10=#143614
-palette = 11=#E5C736
-palette = 12=#ACD4CF
-palette = 13=#75bbb3
-palette = 14=#8CD3CB
-palette = 15=#9eebb3
--- a/src_files/.config/ghostty/themes/tokyonight_night_manual
+++ b/src_files/.config/ghostty/themes/tokyonight_night_manual
@@ -1,29 +0,0 @@
-# primary
-background = #1a1b26
-foreground = #c0caf5
-cursor-color = #c0caf5
-cursor-text = #1a1b26
-
-# normal colors
-palette = 0=#15161e
-palette = 1=#f7768e
-palette = 2=#9ece6a
-palette = 3=#e0af68
-palette = 4=#7aa2f7
-palette = 5=#bb9af7
-palette = 6=#7dcfff
-palette = 7=#a9b1d6
-
-# bright colors
-palette = 8=#414868
-palette = 9=#f7768e
-palette = 10=#9ece6a
-palette = 11=#e0af68
-palette = 12=#7aa2f7
-palette = 13=#bb9af7
-palette = 14=#7dcfff
-palette = 15=#c0caf5
-
-# selection-background
-selection-background = #283457
-selection-foreground = #c0caf5
--- a/src_files/.config/gimp/colorrc
+++ b/src_files/.config/gimp/colorrc
@@ -1,9 +0,0 @@
-# GIMP colorrc
-#
-# This file holds a list of recently used colors.
-
-(color-history
-    (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0)
-    (color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
-
-# end of colorrc
--- a/src_files/.config/gimp/contextrc
+++ b/src_files/.config/gimp/contextrc
@@ -1,18 +0,0 @@
-# GIMP user context
-
-(tool "gimp-pencil-tool")
-(paint-info "gimp-pencil")
-(foreground
-    (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
-(background
-    (color "R'G'B'A float" 16 "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\200\77" 0))
-(brush "2. Hardness 050")
-(dynamics "Pressure Opacity")
-(mybrush "100% Opaque")
-(pattern "Pine")
-(gradient "FG to BG (RGB)")
-(palette "Color History")
-(font "Sans-serif")
-(tool-preset "Core Pointer")
-
-# end of user context
--- a/src_files/.config/gimp/gimprc
+++ b/src_files/.config/gimp/gimprc
@@ -1,52 +0,0 @@
-# GIMP gimprc
-#
-# personal gimprc file, takes precedence over values in system-wide gimprc
-# if changing within gimp, make sure i copy those settings into my dotfiles src_files
-
-(prev-language "en-US")
-(config-version "3.0.6")
-(default-image
-    (width 2480)
-    (height 1748)
-    (unit pixels)
-    (xresolution 300)
-    (yresolution 300)
-    (resolution-unit inches)
-    (image-type rgb)
-    (precision u8-non-linear)
-    (color-profile NULL)
-    (simulation-profile NULL)
-    (simulation-bpc no)
-    (simulation-intent relative-colorimetric)
-    (fill-type background)
-    (comment ""))
-(import-raw-plug-in "${gimp_plug_in_dir}/plug-ins/file-raw-placeholder/file-raw-placeholder")
-(check-updates no)
-(check-update-timestamp 1759871981)
-(monitor-xresolution 129)
-(monitor-yresolution 129)
-(show-welcome-dialog no)
-(fill-options
-    (style fg-color)
-    (custom-style solid-color)
-    (antialias yes)
-    (feather no)
-    (feather-radius 10))
-(stroke-options
-    (style fg-color)
-    (custom-style solid-color)
-    (antialias yes)
-    (feather no)
-    (feather-radius 10)
-    (method line)
-    (width 6)
-    (unit pixels)
-    (cap-style butt)
-    (join-style miter)
-    (miter-limit 10)
-    (dash-offset 0)
-    (dash-info 0)
-    (emulate-brush-dynamics no))
-
-
-# end of gimprc
--- a/src_files/.config/gimp/shortcutsrc
+++ b/src_files/.config/gimp/shortcutsrc
@@ -1,3 +0,0 @@
-(file-version 1)
-(action "windows-hide-docks" "<Shift><Control>d")
-(action "view-zoom-fit-in" "<Shift><Control>f")
--- a/src_files/.config/gimp/tool-options/gimp-paintbrush-tool
+++ b/src_files/.config/gimp/tool-options/gimp-paintbrush-tool
@@ -1,13 +0,0 @@
-# GIMP gimp-paintbrush-tool options
-
-(background
-    (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
-(brush "2. Hardness 050")
-(dynamics "Pressure Opacity")
-(pattern "Pine")
-(gradient "FG to BG (RGB)")
-(palette "Color History")
-(brush-size 2.0)
-(brush-hardness 0.5)
-
-# end of gimp-paintbrush-tool options
--- a/src_files/.config/gimp/tool-options/gimp-pencil-tool
+++ b/src_files/.config/gimp/tool-options/gimp-pencil-tool
@@ -1,13 +0,0 @@
-# GIMP gimp-pencil-tool options
-
-(background
-    (color "R'G'B'A float" 16 "\1\0\200\77\1\0\200\77\1\0\200\77\0\0\200\77" 0))
-(brush "2. Hardness 050")
-(dynamics "Pressure Opacity")
-(pattern "Pine")
-(gradient "FG to BG (RGB)")
-(palette "Color History")
-(brush-size 2.0)
-(brush-hardness 0.5)
-
-# end of gimp-pencil-tool options
--- a/src_files/.config/git/config
+++ b/src_files/.config/git/config
@@ -2,8 +2,4 @@
 	defaultBranch = master
 [user]
 	name = david
-	email = david@pinewoods.xyz
-[push]
-    autoSetupRemote = true
-[pull]
-    rebase = true
+	email = david@silverwolf.studio
--- a/src_files/.config/git/ignore
+++ b/src_files/.config/git/ignore
@@ -1,28 +1,7 @@
-# my own stuff/conventions
-.tmux-session-hydrate
-zxcv*
-
-# compilation/debug/cache/build/etc
-**/build/
-**/__pycache__/
-*.o
-*.pch
-*.dSYM
-
-# lang/package
-mise*.toml
-.npmrc
-
-# opencode/agents/etc
-.opencode/
-opencode.json
-AGENTS.md
-
-# vim files
+.tool-versions
 *.swp
 *.swo
-
-# miscellaneous
+.npmrc
+.tmux-session-hydrate
+zxcv*
 .DS_Store
-.liccor*
-
--- a/src_files/.config/mise/config.toml
+++ b/src_files/.config/mise/config.toml
@@ -1,8 +0,0 @@
-[tools]
-go = "1"
-python = "3"
-ruby = "3"
-
-[settings]
-idiomatic_version_file_enable_tools = ["ruby"]
-
--- a/src_files/.config/ncspot/config.toml
+++ b/src_files/.config/ncspot/config.toml
@@ -1,12 +1,3 @@
-initial_screen = "library"
-library_tabs = ["playlists", "albums", "artists", "browse"]
-
-[keybindings]
-"Space" = "playpause"
-
-##########################################################################################
-# theme
-
 # [theme] # from eltoncezar, similar to official spotify colors
 # background = "#191414"
 # primary = "#FFFFFF"
--- a/src_files/.config/nvim/init.lua
+++ b/src_files/.config/nvim/init.lua
@@ -1,13 +1 @@
-local csGroup = vim.api.nvim_create_augroup("coreSettingsGroup", { clear = true })
-local csgAutocmd = vim.api.nvim_create_autocmd
-
-require("settings")
-require("plugin_manager")
-require("key_mappings")
-require("theme")
-
-csgAutocmd({"BufWritePre"}, {
-    group = csGroup,
-    pattern = "*",
-    command = [[%s/\s\+$//e]],
-})
+print("print from init.lua file")
--- a/src_files/.config/nvim/lsp/clangd.lua
+++ b/src_files/.config/nvim/lsp/clangd.lua
@@ -1,5 +0,0 @@
-return {
-    cmd = { 'clangd' },
-    root_markers = { '.clangd', 'compile_commands.json' },
-    filetypes = { 'c', 'cpp' },
-}
--- a/src_files/.config/nvim/lsp/ruby.lua
+++ b/src_files/.config/nvim/lsp/ruby.lua
@@ -1,6 +0,0 @@
-return {
-    cmd = { "ruby-lsp" },
-    filetypes = { "ruby", "eruby" },
-    root_markers = { "Gemfile", ".git" },
-    init_options = { formatter = "auto" },
-}
--- a/src_files/.config/nvim/lua/key_mappings.lua
+++ b/src_files/.config/nvim/lua/key_mappings.lua
@@ -1,162 +0,0 @@
-local kmGroup = vim.api.nvim_create_augroup("KeymappingsGroup", { clear = true })
-local kmgAutocmd = vim.api.nvim_create_autocmd
-
------------------------------------------------------------------------------------------
-- core
-
-- explore the directory of the current file (using netrw)
-vim.keymap.set("n", "<leader>n", vim.cmd.Ex)
-
-- move selected lines up or down
-vim.keymap.set("v", "J", ":m '>+1<CR>gv")
-vim.keymap.set("v", "K", ":m '<-2<CR>gv")
-
-- vertically center cursor with half-page jumps
-vim.keymap.set("n", "<C-d>", "<C-d>zz")
-vim.keymap.set("n", "<C-u>", "<C-u>zz")
-
-- open folds when iterating search results
-vim.keymap.set("n", "n", "nzv")
-vim.keymap.set("n", "N", "Nzv")
-
-- maintain cursor position after paragraph formatting
-vim.keymap.set("n", "=ap", "ma=ap'a")
-
-- shortcuts for deleting into the void register
-vim.keymap.set({ "n", "v" }, "<leader>d", "\"_d")
-vim.keymap.set("x", "<leader>P", [["_dP]]) -- replace selected text, keep main register
-
-- shortcuts for using + register (system clipboard)
-vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
-vim.keymap.set("n", "<leader>Y", [["+Y]])
-vim.keymap.set("n", "<leader>D", [["+D]])
-vim.keymap.set("n", "<leader>p", [["+p]])
-
-- search-and-replace shortcuts
-vim.keymap.set("n", "<leader>rw", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
-vim.keymap.set("n", "<leader>ra", [[:%s//g<Left><Left>]])
-
-- toggle expandtab and show message
-vim.keymap.set("n", "<leader>tab", function()
-    if vim.opt.expandtab:get() then
-        vim.opt.expandtab = false
-        print("using actual tabs")
-    else
-        vim.opt.expandtab = true
-        print("using spaces in place of tabs")
-    end
-end)
-
-- quicker switching between panes/splits
-vim.keymap.set("n", "<C-h>", [[<C-w>h]])
-vim.keymap.set("n", "<C-j>", [[<C-w>j]])
-vim.keymap.set("n", "<C-k>", [[<C-w>k]])
-vim.keymap.set("n", "<C-l>", [[<C-w>l]])
-
------------------------------------------------------------------------------------------
-- quickfix TODO: learn about quickfix (:help quickfix), then maybe use these
-
-- vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
-- vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
-- vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
-- vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
-
------------------------------------------------------------------------------------------
-- debugger and debugging ui
-
-local dap = require("dap")
-vim.keymap.set("n", "<leader>bc", dap.continue, { desc = "debug: continue" })
-vim.keymap.set("n", "<leader>bi", dap.step_into, { desc = "debug: step into" })
-vim.keymap.set("n", "<leader>bo", dap.step_over, { desc = "debug: step over" })
-vim.keymap.set("n", "<leader>bu", dap.step_out, { desc = "debug: step out" })
-vim.keymap.set("n", "<leader>blb", dap.list_breakpoints, { desc = "debug: list breakpoints" })
-vim.keymap.set("n", "<leader>bt", dap.toggle_breakpoint, { desc = "debug: toggle breakpoint" })
-vim.keymap.set("n", "<leader>bb", dap.set_breakpoint, { desc = "debug: set breakpoint" })
-
-vim.keymap.set("n", "<leader>bB", function()
-    dap.set_breakpoint(vim.fn.input("breakpoint condition: "))
-end, { desc = "debug: set conditional breakpoint" })
-
-vim.keymap.set("n", "<leader>bq", function()
-    dap.terminate() require("dapui").close() require("nvim-dap-virtual-text").toggle()
-end, { desc = "debug: quit debugger" })
-
-- TODO: decide if i want these or others, add if so
-- vim.keymap.set("n", "<leader>zxcv", dap.repl.open, { desc = "open REPL" })
-- vim.keymap.set("n", "<leader>zxcv", dap.run_last, { desc = "run last" })
-- vim.keymap.set("n", "<leader>zxcv", dap.set_exception_breakpoints({ "all" }), { desc = "set exception breakpoints" })
-- local dapWidgets = require('dap.ui.widgets')
-- vim.keymap.set({'n', 'v'}, '<leader>zxcv', dapWidgets.hover)
-- vim.keymap.set({'n', 'v'}, '<leader>zxcv', dapWidgets.preview)
-- vim.keymap.set('n', '<leader>zxcv', function() dapWidgets.centered_float(dapWidgets.frames) end)
-- vim.keymap.set('n', '<leader>zxcv', function() dapWidgets.centered_float(dapWidgets.scopes) end)
-
------------------------------------------------------------------------------------------
-- lsp
-
-kmgAutocmd('LspAttach', {
-    group = kmGroup,
-    callback = function(e)
-        local opts = { buffer = e.buf }
-        vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-        vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-        vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-        vim.keymap.set("n", "<leader>vdv", function() vim.diagnostic.open_float() end, opts)
-        vim.keymap.set("n", "<leader>vdn", function() vim.diagnostic.goto_next() end, opts)
-        vim.keymap.set("n", "<leader>vdp", function() vim.diagnostic.goto_prev() end, opts)
-        vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-        vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-        vim.keymap.set("n", "<leader>vrl", function() vim.lsp.buf.references() end, opts)
-        vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-    end
-})
-
------------------------------------------------------------------------------------------
-- plugins
-
-- telescope
-local tscBuiltin = require('telescope.builtin')
-local custom_grep_str_w_regex = function()
-    tscBuiltin.grep_string({ search = vim.fn.input("grep > "), use_regex = true, additional_args = "-i", })
-end
-vim.keymap.set('n', '<leader>ft', tscBuiltin.live_grep, { desc = 'tscope find text, live_grep' })
-vim.keymap.set('n', '<leader>fT', custom_grep_str_w_regex, { desc = 'tscope find text, static grep w/regex' })
-vim.keymap.set('n', '<leader>fg', tscBuiltin.git_files, { desc = 'tscope find git-tracked files' })
-vim.keymap.set('n', '<leader>ff', tscBuiltin.find_files, { desc = 'tscope find files' })
-vim.keymap.set('n', '<leader>fb', tscBuiltin.buffers, { desc = 'tscope buffers' })
-vim.keymap.set('n', '<leader>fh', tscBuiltin.help_tags, { desc = 'tscope help tags' })
-
-- harpoon
-local harpoon = require("harpoon")
-vim.keymap.set("n", "<leader>hl", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
-vim.keymap.set("n", "<leader>ha", function() harpoon:list():add() end)
-vim.keymap.set("n", "<leader>hA", function() harpoon:list():prepend() end)
-vim.keymap.set("n", "<leader>hn", function() harpoon:list():next() end)
-vim.keymap.set("n", "<leader>hp", function() harpoon:list():prev() end)
-vim.keymap.set("n", "<leader>hz", function() harpoon:list():select(1) end)
-vim.keymap.set("n", "<leader>hx", function() harpoon:list():select(2) end)
-vim.keymap.set("n", "<leader>hc", function() harpoon:list():select(3) end)
-vim.keymap.set("n", "<leader>hv", function() harpoon:list():select(4) end)
-vim.keymap.set("n", "<leader>hZ", function() harpoon:list():replace_at(1) end)
-vim.keymap.set("n", "<leader>hX", function() harpoon:list():replace_at(2) end)
-vim.keymap.set("n", "<leader>hC", function() harpoon:list():replace_at(3) end)
-vim.keymap.set("n", "<leader>hV", function() harpoon:list():replace_at(4) end)
-
-- undotree
-vim.keymap.set("n", "<leader>u", vim.cmd.UndotreeToggle)
-
-- treesitter and treesitter-context
-vim.keymap.set("n", "<leader>tc", function() vim.cmd.TSContext({ "toggle" }) end)
-
-- fugitive (git integration)
-vim.keymap.set("n", "<leader>gG", vim.cmd.Git)
-vim.keymap.set("n", "<leader>gg", ":Git ") -- shortcut, arbitrary git commands
-vim.keymap.set("n", "<leader>ga", function() vim.cmd.Git({ "add %"}) end)
-vim.keymap.set("n", "<leader>gs", function() vim.cmd.Git({ "-p status" }) end)
-vim.keymap.set("n", "<leader>gc", function() vim.cmd.Git({ "commit -a" }) end)
-
-- conform (formatter)
-vim.keymap.set("n", "<leader>fmt", function()
-    require("conform").format({ bufnr = 0 })
-end)
-
--- a/src_files/.config/nvim/lua/plugin_manager.lua
+++ b/src_files/.config/nvim/lua/plugin_manager.lua
@@ -1,34 +0,0 @@
-- TODO: maybe switch this over from git-clone approach to neovim's builtin vim.pack.add
-local path_lazy_nvim = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(path_lazy_nvim) then
-  local git_output = vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable",
-    path_lazy_nvim,
-  })
-  if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo(
-      { { "Failed to clone lazy.nvim:\n" }, { git_output }, },
-      true,
-      {}
-    )
-    vim.fn.getchar()
-  end
-end
-vim.opt.rtp:prepend(path_lazy_nvim)
-
-require("lazy").setup({
-    spec = {
-        { import = "plugins_lazy" },
-    },
-    checker = { enabled = false },
-    change_detection = { notify = false },
-    dev = {
-        path = "~/dev/git/other/omarchy/plugins",
-        patterns = { 'LazyVim' },
-        fallback = false,
-    },
-})
--- a/src_files/.config/nvim/lua/plugins_lazy/colorschemes.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/colorschemes.lua
@@ -1,73 +0,0 @@
-return {
-    -- TODO: decide which of these i won't be using, then remove from this file
-    {
-        "ellisonleao/gruvbox.nvim",
-        name = "gruvbox",
-        -- lazy = false,
-        -- priority = 1000,
-        opts = {
-            terminal_colors = true, -- add neovim terminal colors
-            undercurl = true,
-            underline = true,
-            bold = true,
-            italic = {
-                strings = true,
-                emphasis = true,
-                comments = true,
-                operators = false,
-                folds = true,
-            },
-            strikethrough = true,
-            invert_selection = false,
-            invert_signs = false,
-            invert_tabline = false,
-            inverse = true, -- invert background for search, diffs, statuslines and errors
-            contrast = "", -- "hard", "soft", or ""
-            palette_overrides = {},
-            overrides = {},
-            dim_inactive = false,
-            transparent_mode = false,
-        },
-    },
-    {
-        "rose-pine/neovim",
-        name = "rose-pine",
-    },
-    {
-        "folke/tokyonight.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            style = "night", -- "night", "storm", "moon", "day"
-            styles = {
-                functions = {} -- disable italic for functions
-            },
-            on_colors = function(colors)
-                colors.hint = colors.orange
-                colors.error = "#ff0000"
-                colors.fg_gutter = "#9098B8"
-            end,
-        },
-    },
-    {
-        "tiagovla/tokyodark.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            custom_highlights = function(highlights, _palette)
-                highlights.Comment['fg'] = "#8a9097"
-                highlights.LineNr['fg'] = "#8088A8"
-                return highlights
-            end,
-        },
-    },
-    {
-        'ribru17/bamboo.nvim',
-        -- lazy = false,
-        -- priority = 1000,
-        config = function()
-            require('bamboo').setup { }
-            require('bamboo').load()
-        end,
-    },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/conform_formatter.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/conform_formatter.lua
@@ -1,18 +0,0 @@
-return {
-    'stevearc/conform.nvim',
-    opts = {},
-    config = function()
-        require("conform").setup({
-            formatters_by_ft = {
-                -- c = { "fill-in" },
-                -- cpp = { "fill-in" },
-                go = { "gofmt" },
-                lua = { "stylua" },
-                ruby = { "standardrb" },
-                python = { "black" },
-                javascript = { "prettier" },
-            }
-        })
-    end
-}
-
--- a/src_files/.config/nvim/lua/plugins_lazy/dap.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/dap.lua
@@ -1,128 +0,0 @@
-return {
-    {
-        "mfussenegger/nvim-dap",
-        config = function()
-            local dap = require("dap")
-            dap.set_log_level("DEBUG")
-
-            dap.adapters.codelldb = {
-                type = "executable",
-                command = "codelldb",
-            }
-
-            local dapConfigArgsInput = function()
-                return vim.split(vim.fn.input("args: "), " ")
-            end
-
-            local dapConfigProgramSelect = function()
-                local co = coroutine.running()
-
-                require('telescope.pickers').new({}, {
-                    prompt_title = "debug executable",
-                    finder = require('telescope.finders').new_oneshot_job({
-                        "find", ".", "-type", "f", "-perm", "+100", "-exec", "realpath", "{}", "+"
-                    }),
-                    sorter = require('telescope.sorters').get_fuzzy_file(),
-                    attach_mappings = function(prompt_bufnr, _map)
-                        local tscopeActions = require('telescope.actions')
-                        tscopeActions.select_default:replace(function()
-                            tscopeActions.close(prompt_bufnr)
-                            local chosenFile = require('telescope.actions.state').get_selected_entry().value
-                            coroutine.resume(co, chosenFile)
-                        end)
-                        return true
-                    end,
-                }):find()
-
-                return coroutine.yield()
-            end
-
-            dap.configurations.cpp = {
-                {
-                    name = "default c/cpp: launch",
-                    type = "codelldb",
-                    request = "launch",
-                    cwd = "${workspaceFolder}",
-                    program = dapConfigProgramSelect,
-                    stopOnEntry = false,
-                },
-                -- {
-                --     name = "default c/cpp: attach to lldbserver :1234",
-                --     type = "codelldb",
-                --     request = "attach",
-                --     cwd = "${workspaceFolder}",
-                --     program = dapConfigProgramSelect,
-                --     MIMode = "lldb",
-                --     miDebuggerServerAddress = "localhost:1234",
-                --     miDebuggerPath = "/usr/bin/lldb",
-                -- },
-            }
-            dap.configurations.c = dap.configurations.cpp
-            dap.configurations.go = {
-                {
-                    name = "go: launch",
-                    type = "delve",
-                    request = "launch",
-                    program = dapConfigProgramSelect,
-                    args = dapConfigArgsInput,
-                    outputMode = "remote",
-                },
-                {
-                    name = "go: launch current file",
-                    type = "delve",
-                    request = "launch",
-                    program = "${file}",
-                    args = dapConfigArgsInput,
-                    outputMode = "remote",
-                },
-            }
-        end,
-    },
-    {
-        "rcarriga/nvim-dap-ui",
-        dependencies = {
-            "mfussenegger/nvim-dap",
-            "nvim-neotest/nvim-nio",
-        },
-        config = function()
-            local dap = require("dap")
-            local dap_ui = require("dapui")
-            dap_ui.setup()
-            dap.listeners.before.attach.dapui_config = function() dap_ui.open() end
-            dap.listeners.before.launch.dapui_config = function() dap_ui.open() end
-            dap.listeners.before.event_terminated.dapui_config = function() dap_ui.close() end
-            dap.listeners.before.event_exited.dapui_config = function() dap_ui.close() end
-        end,
-    },
-    {
-        "jay-babu/mason-nvim-dap.nvim", -- TODO: here, or handle manually outside of neovim?
-        dependencies = {
-            "williamboman/mason.nvim",
-            "mfussenegger/nvim-dap",
-            "neovim/nvim-lspconfig",
-        },
-        config = function()
-            require("mason-nvim-dap").setup({
-                ensure_installed = {
-                    "codelldb",
-                    -- "delve",
-                },
-                automatic_installation = true,
-                handlers = {
-                    function(config) require("mason-nvim-dap").default_setup(config) end,
-                },
-            })
-        end,
-    },
-    {
-        "theHamsta/nvim-dap-virtual-text",
-        dependencies = {
-            "mfussenegger/nvim-dap",
-        },
-        -- TODO: disabled by default, keymapping to toggle
-        -- config = function()
-        --     local dap_virtual_text = require("nvim-dap-virtual-text")
-        --     dap_virtual_text.setup()
-        -- end,
-    },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/fugitive_git.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/fugitive_git.lua
@@ -1,3 +0,0 @@
-return {
-    { "tpope/vim-fugitive" },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua
@@ -1,11 +0,0 @@
-return {
-    {
-        "ThePrimeagen/harpoon",
-        branch = "harpoon2", -- https://github.com/ThePrimeagen/harpoon/tree/harpoon2
-        dependencies = { "nvim-lua/plenary.nvim" },
-        config = function()
-            local harpoon = require("harpoon")
-            harpoon:setup()
-        end,
-    },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/lsp.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/lsp.lua
@@ -1,123 +0,0 @@
-return {
-    "neovim/nvim-lspconfig",
-    dependencies = {
-        "stevearc/conform.nvim",
-        "williamboman/mason.nvim",
-        "williamboman/mason-lspconfig.nvim",
-        "hrsh7th/cmp-nvim-lsp",
-        "hrsh7th/cmp-buffer",
-        "hrsh7th/cmp-path",
-        "hrsh7th/cmp-cmdline",
-        "hrsh7th/nvim-cmp",
-        "L3MON4D3/LuaSnip", -- snippets, using luasnip for now
-        "saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
-    },
-
-    config = function()
-        require("conform").setup({ formatters_by_ft = {} })
-        local cmp = require('cmp')
-        local cmp_lsp = require("cmp_nvim_lsp")
-        local capabilities = vim.tbl_deep_extend(
-            "force",
-            {},
-            vim.lsp.protocol.make_client_capabilities(),
-            cmp_lsp.default_capabilities()
-        )
-
-        require("mason").setup()
-        require("mason-lspconfig").setup({
-            ensure_installed = {
-                "clangd",
-                "lua_ls",
-                "ruby_lsp",
-                -- "gopls",
-                -- "tailwindcss",
-            },
-            handlers = {
-                function(server_name) -- default
-                    require("lspconfig")[server_name].setup {
-                        capabilities = capabilities
-                    }
-                end,
-
-                ["lua_ls"] = function()
-                    local lspconfig = require("lspconfig")
-                    lspconfig.lua_ls.setup {
-                        capabilities = capabilities,
-                        settings = {
-                            Lua = {
-                                format = {
-                                    enable = true,
-                                    defaultConfig = { -- NOTE: string values only
-                                        indent_style = "space",
-                                        indent_size = "2",
-                                    },
-                                },
-                            },
-                        },
-                    }
-                end,
-            }
-        })
-
-        local cmp_select = { behavior = cmp.SelectBehavior.Select }
-        cmp.setup({
-            mapping = cmp.mapping.preset.insert({
-                ["<C-Space>"] = cmp.mapping.complete(),
-                ['<C-y>'] = cmp.mapping.confirm({ select = true }),
-                ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
-                ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
-                ['<C-d>'] = cmp.mapping.scroll_docs(-4),
-                ['<C-u>'] = cmp.mapping.scroll_docs(4),
-            }),
-            snippet = {
-                expand = function(args)
-                    -- vim.snippet.expand(args.body) -- TODO: native option, maybe try
-                    require('luasnip').lsp_expand(args.body)
-                end,
-            },
-            sources = cmp.config.sources({
-                { name = 'nvim_lsp' },
-                { name = 'luasnip' },
-            }, {
-                { name = 'buffer' },
-            }),
-            window = {
-                completion = cmp.config.window.bordered(),
-                documentation = cmp.config.window.bordered(),
-            },
-            performance = {
-                max_view_entries = 14,
-            },
-        })
-
-        -- `/` cmdline setup.
-        cmp.setup.cmdline(':', {
-            mapping = cmp.mapping.preset.cmdline(),
-            sources = cmp.config.sources({
-                { name = 'path' }
-            }, {
-                { name = 'cmdline' }
-            }),
-            matching = { disallow_symbol_nonprefix_matching = false }
-        })
-
-        vim.diagnostic.config({
-            -- update_in_insert = true,
-            float = {
-                focusable = false,
-                style = "minimal",
-                border = "rounded",
-                source = "always",
-                header = "",
-                prefix = "",
-            },
-        })
-
-        -- TODO: needed? seems like neovim/nvim-lspconfig covers by default
-        -- vim.lsp.enable('clangd')
-        -- vim.lsp.enable('ruby_lsp')
-        -- vim.lsp.enable('standardrb')
-        -- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
-    end,
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/telescope.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/telescope.lua
@@ -1,36 +0,0 @@
-return {
-    "nvim-telescope/telescope.nvim",
-    tag = "0.1.8",
-    dependencies = { "nvim-lua/plenary.nvim" },
-    opts = {
-        defaults = {
-            layout_strategy = "horizontal",
-            layout_config = {
-                horizontal = {
-                    width = 0.98,
-                    height = 0.98,
-                    preview_width = 0.45,
-                },
-            },
-            path_display = { "truncate", },
-        },
-        pickers = {
-            find_files = {
-                find_command = {
-                    "rg", "--hidden", "--files", -- "--no-ignore",
-                    "-g", "!**/.git/**",
-                    "-g", "!**/build/**",
-                    "-g", "!**/node_modules/**",
-                },
-            },
-            live_grep = {
-                additional_args = {
-                    "--hidden", "--no-binary", -- "--no-ignore",
-                    "-g", "!**/.git/**",
-                    "-g", "!**/build/**",
-                    "-g", "!**/node_modules/**",
-                }
-            },
-        },
-    },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/treesitter.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/treesitter.lua
@@ -1,73 +0,0 @@
-return {
-    {
-        "nvim-treesitter/nvim-treesitter",
-        branch = 'master',
-        lazy = false,
-        build = ":TSUpdate",
-        config = function()
-            require("nvim-treesitter.configs").setup({
-                ensure_installed = {
-                    "vimdoc", "bash", "lua", "c", "cpp", "go", "python", "ruby",
-                    "html", "css", "javascript", "jsdoc", "sql", "json", "yaml",
-                    "markdown", "markdown_inline",
-                    -- "odin", "zig", "ocaml", "java", "typescript",
-                },
-                sync_install = false, -- install `ensure_installed` parsers synchronously
-                auto_install = true, -- install missing on BufEnter, requires tree-sitter CLI
-                ignore_install = {},
-                -- indent = { enable = true }, -- TODO: do i want this?
-                highlight = {
-                    enable = true, -- `false` will disable the whole extension
-                    disable = function(lang, buf)
-                        for i, v in ipairs({ "html", }) do
-                            if lang == v then
-                                print("treesitter disabled for this language")
-                                return true
-                            end
-                        end
-                        local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
-                        if ok and stats and stats.size > (100 * 1024) then -- 100 KB
-                            vim.notify(
-                                "larger file, treesitter disabled for performance",
-                                vim.log.levels.WARN,
-                                {title = "Treesitter"}
-                            )
-                            return true
-                        end
-                    end,
-                    -- true, false, or list of langs; may cause slowness or duplicate highlights
-                    additional_vim_regex_highlighting = { "markdown" },
-                },
-            })
-
-        -- TODO: decide if needed/wanted
-            -- local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
-            -- treesitter_parser_config.templ = {
-            --     install_info = {
-            --         url = "https://github.com/vrischmann/tree-sitter-templ.git",
-            --         files = {"src/parser.c", "src/scanner.c"},
-            --         branch = "master",
-            --     },
-            -- }
-
-            -- vim.treesitter.language.register("templ", "templ")
-        end
-    },
-    {
-        "nvim-treesitter/nvim-treesitter-context",
-        after = "nvim-treesitter",
-        opts = {
-            enable = false, -- can enable/disable via manual command
-            multiwindow = false,
-            max_lines = 0, -- lines the window should span; x <= 0 means no limit
-            min_window_height = 10, -- min window height to enable; x <= 0 means no limit
-            line_numbers = true,
-            multiline_threshold = 40, -- max lines to show for a single context
-            trim_scope = 'outer', -- 'inner', 'outer'; discard lines if max_lines exceeded
-            mode = 'cursor',  -- 'cursor', 'topline'; line used to calculate context
-            separator = "-", -- 1 char, like '-'; only shown when >= 2 lines above
-            zindex = 20, -- z-index of the context window
-            on_attach = nil, -- (fun(buf: integer): boolean); return false to disable attaching
-        },
-    },
-}
--- a/src_files/.config/nvim/lua/plugins_lazy/undotree.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/undotree.lua
@@ -1,3 +0,0 @@
-return {
-    "mbbill/undotree",
-}
--- a/src_files/.config/nvim/lua/settings.lua
+++ b/src_files/.config/nvim/lua/settings.lua
@@ -1,44 +0,0 @@
-vim.g.mapleader = " "
-
-- -- TODO: do i want these?
-- vim.opt.isfname:append("@-@")
-- vim.opt.guicursor = ""
-
-vim.opt.hlsearch = true
-vim.opt.incsearch = true
-
-vim.opt.termguicolors = true
-vim.opt.scrolloff = 2
-vim.opt.colorcolumn = "90"
-vim.opt.signcolumn = "yes" -- "auto", "yes", "no", "number"
-vim.opt.laststatus = 2
-vim.opt.splitright = true
-vim.opt.splitbelow = true
-vim.opt.nu = true
-vim.opt.relativenumber = true
-vim.opt.cursorline = true
-vim.opt.cursorlineopt = "both"
-vim.opt.smartindent = true
-vim.opt.wrap = true
-
-vim.opt.errorbells = false
-vim.opt.visualbell = false
-
-vim.opt.updatetime = 1000
-
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
-vim.opt.backup = false
-vim.opt.swapfile = false
-vim.opt.undodir = os.getenv("XDG_DATA_HOME") .. "/nvim/undodir"
-vim.opt.undofile = true
-
-- netrw settings
-vim.g.netrw_browse_split = 0
-vim.g.netrw_preview = 1
-vim.g.netrw_banner = 0
-vim.g.netrw_winsize = 50
-
--- a/src_files/.config/nvim/lua/theme.lua
+++ b/src_files/.config/nvim/lua/theme.lua
@@ -1,31 +0,0 @@
-local defaultColorScheme = "tokyodark"
-- local defaultColorScheme = "tokyonight-night"
-- local defaultColorScheme = "bamboo-vulgaris"
-- local defaultColorScheme = "rose-pine-main"
-- local defaultColorScheme = "gruvbox"
-- local defaultColorScheme = "slate"
-- local defaultColorScheme = "sorbet"
-
-local ok, theme_specs = pcall(dofile, (os.getenv('DIR_CURRENT_THEME') or "") .. "/neovim.lua")
-if not ok then
-  vim.notify(
-    'current theme file not found, using default: ' .. defaultColorScheme,
-    vim.log.levels.INFO
-  )
-  vim.cmd.colorscheme(defaultColorScheme)
-  return
-end
-
-local first = theme_specs[1]
-local plugin_name = (type(first.name) == 'string' and first.name)
-  or (type(first[1]) == 'string' and first[1]:match('.*/(.*)'))
-  or 'plugin_name_not_found'
-
-local last = theme_specs[#theme_specs]
-local colorscheme = ((type(last.opts) == 'table' and type(last.opts.colorscheme) == 'string') and last.opts.colorscheme)
-  or plugin_name:gsub("%.%w+$", "")
-
-colorscheme = (colorscheme == 'plugin_name_not_found' and defaultColorScheme)
-  or colorscheme
-vim.cmd.colorscheme(colorscheme)
-
--- a/src_files/.config/obsidian/app.json
+++ b/src_files/.config/obsidian/app.json
@@ -1,18 +0,0 @@
-{
-  "defaultViewMode": "preview",
-  "showLineNumber": true,
-  "spellcheck": false,
-  "autoPairBrackets": false,
-  "autoPairMarkdown": false,
-  "useTab": false,
-  "autoConvertHtml": true,
-  "vimMode": false,
-  "trashOption": "none",
-  "newFileLocation": "folder",
-  "newFileFolderPath": "inbox",
-  "showUnsupportedFiles": true,
-  "attachmentFolderPath": "inbox",
-  "showInlineTitle": false,
-  "readableLineLength": false,
-  "livePreview": false
-}
--- a/src_files/.config/obsidian/appearance.json
+++ b/src_files/.config/obsidian/appearance.json
@@ -1,5 +0,0 @@
-{
-  "theme": "obsidian",
-  "accentColor": "#2f930e",
-  "baseFontSize": 18
-}
--- a/src_files/.config/obsidian/core-plugins.json
+++ b/src_files/.config/obsidian/core-plugins.json
@@ -1,33 +0,0 @@
-{
-  "file-explorer": true,
-  "global-search": true,
-  "switcher": true,
-  "graph": true,
-  "backlink": true,
-  "canvas": true,
-  "outgoing-link": true,
-  "tag-pane": true,
-  "footnotes": false,
-  "properties": false,
-  "page-preview": true,
-  "daily-notes": true,
-  "templates": true,
-  "note-composer": true,
-  "command-palette": true,
-  "slash-command": false,
-  "editor-status": true,
-  "bookmarks": true,
-  "markdown-importer": false,
-  "zk-prefixer": false,
-  "random-note": false,
-  "outline": true,
-  "word-count": true,
-  "slides": false,
-  "audio-recorder": false,
-  "workspaces": false,
-  "file-recovery": true,
-  "publish": false,
-  "sync": false,
-  "bases": true,
-  "webviewer": false
-}
--- a/src_files/.config/obsidian/graph.json
+++ b/src_files/.config/obsidian/graph.json
@@ -1,22 +0,0 @@
-{
-  "collapse-filter": true,
-  "search": "",
-  "showTags": false,
-  "showAttachments": false,
-  "hideUnresolved": false,
-  "showOrphans": true,
-  "collapse-color-groups": true,
-  "colorGroups": [],
-  "collapse-display": true,
-  "showArrow": false,
-  "textFadeMultiplier": 0,
-  "nodeSizeMultiplier": 1,
-  "lineSizeMultiplier": 1,
-  "collapse-forces": true,
-  "centerStrength": 0.518713248970312,
-  "repelStrength": 10,
-  "linkStrength": 1,
-  "linkDistance": 250,
-  "scale": 1,
-  "close": false
-}
--- a/src_files/.config/obsidian/hotkeys.json
+++ b/src_files/.config/obsidian/hotkeys.json
@@ -1,18 +0,0 @@
-{
-  "markdown:toggle-preview": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "R"
-    }
-  ],
-  "switcher:open": [
-    {
-      "modifiers": [
-        "Ctrl"
-      ],
-      "key": "F"
-    }
-  ]
-}
--- a/src_files/.config/skhd/skhdrc
+++ b/src_files/.config/skhd/skhdrc
@@ -2,6 +2,46 @@
 # staring file was at /opt/homebrew/opt/yabai/share/yabai/examples
 # notes, stacks: https://github.com/koekeishiya/yabai/issues/203#issuecomment-650642142

+##########################################################################################
+# key bindings for yabai wm
+# general idea: alt navigates (move my view); alt+shift modifies (move/change the window)
+
+# switch to space (to leave SIP in place, configure these in macos system settings)
+# alt - 1 # switch to space 1
+# alt - 2 # switch to space 2 (and similar for other numbers)
+
+# move focused window to the given space
+alt + shift - 1 : yabai -m window --space 1 --focus
+alt + shift - 2 : yabai -m window --space 2 --focus
+alt + shift - 3 : yabai -m window --space 3 --focus
+alt + shift - 4 : yabai -m window --space 4 --focus
+alt + shift - 5 : yabai -m window --space 5 --focus
+alt + shift - 6 : yabai -m window --space 6 --focus
+alt + shift - 7 : yabai -m window --space 7 --focus
+alt + shift - 8 : yabai -m window --space 8 --focus
+alt + shift - 9 : yabai -m window --space 9 --focus
+
+# all windows in a space to fullscreen in a single stack
+alt + shift - s : yabai -m space --layout stack
+# all windows in a space back to the grid (managed)
+alt + shift - g : yabai -m space --layout bsp
+# toggle float on/off for the focused window
+alt + shift - f : yabai -m window --toggle float
+# balance window sizes
+alt + shift - 0 : yabai -m space --balance # TODO: figure out better key option
+
+# focus on next/previous window
+alt - j : yabai -m window --focus \
+    $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")prev
+alt - k : yabai -m window --focus \
+    $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")next
+
+# move current window up/down in stack
+alt + shift - k : yabai -m window --swap \
+    $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")next
+alt + shift - j : yabai -m window --swap \
+    $(yabai -m query --spaces --space | jq '.type' | tr -d "\"" | sed "s/stack/stack./" | sed "s/.*[^.]\$//")prev
+
 ##########################################################################################
 # key bindings for general use

--- a/src_files/.config/tmux/.tmux-session-hydrate-default
+++ b/src_files/.config/tmux/.tmux-session-hydrate-default
@@ -1,18 +0,0 @@
-tmux_omitted_dirs=(
-    $HOME
-    $(find $DIR_HOME_BOX -type d -maxdepth 1)
-    $DIR_DEV
-    $DIR_GIT_PROJECTS
-)
-
-[[ ! ${tmux_omitted_dirs[(re)$(pwd)]} ]] && {
-    tmux new-window -d -n $EDITOR
-    tmux send-keys -t :$EDITOR "$EDITOR ." c-M
-    tmux new-window -d -n daa
-    tmux new-window -d -n procs
-    tmux rename-window cmd
-    tmux send-keys -t :cmd "clear; [[ -d .git ]] && git status" c-M
-}
-
-clear
-
--- a/src_files/.config/tmux/tmux.conf
+++ b/src_files/.config/tmux/tmux.conf
@@ -2,17 +2,11 @@
 set -s escape-time 0

 unbind C-b
-set-option -g prefix C-Space
-bind-key C-Space send-prefix
+set-option -g prefix C-a
+bind-key C-a send-prefix
 set -g status-style 'bg=#111111 fg=#22cc00'
 set -g base-index 0

-# unbind keys
-unbind-key f; unbind-key C-f; unbind-key s; unbind-key C-s
-unbind-key c; unbind-key n; unbind-key p
-unbind-key q; unbind-key w
-unbind-key C-o; unbind-key C-n; unbind-key C-p; unbind-key C-l; unbind-key C-h
-
 # vim-like movement stuff
 set-window-option -g mode-keys vi
 bind -T copy-mode-vi v send-keys -X begin-selection
@@ -23,22 +17,21 @@ bind -r h select-pane -L
 bind -r l select-pane -R

 # reload tmux.conf
-bind-key r source-file "$XDG_CONFIG_HOME/tmux/tmux.conf" \; display-message "tmux.conf reloaded"
+bind r source-file "~/.config/tmux/tmux.conf" \; display-message "tmux.conf reloaded"

-# closing the current session
-bind-key q kill-session
-bind-key w run-shell "$DIR_SCRIPTS/tmux-session-close #{session_name}"
+# kill the current session
+# TODO: would it clash with other bindings to change these to C-q and C-w ?
+bind-key Q rename-session zzzz-temp-kill\; switch-client -p\; kill-session -t zzzz-temp-kill
+# TODO: if i can combine this into the above when only 1 session remains, do so
+bind-key W kill-session

-# creating new windows
-bind-key n new-window
-
-# find and switching for sessions, include using tmux-session-init
-bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-session-init"
-bind-key C-s choose-session
-bind-key S choose-window
-bind-key C-h run-shell "tmux neww $DIR_SCRIPTS/tmux-session-init hub"
-bind-key -r C-l switch-client -l
-bind-key -r C-o last-window
-bind-key -r C-n next-window
-bind-key -r C-p previous-window
+# find and switching for sessions, include using tmux-sessionizer
+unbind-key f
+bind-key C-f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer"
+bind-key C-s run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing"
+bind-key C-h run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer hub"
+bind-key C-l switch-client -l
+bind -r C-o last-window
+bind-key C-n next-window
+bind-key C-p previous-window

--- a/src_files/.config/vim/pack/plugins/start/.plugin-git-clone-script
+++ b/src_files/.config/vim/pack/plugins/start/.plugin-git-clone-script
@@ -0,0 +1,4 @@
+#/bin/zsh
+
+git clone https://github.com/ghifarit53/tokyonight-vim.git
+git clone https://github.com/leafgarland/typescript-vim.git
--- a/src_files/.config/vim/vimrc
+++ b/src_files/.config/vim/vimrc
@@ -0,0 +1,111 @@
+" base settings
+set nocompatible
+let mapleader=","
+
+" xdg base directory settings/clean-up
+set runtimepath^=$XDG_CONFIG_HOME/vim
+" add other dirs to path as needed
+" XDG_CONFIG_HOME, XDG_CACHE_HOME, XDG_DATA_HOME, XDG_STATE_HOME, XDG_DATA_DIRS
+" set/override other filenames/paths/dirs as needed
+
+" plugin config
+	let g:netrw_banner=0 " hide banner
+	let g:netrw_browse_split=0 " <cr> opens in same window
+	let g:netrw_liststyle=3 " listing style: tree
+	let g:netrw_list_hide= '.*\.swp$'
+
+	let g:typescript_indent_disable = 1
+
+" functions
+func! ToggleTabMode()
+	set expandtab!
+	if &expandtab
+		echo "using space characters in place of tabs"
+	else
+		echo "using tab characters"
+	endif
+endfunc
+
+" copy & paste: registers, clipboard
+set clipboard+=unnamed " TODO or maybe unamedplus?
+
+" colors, themes, appearance
+"set background=light
+let g:tokyonight_style = 'night' " available: night, storm
+colorscheme tokyonight
+
+" measurements, numbers, visual/audible cues
+set cursorline
+set colorcolumn=89,90
+set noerrorbells novisualbell
+set hlsearch
+set laststatus=2
+set number relativenumber
+set ruler
+set showcmd
+set noshowmode
+set title
+
+" syntax highlighting
+syntax enable " TODO 'enable' or 'on'?
+
+" settings for buffers
+set hidden
+
+" settings for panes/splits, tabs
+set splitright splitbelow
+map <C-h> <C-w>h
+map <C-j> <C-w>j
+map <C-k> <C-w>k
+map <C-l> <C-w>l
+
+" finding and opening files
+set wildmenu
+set path+=**
+
+" text input and editing
+set tabstop=4
+set expandtab
+autocmd BufEnter * set formatoptions-=ro
+" TODO get recursion working for the tags command below
+command! MakeTags !ctags -f tags -R .
+
+" shortcuts or aliases
+	" shortcuts for find in pane/tab
+	nnoremap <leader>f. :find<Space>*
+	nmap <leader>fr :vnew<CR><leader>f.
+	nmap <leader>fb :new<CR><leader>f.
+	nmap <leader>ft :tabnew<CR><leader>f.
+
+	" shortcuts for grep in pane/tab
+	nnoremap <leader>g, :r<Space>!grep<Space>--exclude-dir=node_modules<Space>-rIi<Space><Space>.<Left><Left>
+	nmap <leader>g. :enew<CR><leader>g,
+	nmap <leader>gr :vnew<CR><leader>g,
+	nmap <leader>gb :new<CR><leader>g,
+	nmap <leader>gt :tabnew<CR><leader>g,
+
+	" shortcuts for tree (netrw) in pane/tab
+	nnoremap <leader>t. :edit<Space>.<CR>
+	nnoremap <leader>tr :vsplit<Space>.<CR>
+	nnoremap <leader>tb :split<Space>.<CR>
+	nnoremap <leader>tt :tabnew<Space>.<CR>
+
+	" toggle tab/space mode
+	nnoremap <leader>tab :call ToggleTabMode()<CR>
+
+	" toggles related to line numbers and cursor
+	nnoremap <leader>nu :set number!<CR>
+	nnoremap <leader>rnu :set relativenumber!<CR>
+	nnoremap <leader>cc :set cuc!<CR>
+
+	" searching: replace-all in file
+	nnoremap <leader>ra :%s//g<Left><Left>
+	" TODO maybe add global (working dir, recursive) replace-all feature?
+
+	" format file content
+	nnoremap <leader>fmtjson :%!jq<Space>.<Space>-<CR>
+
+" automatic actions
+	autocmd BufWritePre * %s/\s\+$//e " delete trailing whitespace
+	" autocmd BufWritePre * %s/\n\+\%$//e " delete end-of-file newlines
+
--- a/src_files/.config/yabai/yabairc
+++ b/src_files/.config/yabai/yabairc
@@ -0,0 +1,35 @@
+#!/usr/bin/env sh
+
+# global settings
+yabai -m config                                 \
+    external_bar                 off:40:0       \
+    menubar_opacity              1.0            \
+    mouse_follows_focus          off            \
+    focus_follows_mouse          off            \
+    display_arrangement_order    default        \
+    window_origin_display        default        \
+    window_placement             first_child    \
+    window_insertion_point       focused        \
+    window_zoom_persist          on             \
+    window_shadow                off            \
+    window_animation_duration    0.0            \
+    window_animation_easing      ease_out_circ  \
+    window_opacity_duration      0.0            \
+    active_window_opacity        1.0            \
+    normal_window_opacity        0.90           \
+    window_opacity               off            \
+    insert_feedback_color        0xffd75f5f     \
+    split_ratio                  0.0            \
+    split_type                   auto           \
+    auto_balance                 off            \
+    top_padding                  00             \
+    bottom_padding               00             \
+    left_padding                 00             \
+    right_padding                00             \
+    window_gap                   00             \
+    layout                       bsp            \
+    mouse_modifier               fn             \
+    mouse_action1                move           \
+    mouse_action2                resize         \
+    mouse_drop_action            swap
+
--- a/src_files/.config/zsh/.zshenv
+++ b/src_files/.config/zsh/.zshenv
@@ -1,22 +1,17 @@
 # default programs
 export BROWSER='brave'
 export EDITOR='nvim'
-export TERMINAL='ghostty'

 # env vars used for my organization structure
 export DIR_HOME_BOX="$HOME/dbox"
-export DIR_MUSIC="$DIR_HOME_BOX/media/music"
 export DIR_DEV="$HOME/dev"
-export DIR_GIT_PROJECTS="$DIR_DEV/git"
-export DIR_NOTES="$DIR_HOME_BOX/notes"

 # util dirs; do not change without checking impact on xdg base dirs
 export DIR_LOCAL="$HOME/.local"
 export DIR_BIN="$DIR_LOCAL/bin"
+export DIR_BUILD="$DIR_LOCAL/build"
 export DIR_SCRIPTS="$DIR_LOCAL/scripts"
 export DIR_TMP="$DIR_LOCAL/tmp"
-export DIR_USER_OPT="$HOME/opt"
-export DIR_USER_LIB="$DIR_LOCAL/lib"

 # xdg base directory vars
 export XDG_CONFIG_HOME="$HOME/.config"
@@ -24,7 +19,7 @@ export XDG_CACHE_HOME="$HOME/.cache"
 export XDG_DATA_HOME="$DIR_LOCAL/share"
 export XDG_STATE_HOME="$DIR_LOCAL/state"
 export XDG_DATA_DIRS="/usr/local/share:/usr/share"
-#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS?
+#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macos?

 # zsh
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
@@ -32,13 +27,11 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
 # git
 export GIT_EDITOR="$EDITOR"

-# obsidian
-export OBSIDIAN_WORKSPACES_TO_CONFIGURE=("$DIR_NOTES")
-
-# reaper
-DIR_REAPER_PORTABLE_SHARED="$DIR_USER_OPT/reaper-portable/shared"
-DIR_REAPER_PORTABLE_LINUX="$DIR_USER_OPT/reaper-portable/linux"
-DIR_REAPER_PORTABLE_MACOS="$DIR_USER_OPT/reaper-portable/macos"
+# language support/tools
+export ASDF_DIR="$XDG_CONFIG_HOME/asdf"
+export ASDF_CONFIG_FILE="$ASDF_DIR/.asdfrc"
+export ASDF_DATA_DIR="$DIR_LOCAL/.asdf"
+export ASDF_TOOL_VERSIONS_FILENAME=".asdf_tool_versions"

 # clean-up of home dir
 export __CF_USER_TEXT_ENCODING="0x0:0x0"
--- a/src_files/.config/zsh/.zshrc
+++ b/src_files/.config/zsh/.zshrc
@@ -2,7 +2,7 @@
 set -o vi

 # path updates
-export PATH=$DIR_BIN:$DIR_SCRIPTS:$PATH:$XDG_DATA_HOME
+export PATH=$DIR_BIN:$DIR_SCRIPTS:$PATH
 export PATH=$PATH:/opt/homebrew/opt/ccache/libexec:/opt/homebrew/bin

 # shortcuts for common commands
@@ -13,26 +13,24 @@ alias cls='clear;ls'

 # shortcuts for executables
 alias nv='nvim'
-alias n='nvim'
-alias tms='tmux-session-init'
+alias tms='tmux-sessionizer'

-# executable overrides
+# executable name overrides
 alias ls='ls -F'
+alias youtube-dl='youtube-dl --write-info-json'

 # misc commands
-alias cal='khal calendar'
 alias pdt='ping -c 2 drinkingtea.net'
 alias ppw='ping -c 2 pinewoods.xyz'
 alias weather='curl wttr.in'
 alias shrug='echo "¯\\_(ツ)_/¯"'
 alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
-alias ncspotkeys="$EDITOR $DIR_GIT_PROJECTS/other/ncspot/doc/users.md"

 # source extensions and system-specific files
+[[ -e "$HOME/.profile" ]] && source "$HOME/.profile" # TODO: do i want to source .profile?
 [[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev"
 [[ -a "$ZDOTDIR/zsh-life-system" ]] && source "$ZDOTDIR/zsh-life-system"

-# dev/lang setup
-[[ -n $(command -v mise) ]] && eval "$(mise activate zsh)"
+# TODO: refactor the below; simplify or at least move elsewhere
 export DEVKITARM=/opt/devkitpro/devkitARM
-
+. $(brew --prefix asdf)/libexec/asdf.sh
--- a/src_files/.config/zsh/zsh-general-dev
+++ b/src_files/.config/zsh/zsh-general-dev
@@ -8,12 +8,9 @@ alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"

 # git stuff
 alias gfo='git fetch origin'
-alias gfl='git fetch origin; git log'
-alias gpo='git pull origin'
-alias gppo='git push origin'
-alias gst='git status'
 alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -'
-alias gptemp='git-push-to-temp'
+alias gpdev='git-push-to-temp'
+alias gpo='git pull origin'

 # code/test/linter run and build commands
 alias bel='bundle exec standardrb'
--- a/installs_and_builds/studio_music/placeholder-TODO
+++ b/installs_and_builds/studio_music/placeholder-TODO
--- a/src_files/.local/bin/launch-gimp
+++ b/src_files/.local/bin/launch-gimp
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# for reference, default linux directory was in $XDG_CONFIG_HOME/GIMP/
-nohup \
-    env GIMP2_DIRECTORY=$XDG_CONFIG_HOME/gimp \
-    gimp \
-    > /dev/null 2>&1 \
-    &
--- a/src_files/.local/bin/launch-reaper
+++ b/src_files/.local/bin/launch-reaper
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-# trying the "portable install" option; using this launch script to point to that
-source "$XDG_CONFIG_HOME/zsh/.zshenv"
-
-reaper_portable_exec_linux="$DIR_REAPER_PORTABLE_LINUX/REAPER/reaper"
-[[ ! -x "$reaper_portable_exec_linux" ]] && {
-    echo "reaper missing or not executable: $reaper_portable_exec_linux" >&2
-    exit 1
-}
-
-reaper_portable_config_linux="$DIR_REAPER_PORTABLE_LINUX/config"
-reaper_portable_ini_file_linux="$reaper_portable_config_linux/reaper.ini"
-[[ ! -r "$reaper_portable_ini_file_linux" ]] && {
-    [[ ! -d "$reaper_portable_config_linux" ]] && mkdir -p "$reaper_portable_config_linux"
-    touch "$reaper_portable_ini_file_linux"
-}
-
-nohup \
-    $reaper_portable_exec_linux \
-    -cfgfile $reaper_portable_ini_file_linux \
-    > /dev/null 2>&1 \
-    &
--- a/src_files/.local/bin/mvd
+++ b/src_files/.local/bin/mvd
@@ -1,6 +0,0 @@
-#!/bin/zsh
-
-# wrapper for mv; for the given target, create any dirs which do not already exist
-mvd_target_dir=$(dirname "${@: -1}")
-[[ ! -d "$mvd_target_dir" ]] && mkdir -p "$mvd_target_dir"
-exec mv "$@"
--- a/src_files/.local/scripts/.tmux-session-hydrate-default
+++ b/src_files/.local/scripts/.tmux-session-hydrate-default
@@ -0,0 +1,21 @@
+local omitted_dirs=(
+    $HOME
+    $DIR_HOME_BOX
+    $DIR_DEV
+    $DIR_DEV/git
+)
+[[ ! ${omitted_dirs[(re)$(pwd)]} ]] &&
+    tmux new-window -d -n cmd &&
+    tmux rename-window $EDITOR &&
+    $EDITOR .
+
+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
--- a/src_files/.local/scripts/convert
+++ b/src_files/.local/scripts/convert
@@ -1,33 +0,0 @@
-#! /bin/zsh
-
-# simple unit-conversion util, partly made for fun, not much here so far
-
-conversionUnits=$1
-inputsToConvert=($argv[2,-1])
-
-function cmToIn() {
-	result=$(( 1 / 2.54 * $1 ))
-	printf '%.1f cm => %.2f in\n' $1 $result
-}
-
-function inToCm() {
-	result=$(( 2.54 * $1 ))
-	printf '%.2f in => %.1f cm\n' $1 $result
-}
-
-function unsupportedUnits() {
-	echo "unsupported conversion units given: $conversionUnits"
-	exit 1
-}
-
-funcRef=exit # not sure what a good default function is, using exit
-case $conversionUnits in
-	(cm|cm-in) funcRef=cmToIn
-		;;
-	(in|in-cm) funcRef=inToCm
-		;;
-	(*) funcRef=unsupportedUnits
-		;;
-esac
-
-for i in $inputsToConvert; do $funcRef $i; done
--- a/src_files/.local/scripts/gfind
+++ b/src_files/.local/scripts/gfind
@@ -1,14 +0,0 @@
-#! /bin/zsh
-
-# simple wrapper to run both find and grep
-# usage: gfind <search-term> [search-directory]
-# if no search-directory given, uses . by default
-
-searchTerm=$1
-searchDirectory=$(if [[ -n $2 ]] then echo $2; else echo "."; fi)
-
-printf '//// find results for: %s in directory: %s\n' $searchTerm $searchDirectory
-find $searchDirectory -iname "*$searchTerm*"
-
-printf '\n//// grep results for: %s in directory: %s\n' $searchTerm $searchDirectory
-grep -rIi $searchTerm $searchDirectory
--- a/src_files/.local/scripts/tmux-session-close
+++ b/src_files/.local/scripts/tmux-session-close
@@ -1,5 +0,0 @@
-#!/bin/zsh
-
-tmux_existing_sessions=$(tmux list-sessions 2> /dev/null)
-[[ ${#tmux_existing_sessions[@]} -gt 1 ]] && $DIR_SCRIPTS/tmux-session-init hub
-tmux kill-session -t $1
--- a/src_files/.local/scripts/tmux-session-init
+++ b/src_files/.local/scripts/tmux-session-init
@@ -1,35 +0,0 @@
-#!/bin/zsh
-
-tmux_switch_to() {
-    [[ -z $TMUX ]] && tmux attach-session -t $1 || tmux switch-client -t $1
-}
-
-tmux_hydrate() {
-    local tmux_hydrate_path="$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
-    [[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate"
-    [[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 "source $tmux_hydrate_path" c-M
-}
-
-tmux_existing_sessions=$(tmux list-sessions 2> /dev/null || echo '')
-tmux_search_dirs=(
-    $DIR_HOME_BOX
-    $DIR_DEV
-    $DIR_GIT_PROJECTS/*
-)
-tmux_target_name=''
-tmux_target_path=''
-
-[[ $# -eq 1 ]] && tmux_target_path=$1 ||
-    tmux_target_path=$(find $tmux_search_dirs -mindepth 1 -maxdepth 1 -type d | fzf)
-
-if [[ $tmux_target_path = "." ]]; then tmux_target_name=$(basename $(pwd)) && tmux_target_path=$(pwd);
-elif [[ $tmux_target_path = "hub" ]]; then tmux_target_name="hub" && tmux_target_path="$HOME";
-elif [[ -n $tmux_target_path ]]; then tmux_target_name=$(basename "$tmux_target_path" | tr . _);
-fi
-
-[[ -z $tmux_target_name ]] && exit 0
-
-! (echo $tmux_existing_sessions | grep -q "$tmux_target_name") &&
-    tmux new-session -d -s $tmux_target_name -c $tmux_target_path &&
-    tmux_hydrate $tmux_target_name $tmux_target_path
-tmux_switch_to $tmux_target_name
--- a/src_files/.local/scripts/tmux-sessionizer
+++ b/src_files/.local/scripts/tmux-sessionizer
@@ -0,0 +1,37 @@
+#!/bin/zsh
+
+switch_to() {
+    [[ -z $TMUX ]] && tmux attach-session -t $1 || tmux switch-client -t $1
+}
+
+hydrate() {
+    local tmux_hydrate_path="$DIR_SCRIPTS/.tmux-session-hydrate-default"
+    [[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate"
+    # TODO: add special case: [[ "$1" = "hub" ]] && tmux_hydrate_path="$DIR_SCRIPTS/.tmux-session-hydrate-hub"
+    [[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 "source $tmux_hydrate_path" c-M
+}
+
+local name_regex="^\([-_A-Za-z0-9]*\):.*$"
+local existing_sessions=$([[ -n $(pgrep tmux) ]] && tmux list-sessions | sed "s/$name_regex/\1/" || echo '')
+local search_dirs=(
+    $DIR_HOME_BOX
+    $DIR_DEV
+    $DIR_DEV/git/*
+)
+local target_name=''
+local target_path=''
+
+[[ $# -eq 1 ]] && target_path=$1 ||
+    target_path=$(find $search_dirs -mindepth 1 -maxdepth 1 -type d | fzf)
+
+if [[ $target_path = "existing" ]]; then target_name=$(echo $existing_sessions | fzf);
+elif [[ $target_path = "hub" ]]; then target_name="hub" && target_path="$HOME";
+elif [[ -n $target_path ]]; then target_name=$(basename "$target_path" | tr . _);
+fi
+
+[[ -z $target_name ]] && exit 0
+
+! (echo $existing_sessions | grep -q "$target_name") &&
+    tmux new-session -d -s $target_name -c $target_path &&
+    hydrate $target_name $target_path
+switch_to $target_name
--- a/src_files/bin_overrides_macos/launch-gimp
+++ b/src_files/bin_overrides_macos/launch-gimp
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# for reference, default macos directory was in $HOME/Library/Application Support/GIMP/
-nohup \
-    env GIMP3_DIRECTORY="$XDG_CONFIG_HOME/gimp" \
-    /Applications/GIMP.app/Contents/MacOS/gimp \
-    > /dev/null 2>&1 \
-    &
--- a/src_files/bin_overrides_macos/launch-reaper
+++ b/src_files/bin_overrides_macos/launch-reaper
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# trying the "portable install" option; using this launch script to point to that
-source "$XDG_CONFIG_HOME/zsh/.zshenv"
-
-reaper_portable_exec_macos="$DIR_REAPER_PORTABLE_MACOS/REAPER.app/Contents/MacOS/REAPER"
-[[ ! -x "$reaper_portable_exec_macos" ]] && {
-    echo "reaper missing or not executable: $reaper_portable_exec_macos" >&2
-    exit 1
-}
-
-reaper_portable_ini_file_macos="$DIR_REAPER_PORTABLE_MACOS/reaper.ini"
-[[ ! -r "$reaper_portable_ini_file_macos" ]] && touch "$reaper_portable_ini_file_macos"
-
-nohup \
-    $reaper_portable_exec_macos \
-    > /dev/null 2>&1 \
-    &
--- a/theme-switcher-testing/neovim-all.lua
+++ b/theme-switcher-testing/neovim-all.lua
@@ -1,68 +0,0 @@
-return {
-    {
-        "ellisonleao/gruvbox.nvim",
-        name = "gruvbox",
-        -- lazy = false,
-        -- priority = 1000,
-        opts = {
-            terminal_colors = true, -- add neovim terminal colors
-            undercurl = true,
-            underline = true,
-            bold = true,
-            italic = {
-                strings = true,
-                emphasis = true,
-                comments = true,
-                operators = false,
-                folds = true,
-            },
-            strikethrough = true,
-            invert_selection = false,
-            invert_signs = false,
-            invert_tabline = false,
-            inverse = true, -- invert background for search, diffs, statuslines and errors
-            contrast = "", -- "hard", "soft", or ""
-            palette_overrides = {},
-            overrides = {},
-            dim_inactive = false,
-            transparent_mode = false,
-        },
-    },
-    {
-        "folke/tokyonight.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            style = "night", -- "night", "storm", "moon", "day"
-            styles = {
-                functions = {} -- disable italic for functions
-            },
-            on_colors = function(colors)
-                colors.hint = colors.orange
-                colors.error = "#ff0000"
-                colors.fg_gutter = "#9098B8"
-            end,
-        },
-    },
-    {
-        "tiagovla/tokyodark.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            custom_highlights = function(highlights, _palette)
-                highlights.Comment['fg'] = "#8a9097"
-                highlights.LineNr['fg'] = "#8088A8"
-                return highlights
-            end,
-        },
-    },
-    {
-        'ribru17/bamboo.nvim',
-        -- lazy = false,
-        -- priority = 1000,
-        config = function()
-            require('bamboo').setup { }
-            require('bamboo').load()
-        end,
-    },
-}
--- a/theme-switcher-testing/neovim-bamboo.lua
+++ b/theme-switcher-testing/neovim-bamboo.lua
@@ -1,11 +0,0 @@
-return {
-        {
-        'ribru17/bamboo.nvim',
-        -- lazy = false,
-        -- priority = 1000,
-        config = function()
-            require('bamboo').setup { }
-            require('bamboo').load()
-        end,
-    },
-}
--- a/theme-switcher-testing/neovim-catppuccin.lua
+++ b/theme-switcher-testing/neovim-catppuccin.lua
@@ -1,19 +0,0 @@
-return {
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-		priority = 1000,
-		config = function()
-			require("catppuccin").setup({
-				flavour = "latte", -- other options: "mocha", "frappe", "macchiato"
-			})
-			vim.cmd.colorscheme("catppuccin-latte")
-		end,
-	},
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "catppuccin-latte",
-		},
-	},
-}
--- a/theme-switcher-testing/neovim-everforest.lua
+++ b/theme-switcher-testing/neovim-everforest.lua
@@ -1,15 +0,0 @@
-return {
-	{
-        "neanias/everforest-nvim",
-		opts = {
-			background = "soft",
-		},
-    },
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "everforest",
-			background = "soft",
-		},
-	},
-}
--- a/theme-switcher-testing/neovim-gruvbox.lua
+++ b/theme-switcher-testing/neovim-gruvbox.lua
@@ -1,31 +0,0 @@
-return {
-    {
-        "ellisonleao/gruvbox.nvim",
-        name = "gruvbox",
-        -- lazy = false,
-        -- priority = 1000,
-        opts = {
-            terminal_colors = true, -- add neovim terminal colors
-            undercurl = true,
-            underline = true,
-            bold = true,
-            italic = {
-                strings = true,
-                emphasis = true,
-                comments = true,
-                operators = false,
-                folds = true,
-            },
-            strikethrough = true,
-            invert_selection = false,
-            invert_signs = false,
-            invert_tabline = false,
-            inverse = true, -- invert background for search, diffs, statuslines and errors
-            contrast = "", -- "hard", "soft", or ""
-            palette_overrides = {},
-            overrides = {},
-            dim_inactive = false,
-            transparent_mode = false,
-        },
-    },
-}
--- a/theme-switcher-testing/neovim-matteblack.lua
+++ b/theme-switcher-testing/neovim-matteblack.lua
@@ -1,9 +0,0 @@
-return {
-  { "tahayvr/matteblack.nvim", lazy = false, priority = 1000 },
-  {
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "matteblack",
-		},
-	},
-}
--- a/theme-switcher-testing/neovim-nordfox.lua
+++ b/theme-switcher-testing/neovim-nordfox.lua
@@ -1,9 +0,0 @@
-return {
-	{ "EdenEast/nightfox.nvim" },
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "nordfox",
-		},
-	},
-}
--- a/theme-switcher-testing/neovim-tokyodark.lua
+++ b/theme-switcher-testing/neovim-tokyodark.lua
@@ -1,14 +0,0 @@
-return {
-    {
-        "tiagovla/tokyodark.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            custom_highlights = function(highlights, _palette)
-                highlights.Comment['fg'] = "#8a9097"
-                highlights.LineNr['fg'] = "#8088A8"
-                return highlights
-            end,
-        },
-    },
-}
--- a/theme-switcher-testing/neovim-tokyonight.lua
+++ b/theme-switcher-testing/neovim-tokyonight.lua
@@ -1,18 +0,0 @@
-return {
-    {
-        "folke/tokyonight.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            style = "night", -- "night", "storm", "moon", "day"
-            styles = {
-                functions = {} -- disable italic for functions
-            },
-            on_colors = function(colors)
-                colors.hint = colors.orange
-                colors.error = "#ff0000"
-                colors.fg_gutter = "#9098B8"
-            end,
-        },
-    },
-}
--- a/theme-switcher-testing/neovim.lua
+++ b/theme-switcher-testing/neovim.lua
@@ -1,14 +0,0 @@
-return {
-    {
-        "tiagovla/tokyodark.nvim",
-        lazy = false,
-        priority = 1000,
-        opts = {
-            custom_highlights = function(highlights, _palette)
-                highlights.Comment['fg'] = "#8a9097"
-                highlights.LineNr['fg'] = "#8088A8"
-                return highlights
-            end,
-        },
-    },
-}
--- a/theme-switcher-testing/plugins/LazyVim/lua/LazyVim/init.lua
+++ b/theme-switcher-testing/plugins/LazyVim/lua/LazyVim/init.lua
@@ -1,8 +0,0 @@
-local M = {}
-
-M.opts = {}
-
-function M.setup(opts)
-end
-
-return M
--- a/theme-switcher-testing/zxcv.sh
+++ b/theme-switcher-testing/zxcv.sh
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# OMARCHY_CURRENT_THEME_NEOVIM="~/.config/omarchy/current/theme/neovim.lua"
-OMARCHY_CURRENT_THEME_NEOVIM="./neovim.lua"
-
-if [[ ! -f "$OMARCHY_CURRENT_THEME_NEOVIM" ]]; then
-  echo "neovim theme not found for live update: $OMARCHY_CURRENT_THEME_NEOVIM" >&2
-  exit 1
-fi
-
-read -r plugin_name colorscheme_name <<< "$(
-nvim -l <(cat << NESTED_LUA_BLOCK
-local ok, plugins = pcall(dofile, '${OMARCHY_CURRENT_THEME_NEOVIM}')
-if not ok then
-  print('ERROR: could not load neovim theme file for live update')
-  os.exit(1)
-end
-
-local first = plugins[1]
-local plugin_name = (type(first.name) == 'string' and first.name)
-  or (type(first[1]) == 'string' and first[1]:match('.*/(.*)'))
-  or 'plugin_name_not_found'
-
-if plugin_name == 'plugin_name_not_found' then
-  print('ERROR: could not detect neovim theme plugin for live update')
-  os.exit(1)
-end
-
-local last = plugins[#plugins]
-local colorscheme = ((type(last.opts) == 'table' and type(last.opts.colorscheme) == 'string') and last.opts.colorscheme)
-  or plugin_name:gsub("%.%w+$", "")
-
-vim.print(plugin_name .. " " .. colorscheme)
-NESTED_LUA_BLOCK
-) > /dev/stdout 2>&1 | tr -d '\r'
-)"
-
-nvim --headless +"lua require(\"lazy\").install({ show = false, wait = true })" +q > /dev/null 2>&1
-
-nvim_stdpath_run=$(dirname $(nvim -l <(echo "vim.cmd.echo('stdpath(\"run\")')") > /dev/stdout 2>&1))
-find "$nvim_stdpath_run" -type s -name "nvim*" 2> /dev/null |
-while IFS= read -r nvim_server; do
-    # echo "running for $nvim_server"
-    timeout 2s nvim --server "$nvim_server" \
-        --remote-expr "execute('lua require(\"lazy\").install({ show = false, wait = true })')" \
-        > /dev/null 2>&1
-    timeout 4s nvim --server "$nvim_server" \
-        --remote-expr "execute('lua require(\"lazy\").load({ show = false, wait = true, plugins = { \"$plugin_name\" } })')" \
-        > /dev/null 2>&1
-    timeout 2s nvim --server "$nvim_server" \
-        --remote-expr "execute('colorscheme $colorscheme_name')" \
-        > /dev/null 2>&1
-    # echo "finished for $nvim_server"
-done
-
-##########################################################################################
-
-# ln -snf ~/dev/git/other/omarchy/neovim.lua ~/.config/nvim/lua/plugins_lazy/colorschemes.lua
-# ref only
-# lua require("lazy").install({ show = false, wait = true })
-# lua require("lazy").load({ show = false, wait = true, plugins = { "nightfox.nvim" } })
-# lua require("lazy").build({ show = false, wait = true, plugins = { name = "tokyonight.nvim" } })
-# lua require("lazy").reload({ show = false, wait = true, plugins = { name = "tokyonight.nvim" } })
-
-# get neovim theme file, parse as lua? load the tables and get first value in each, as well as a name if one is set
-# if name is set, that is plugin name which lazy.nvim knows, if not, then take the value after the / in the git repo name
-
-# also, in the final table, parse out the colorscheme value, that is what needs to be passed to my loop below
-# if none is present, then default to the plugin name from above, but trim off any .suffix like .nvim
-
-# # nvim_sockets=$(find /var/folders -type s -user "$USERNAME" -name "nvim*" -path "*nvim.$USERNAME*" 2> /dev/null)
-# nvim_sockets=$(find /var/folders -type s -name "nvim*" -path "*nvim.*" 2> /dev/null)
-# # for s in "${nvim_sockets[@]}"; do
-# for s in $nvim_sockets; do
-#     echo "will run for $s"
-#     # nvim --server "$s" --remote-expr "execute('colorscheme $1')"
-# done
-
-# find /var/folders -type s -name "nvim*" -path "*nvim.*" 2> /dev/null | while IFS= read -r server; do
-
-# nvim -l <(echo "vim.cmd.echo('stdpath(\"run\")')") > /dev/stdout 2>&1 |
-#     dirname $@ |
-#     find $@ -type s -name "nvim*" 2> /dev/null |
-#     while IFS= read -r server; do
-#         timeout 0.5s nvim --server "$server" --remote-expr "execute('colorscheme $1')" > /dev/null 2>&1
-#     done
--- a/4
+++ b/4
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+cd "$XDG_CONFIG_HOME/vim/pack/plugins/start"
+sh .plugin-git-clone-script
Author	SHA1	Message	Date
david	625d1053aa	Add partial config for music streaming player (ncspot)	2025-08-15 17:05:18 -05:00
david	f7a98ed51c	Fix some asdf issues	2025-08-15 17:05:18 -05:00
david	f727f4ac0f	small settings/keybindings updates for tmux, vim, zsh	2025-08-15 17:05:12 -05:00
david	3bdad1352c	Remove job-rs things, make zsh-general-dev file	2025-08-04 09:08:46 +02:00