Simplify structure for nvim config files

Switch macos wm from yabai to aerospace
Add system-type filters, add git-clone handling to main script
2025-09-16 12:24:46 -05:00 · 2025-09-11 15:55:39 -05:00 · 2025-09-06 15:56:40 -05:00 · 2025-09-05 13:04:24 -05:00 · 2025-08-28 23:16:10 -05:00 · 2025-08-28 21:38:15 -05:00
63 changed files with 1387 additions and 484 deletions
--- a/README.md
+++ b/README.md
@@ -1,53 +1,33 @@
-# repo containing configs and scripts to set up a box
+# dotfiles, plus scripts for box setup
+
+### prereqs, linux distros
+- zsh is installed (scripts are written for zsh)
+- sudo access is configured for current user
+
+### prereqs, macos
+- zsh is installed (scripts are written for zsh)
+- install the package manager, [homebrew](https://brew.sh/)
+- for aerospace window manager, have only 1 workspace/desktop
+- manual settings, refer to [macos-system-settings](ref/macos-system-settings.txt)

 ### script run
- [prerequisites below are fulfilled]
- git clone this repo
- from the repo's root directory, run `./box_setup`
-
-### 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
+- if repo present on system, run from the repo's root:
+    - ```
+      ./box_setup.sh <OS-name>
+      ```
+- if repo not present, run:
+    - ```
+      curl -LO https://git.drinkingtea.net/david/box-setup/raw/branch/master/box_setup.sh
+      sh box_setup.sh <OS-name>
+      ```
+    - then delete the script file afterwards (repo should have been copied to dev dir)

 ### todo items
- 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
+- choose window manager for linux, then configure
+- config for: terminal (ghostty); shell; mpd, mpc, ncmpcpp; mpv
 - 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.)
+    - or configure in gimp, copy resulting dir to `src_files/.config/GIMP`, call it a day
 - decide on and implement approach for languages and versioning
+    - language-specific? asdf? no, not asdf, mise seems better from what i hear so far
    - docker? or alternatives like podman? any license concerns?
-    - asdf, or language-specific version managers?
-    - hybrid of the above?
--- a/9
+++ b/9
@@ -1,9 +0,0 @@
-#!/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
@@ -0,0 +1,67 @@
+#!/bin/zsh
+
+[[ -z $1 ]] && {
+    echo "OS must be passed as an arg, run \`./box_setup.sh --help\` for more info"
+    exit 1
+}
+
+[[ $1 = "--help" ]] && {
+    echo "usage: ./box_setup.sh <OS-name> [system-type]\n"
+    echo "OS-name options: arch, artix, debian, macos"
+    echo "system-type options: personal, studio-music, work-placeholder\n"
+    echo "examples:\n./box_setup.sh arch studio-music\n./box_setup.sh macos\n"
+    exit 0
+}
+
+
+# TODO: test this git stuff, see if it works
+temp_placement_git_dir="no"
+[[ ! -d ".git" && "$(basename $(pwd))" != "box-setup" ]] && {
+    temp_placement_git_dir="yes"
+    git clone "https://git.drinkingtea.net/david/box-setup.git" || {
+        echo "failed to clone box-setup git repo"
+        exit 1
+    }
+    pushd box-setup > /dev/null
+}
+
+# set env vars for installs
+install_cmd=''
+update_pkg_manager_and_defs_cmd=''
+update_pkgs_cmd=''
+case $1 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"
+
+# make dirs and copy configs/dotfiles
+source ./src_files/.config/zsh/.zshenv
+./make_dirs.sh
+./copy_configs.sh $2
+
+# install programs
+source $ZDOTDIR/.zshenv
+source $ZDOTDIR/.zshrc
+./install_programs.sh $2
+
+[[ $temp_placement_git_dir == "yes" ]] && {
+    popd > /dev/null
+    mv "box-setup" "$DIR_GIT_PROJECTS/me/"
+}
--- a/copy_configs.sh
+++ b/copy_configs.sh
@@ -1,7 +1,6 @@
 #!/bin/zsh

-execute() { log "execute $@" && "$@" }
-log() { echo "$@" }
+execute() { echo "executing: $@" && "$@" }

 copy_file() {
    local from=$1
@@ -30,14 +29,13 @@ copy_dir() {
 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"
+    echo "sym-linking $link_dir -> $src_dir"
    ln -s $src_dir $link_dir
 }

-log "---------------- dotfiles ----------------"
+echo "---- copying dotfiles ------------------------------------------------"

 copy_file src_files/.config/zsh/.zshenv $HOME # duplicate, copy anyway, ensures $ZDOTDIR

@@ -45,8 +43,12 @@ 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" ]] &&
+[[ "$BOX_SETUP_OS" = "macos" ]] && {
+    copy_dir src_files/executable_wrappers_macos $DIR_BIN
    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
+}
+
+# [[ $1 = "studio-music" ]] &&
+#     [[ "$BOX_SETUP_OS" = "macos" ]] &&
+#     link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" && # TODO: get reaper config set up

--- a/31
+++ b/31
@@ -1,31 +0,0 @@
-#!/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
@@ -0,0 +1,34 @@
+#!/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

-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\""
+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\""

-[ ! -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
+[ ! -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

-make -C $neovim_dir clean
-make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
-sudo make -C $neovim_dir install
+make -C $install_neovim_dir clean
+make -C $install_neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
+sudo make -C $install_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/personal/placeholder-TODO
+++ b/installs_and_builds/personal/placeholder-TODO
--- a/installs_and_builds/s02_utils
+++ b/installs_and_builds/s02_utils
@@ -8,7 +8,9 @@ ${=BOX_SETUP_INSTALL_COMMAND} \
    fzf \
    make \
    cmake \
-    gettext
+    gettext \
+    grep \
+    ripgrep

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

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

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

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

 [[ "$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,7 +1,8 @@
 #!/bin/zsh

-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"
+# TODO: replace firefox with brave or another browser
+# install_option_prefix=''
+# [[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
+# firefox_package_name='firefox'
+# [[ "$BOX_SETUP_OS" = "debian" ]] && firefox_package_name='firefox-esr'
+# ${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" "$firefox_package_name"
--- a/installs_and_builds/s14_audio_player
+++ b/installs_and_builds/s14_audio_player
@@ -1,5 +1,9 @@
 #!/bin/zsh

-# possible mpd clients to consider: ncmpc, inori
+# local music
 ${=BOX_SETUP_INSTALL_COMMAND} mpd mpc ncmpcpp
-# TODO: ${=BOX_SETUP_INSTALL_COMMAND} <spotify stuff here>
+# possible mpd clients to consider: ncmpc, inori
+
+# spotify
+# TODO: decide if i want to use the package-manager install below, or build from source
+# ${=BOX_SETUP_INSTALL_COMMAND} ncspot
--- a/installs_and_builds/s18_file_manager
+++ b/installs_and_builds/s18_file_manager
@@ -1,4 +1,4 @@
 #!/bin/zsh

-# TODO: pick filemanager; consider: lf, ranger, others?
+# TODO: do i even want a filemanager? if yes, pick one; 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
-local option_prefix=''
-[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
-${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" audacity
+install_option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && install_option_prefix='--cask'
+${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" audacity
--- a/installs_and_builds/s22_image_editor
+++ b/installs_and_builds/s22_image_editor
@@ -1,7 +1,7 @@
 #!/bin/zsh

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

 # ${=BOX_SETUP_INSTALL_COMMAND} imagemagick # TODO: consider this program too
--- a/installs_and_builds/s49_languages_general
+++ b/installs_and_builds/s49_languages_general
@@ -2,9 +2,10 @@

 # TODO: review and decide if the things below are needed

-#local lua_package="lua5.1"
-#[[ "$BOX_SETUP_OS" = "macos" ]] && lua_package="lua@5.1"
+# install_lua_package="lua5.1"
+#[[ "$BOX_SETUP_OS" = "macos" ]] && install_lua_package="lua@5.1"

-#${=BOX_SETUP_INSTALL_COMMAND} "$lua_package" liblua5.1-0-dev
+#${=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
 #luarocks install luacheck
--- a/installs_and_builds/studio_music/placeholder-TODO
+++ b/installs_and_builds/studio_music/placeholder-TODO
--- a/14
+++ b/14
@@ -1,14 +0,0 @@
-#!/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
@@ -0,0 +1,26 @@
+#!/bin/zsh
+
+source ./src_files/.config/zsh/.zshenv # ensure env vars set for use below
+
+# some standard/common dirs, some overlap/use in XDG dirs
+[[ ! -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"
+
+# dirs related to XDG Base Directory specification
+[[ ! -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"
+
+# dirs for how i'm organizing my system
+[[ ! -d "$DIR_HOME_BOX" ]] && mkdir $DIR_HOME_BOX
+[[ ! -d "$DIR_MUSIC" ]] && mkdir $DIR_MUSIC
+[[ ! -d "$DIR_DEV" ]] && mkdir $DIR_DEV
+[[ ! -d "$DIR_GIT_PROJECTS" ]] && mkdir $DIR_GIT_PROJECTS
+[[ ! -d "$DIR_GIT_PROJECTS/me" ]] && mkdir $DIR_DEV/git/me
+[[ ! -d "$DIR_GIT_PROJECTS/other" ]] && mkdir $DIR_DEV/git/other
+[[ ! -d "$DIR_SCRATCH_NOTES" ]] && mkdir -p $DIR_SCRATCH_NOTES
+[[ ! -d "$DIR_SCRATCH_DRAWINGS" ]] && mkdir -p $DIR_SCRATCH_DRAWINGS
--- a/8
+++ b/8
@@ -1,8 +0,0 @@
-#!/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
@@ -0,0 +1,14 @@
+// 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/workflow-desktops-scheme.txt
+++ b/ref/workflow-desktops-scheme.txt
@@ -0,0 +1,24 @@
+//////////////////////////////////////////////////////////////////////////////////////////
+// idea from the primeagen, designated label/workspace/desktop per app/purpose
+
+// current layout/plan                                         // wm default layout/mode
+1. drawing/thinking (scratch pads for text and images)         stack (fullscreen)
+2. music makeing - misc                                        stack (fullscreen)
+3. music making - daw                                          floating
+4. music/audio listening                                       stack (fullscreen)
+5. general misc (catch-all)                                    stack (fullscreen)
+6. comms (email, chats, etc)                                   stack (fullscreen)
+7. dev - misc                                                  stack (fullscreen)
+8. terminal (primary, but audio/one-off/etc can be anywhere)   stack (fullscreen)
+9. web browser                                                 stack (fullscreen)
+
+// 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)
+
--- a/28
+++ b/28
@@ -1,28 +0,0 @@
-[[ -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
@@ -0,0 +1,129 @@
+# 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 = 'auto' # 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-slash = 'layout tiles horizontal vertical'
+    alt-comma = 'layout accordion horizontal vertical'
+
+    # See: https://nikitabobko.github.io/AeroSpace/commands#focus
+    alt-j = 'focus down'
+    alt-k = 'focus up'
+    # 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
+    alt-shift-h = 'move left'
+    alt-shift-j = 'move down'
+    alt-shift-k = 'move up'
+    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'
+
+    # 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'
+
+    # 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']
+    t = ['flatten-workspace-tree', 'layout tiling', 'mode main']
+    s = ['layout v_accordion', 'mode main']
+    g = ['layout v_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/src_files/.config/aerospace/ref-aerospace-default.toml
+++ b/src_files/.config/aerospace/ref-aerospace-default.toml
@@ -0,0 +1,206 @@
+# Place a copy of this config to ~/.aerospace.toml
+# After that, you can edit ~/.aerospace.toml to your liking
+
+# You can use it to add commands that run after AeroSpace startup.
+# Available commands : https://nikitabobko.github.io/AeroSpace/commands
+after-startup-command = []
+
+# Start AeroSpace at login
+start-at-login = false
+
+# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization
+enable-normalization-flatten-containers = true
+enable-normalization-opposite-orientation-for-nested-containers = true
+
+# See: https://nikitabobko.github.io/AeroSpace/guide#layouts
+# The 'accordion-padding' specifies the size of accordion padding
+# You can set 0 to disable the padding feature
+accordion-padding = 30
+
+# Possible values: tiles|accordion
+default-root-container-layout = 'tiles'
+
+# Possible values: horizontal|vertical|auto
+# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation,
+#               tall monitor (anything higher than wide) gets vertical orientation
+default-root-container-orientation = 'auto'
+
+# Mouse follows focus when focused monitor changes
+# Drop it from your config, if you don't like this behavior
+# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks
+# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse
+# Fallback value (if you omit the key): on-focused-monitor-changed = []
+on-focused-monitor-changed = ['move-mouse monitor-lazy-center']
+
+# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag
+# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key
+# Also see: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app
+automatically-unhide-macos-hidden-apps = false
+
+# Possible values: (qwerty|dvorak|colemak)
+# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping
+[key-mapping]
+    preset = 'qwerty'
+
+# Gaps between windows (inner-*) and between monitor edges (outer-*).
+# Possible values:
+# - Constant:     gaps.outer.top = 8
+# - Per monitor:  gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24]
+#                 In this example, 24 is a default value when there is no match.
+#                 Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'.
+#                 See:
+#                 https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors
+[gaps]
+    inner.horizontal = 0
+    inner.vertical =   0
+    outer.left =       0
+    outer.bottom =     0
+    outer.top =        0
+    outer.right =      0
+
+# 'main' binding mode declaration
+# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes
+# 'main' binding mode must be always presented
+# Fallback value (if you omit the key): mode.main.binding = {}
+[mode.main.binding]
+
+    # 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-slash = 'layout tiles horizontal vertical'
+    alt-comma = 'layout accordion horizontal vertical'
+
+    # See: https://nikitabobko.github.io/AeroSpace/commands#focus
+    alt-h = 'focus left'
+    alt-j = 'focus down'
+    alt-k = 'focus up'
+    alt-l = 'focus right'
+
+    # See: https://nikitabobko.github.io/AeroSpace/commands#move
+    alt-shift-h = 'move left'
+    alt-shift-j = 'move down'
+    alt-shift-k = 'move up'
+    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-a = 'workspace A' # In your config, you can drop workspace bindings that you don't need
+    alt-b = 'workspace B'
+    alt-c = 'workspace C'
+    alt-d = 'workspace D'
+    alt-e = 'workspace E'
+    alt-f = 'workspace F'
+    alt-g = 'workspace G'
+    alt-i = 'workspace I'
+    alt-m = 'workspace M'
+    alt-n = 'workspace N'
+    alt-o = 'workspace O'
+    alt-p = 'workspace P'
+    alt-q = 'workspace Q'
+    alt-r = 'workspace R'
+    alt-s = 'workspace S'
+    alt-t = 'workspace T'
+    alt-u = 'workspace U'
+    alt-v = 'workspace V'
+    alt-w = 'workspace W'
+    alt-x = 'workspace X'
+    alt-y = 'workspace Y'
+    alt-z = 'workspace Z'
+
+    # 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-a = 'move-node-to-workspace A'
+    alt-shift-b = 'move-node-to-workspace B'
+    alt-shift-c = 'move-node-to-workspace C'
+    alt-shift-d = 'move-node-to-workspace D'
+    alt-shift-e = 'move-node-to-workspace E'
+    alt-shift-f = 'move-node-to-workspace F'
+    alt-shift-g = 'move-node-to-workspace G'
+    alt-shift-i = 'move-node-to-workspace I'
+    alt-shift-m = 'move-node-to-workspace M'
+    alt-shift-n = 'move-node-to-workspace N'
+    alt-shift-o = 'move-node-to-workspace O'
+    alt-shift-p = 'move-node-to-workspace P'
+    alt-shift-q = 'move-node-to-workspace Q'
+    alt-shift-r = 'move-node-to-workspace R'
+    alt-shift-s = 'move-node-to-workspace S'
+    alt-shift-t = 'move-node-to-workspace T'
+    alt-shift-u = 'move-node-to-workspace U'
+    alt-shift-v = 'move-node-to-workspace V'
+    alt-shift-w = 'move-node-to-workspace W'
+    alt-shift-x = 'move-node-to-workspace X'
+    alt-shift-y = 'move-node-to-workspace Y'
+    alt-shift-z = 'move-node-to-workspace Z'
+
+    # See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
+    alt-tab = 'workspace-back-and-forth'
+    # See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor
+    alt-shift-tab = 'move-workspace-to-monitor --wrap-around next'
+
+    # 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']
+    r = ['flatten-workspace-tree', 'mode main'] # reset layout
+    f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout
+    backspace = ['close-all-windows-but-current', 'mode main']
+
+    # sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2
+    #s = ['layout sticky tiling', '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/src_files/.config/asdf/.placeholder
+++ b/src_files/.config/asdf/.placeholder
--- a/src_files/.config/git/config
+++ b/src_files/.config/git/config
@@ -1,3 +1,7 @@
+[init]
+	defaultBranch = master
 [user]
 	name = david
-	email = david@silverwolf.studio
+	email = david@pinewoods.xyz
+[push]
+    autoSetupRemote = true
--- a/src_files/.config/ncspot/config.toml
+++ b/src_files/.config/ncspot/config.toml
@@ -0,0 +1,57 @@
+# [theme] # from eltoncezar, similar to official spotify colors
+# background = "#191414"
+# primary = "#FFFFFF"
+# secondary = "light black"
+# title = "#1DB954"
+# playing = "#1DB954"
+# playing_selected = "#1ED760"
+# playing_bg = "#191414"
+# highlight = "#FFFFFF"
+# highlight_bg = "#484848"
+# error = "#FFFFFF"
+# error_bg = "red"
+# statusbar = "#191414"
+# statusbar_progress = "#1DB954"
+# statusbar_bg = "#1DB954"
+# cmdline = "#FFFFFF"
+# cmdline_bg = "#191414"
+# search_match = "light red"
+
+[theme] # from wojciech-zurek, tokyonight
+background = "#1a1b26"
+primary = "#9aa5ce"
+secondary = "#414868"
+title = "#9ece6a"
+playing = "#7aa2f7"
+playing_selected = "#bb9af7"
+playing_bg = "#24283b"
+highlight = "#c0caf5"
+highlight_bg = "#24283b"
+error = "#414868"
+error_bg = "#f7768e"
+statusbar = "#ff9e64"
+statusbar_progress = "#7aa2f7"
+statusbar_bg = "#1a1b26"
+cmdline = "#c0caf5"
+cmdline_bg = "#24283b"
+search_match = "#f7768e"
+
+# [theme] # from clooles, uses defaults/primary, supports transparency, for dynamic themes
+# background = "default"
+# primary = "foreground"
+# secondary = "light black"
+# title = "primary"
+# playing = "primary"
+# playing_selected = "primary"
+# playing_bg = "primary"
+# highlight = "#FFFFFF"
+# highlight_bg = "#484848"
+# error = "#FF0000"
+# error_bg = "red"
+# statusbar = "primary"
+# statusbar_progress = "primary"
+# statusbar_bg = "primary"
+# cmdline = "default"
+# cmdline_bg = "primary"
+# search_match = "light red"
+
--- a/src_files/.config/nvim/init.lua
+++ b/src_files/.config/nvim/init.lua
@@ -1 +1,13 @@
-print("print from init.lua file")
+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("colorscheme_settings")
+
+csgAutocmd({"BufWritePre"}, {
+    group = csGroup,
+    pattern = "*",
+    command = [[%s/\s\+$//e]],
+})
--- a/src_files/.config/nvim/lsp/clangd.lua
+++ b/src_files/.config/nvim/lsp/clangd.lua
@@ -0,0 +1,5 @@
+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
@@ -0,0 +1,6 @@
+return {
+    cmd = { "ruby-lsp" },
+    filetypes = { "ruby", "eruby" },
+    root_markers = { "Gemfile", ".git" },
+    init_options = { formatter = "auto" },
+}
--- a/src_files/.config/nvim/lua/colorscheme_settings.lua
+++ b/src_files/.config/nvim/lua/colorscheme_settings.lua
@@ -0,0 +1,25 @@
+function SetColorSchemeWrapper(scheme)
+  scheme = scheme or "tokyonight-night"
+  vim.cmd.colorscheme(scheme)
+
+  -- Allow for transparency -- TODO: do i actually want transparency?
+  vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
+  vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
+end
+SetColorSchemeWrapper("tokyonight-night")
+
+-- TODO: get this working as desired for different file types
+-- local dsGroup = vim.api.nvim_create_augroup("DavidStandardGroup", { clear = false })
+-- vim.api.nvim_create_autocmd('BufEnter', {
+--     group = dsGroup,
+--     callback = function()
+--         if vim.bo.filetype == "zig" then
+--             pcall(SetColorSchemeWrapper, "tokyonight-night")
+--         else
+--             pcall(SetColorSchemeWrapper, "rose-pine-main")
+--             pcall(SetColorSchemeWrapper, "slate")
+--             pcall(SetColorSchemeWrapper, "sorbet")
+--         end
+--     end
+-- })
+
--- a/src_files/.config/nvim/lua/key_mappings.lua
+++ b/src_files/.config/nvim/lua/key_mappings.lua
@@ -0,0 +1,140 @@
+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")
+
+------------------------------------------------------------------------------------------
+-- 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 builtin = require('telescope.builtin')
+local custom_tscope_grep = function()
+    builtin.grep_string({ search = vim.fn.input("grep > ")})
+end
+vim.keymap.set('n', '<leader>ft', builtin.live_grep, {
+    desc = 'Telescope find text (live_grep)'
+})
+vim.keymap.set('n', '<leader>fT', custom_tscope_grep, {
+    desc = 'Telescope find text (grep_string)'
+})
+vim.keymap.set('n', '<leader>fg', builtin.git_files, {
+    desc = 'Telescope find git-tracked files'
+})
+vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
+vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope 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
@@ -0,0 +1,29 @@
+-- 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 },
+})
--- a/src_files/.config/nvim/lua/plugins_lazy/colorschemes.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/colorschemes.lua
@@ -0,0 +1,51 @@
+return {
+    -- TODO: decide which of these i won't be using, then remove from this file
+    {
+        "ellisonleao/gruvbox.nvim",
+        name = "gruvbox",
+        -- 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
+        },
+    }
+}
--- a/src_files/.config/nvim/lua/plugins_lazy/conform_formatter.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/conform_formatter.lua
@@ -0,0 +1,18 @@
+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/fugitive_git.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/fugitive_git.lua
@@ -0,0 +1,3 @@
+return {
+    { "tpope/vim-fugitive" },
+}
--- a/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/harpoon.lua
@@ -0,0 +1,11 @@
+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
@@ -0,0 +1,124 @@
+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",
+        -- snippets, using luasnip for now
+        "L3MON4D3/LuaSnip",
+        "saadparwaiz1/cmp_luasnip",
+    },
+
+    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: enables needed? or does neovim/nvim-lspconfig cover 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
@@ -0,0 +1,41 @@
+local glob_patterns_find_files = {
+    "-g", "!**/.git/**",
+    "-g", "!**/build/**",
+    "-g", "!**/node_modules/**",
+}
+local glob_patterns_live_grep = {
+    unpack(glob_patterns_find_files), -- same for now
+}
+
+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", "--no-ignore", "--hidden", "--files",
+                    unpack(glob_patterns_find_files),
+                },
+            },
+            live_grep = {
+                additional_args = {
+                    "--no-ignore", "--hidden",
+                    unpack(glob_patterns_live_grep),
+                }
+            },
+        },
+    },
+}
--- a/src_files/.config/nvim/lua/plugins_lazy/treesitter.lua
+++ b/src_files/.config/nvim/lua/plugins_lazy/treesitter.lua
@@ -0,0 +1,73 @@
+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
@@ -0,0 +1,3 @@
+return {
+    "mbbill/undotree",
+}
--- a/src_files/.config/nvim/lua/settings.lua
+++ b/src_files/.config/nvim/lua/settings.lua
@@ -0,0 +1,44 @@
+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 = 25
+
--- a/src_files/.config/skhd/skhdrc
+++ b/src_files/.config/skhd/skhdrc
@@ -2,46 +2,6 @@
 # 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/session-hydrate-files/.tmux-session-hydrate-default
+++ b/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-default
@@ -0,0 +1,13 @@
+tmux_omitted_dirs=(
+    $HOME
+    $DIR_HOME_BOX
+    $DIR_DEV
+    $DIR_GIT_PROJECTS
+)
+[[ ! ${tmux_omitted_dirs[(re)$(pwd)]} ]] &&
+    tmux new-window -d -n cmd &&
+    tmux rename-window $EDITOR &&
+    $EDITOR .
+
+clear
+
--- a/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-example
+++ b/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-example
@@ -0,0 +1,11 @@
+## example template
+
+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/.config/tmux/session-hydrate-files/.tmux-session-hydrate-listening
+++ b/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-listening
@@ -0,0 +1,7 @@
+tmux new-window -d -n ncspot
+
+tmux new-window -d -n fitness
+tmux send-keys -t :fitness "cd $DIR_HOME_BOX/life/fitness/audio" c-M
+
+tmux rename-window ncmpcpp
+ncmpcpp
--- a/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-thinking
+++ b/src_files/.config/tmux/session-hydrate-files/.tmux-session-hydrate-thinking
@@ -0,0 +1,8 @@
+tmux rename-window drawing
+
+tmux new-window -n thinking
+tmux send-keys -t :thinking "$EDITOR $(date "+%Y%m%d")-scratch" c-M
+
+tmux send-keys -t :drawing "cd $DIR_SCRATCH_DRAWINGS" c-M
+tmux send-keys -t :drawing "gimp" c-M
+
--- a/src_files/.config/tmux/tmux.conf
+++ b/src_files/.config/tmux/tmux.conf
@@ -2,34 +2,44 @@
 set -s escape-time 0

 unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
+set-option -g prefix C-Space
+bind-key C-Space send-prefix
 set -g status-style 'bg=#111111 fg=#22cc00'
-set -g base-index 1
+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 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
 bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard'
-bind -r ^ last-window
 bind -r k select-pane -U
 bind -r j select-pane -D
 bind -r h select-pane -L
 bind -r l select-pane -R

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

 # kill the current session
+# TODO: would it clash with other bindings to change these to C-q and C-w ?
+# TODO: combine these into one command; must cover case when only 1 session remains
 bind-key Q rename-session zzzz-temp-kill\; switch-client -p\; kill-session -t zzzz-temp-kill
-bind-key W kill-session # TODO: if i can combine this into the above when only 1 session remains, do so
+bind-key W kill-session

-# custom find and switching for sessions using tmux-sessionizer
-unbind-key f
-bind-key f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer"
-bind-key C-f 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-key C-n next-window
-bind-key C-p previous-window
+# 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 run-shell "tmux neww $DIR_SCRIPTS/tmux-session-init find-existing"
+bind-key C-s choose-session
+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

--- a/src_files/.config/vim/pack/plugins/start/.plugin-git-clone-script
+++ b/src_files/.config/vim/pack/plugins/start/.plugin-git-clone-script
@@ -1,4 +0,0 @@
-#/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
@@ -1,111 +0,0 @@
-" 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
@@ -1,35 +0,0 @@
-#!/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/.zprofile
+++ b/src_files/.config/zsh/.zprofile
@@ -0,0 +1 @@
+# source "$XDG_CONFIG_HOME/shell/profile" # TODO: where to put this?
--- a/src_files/.config/zsh/.zshenv
+++ b/src_files/.config/zsh/.zshenv
@@ -1,9 +1,14 @@
 # default programs
-export EDITOR='vim' # TODO: update to nvim once configured
+export BROWSER='brave'
+export EDITOR='nvim'

 # 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_SCRATCH_NOTES="$DIR_HOME_BOX/scratchpad/notes"
+export DIR_SCRATCH_DRAWINGS="$DIR_HOME_BOX/scratchpad/drawings"

 # util dirs; do not change without checking impact on xdg base dirs
 export DIR_LOCAL="$HOME/.local"
@@ -26,6 +31,12 @@ export ZDOTDIR="$XDG_CONFIG_HOME/zsh" # may already be set, set anyway
 # git
 export GIT_EDITOR="$EDITOR"

+# 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
+export PATH=$DIR_BIN:$DIR_SCRIPTS:$PATH:$XDG_DATA_HOME
 export PATH=$PATH:/opt/homebrew/opt/ccache/libexec:/opt/homebrew/bin

 # shortcuts for common commands
@@ -10,28 +10,29 @@ alias 3e='echo;echo;echo'
 alias 12e='3e;3e;3e;3e'
 alias cl='clear; '
 alias cls='clear;ls'
-alias tms='tmux-sessionizer'

-# executable name overrides
+# shortcuts for executables
+alias nv='nvim'
+alias n='nvim'
+alias tms='tmux-session-init'
+
+# executable overrides
 alias ls='ls -F'
-alias youtube-dl='youtube-dl --write-info-json'
-
-# git stuff
-alias gfo='git fetch origin'
-alias gpo='git pull origin'
-alias gfpo='git fetch origin; git pull origin'

 # misc commands
-alias pdt='ping -c 4 drinkingtea.net'
+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"
-[[ -a "$ZDOTDIR/zsh-job-rs" ]] && source "$ZDOTDIR/zsh-job-rs"

 # TODO: refactor the below; simplify or at least move elsewhere
-alias lintjs='npx prettier --write'
 export DEVKITARM=/opt/devkitpro/devkitARM
-. /opt/homebrew/opt/asdf/libexec/asdf.sh # TODO: ensure not duplicated asdf logic
+. $(brew --prefix asdf)/libexec/asdf.sh
--- a/src_files/.config/zsh/zsh-general-dev
+++ b/src_files/.config/zsh/zsh-general-dev
@@ -0,0 +1,22 @@
+# set env vars, path updates, etc
+[[ -a $HOME/.local-box-vars ]] && source $HOME/.local-box-vars
+
+# login shortcuts
+alias assume="source assume"
+alias login-aws='aws sso login --profile'
+alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"
+
+# git stuff
+alias gfo='git fetch origin'
+alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -'
+alias gpdev='git-push-to-temp'
+alias gpo='git pull origin'
+git config --global user.email "$EMAIL_PERSONAL_DEV" # TODO: maybe fit this into system-type filters?
+
+# code/test/linter run and build commands
+alias bel='bundle exec standardrb'
+alias bet='bundle exec rspec'
+alias lintjs='npx prettier --write'
+alias prl='poetry run black'
+alias prt='poetry run pytest'
+
--- a/src_files/.config/zsh/zsh-job-rs
+++ b/src_files/.config/zsh/zsh-job-rs
@@ -1,27 +0,0 @@
-# TODO: refactor this file; separate general dev from rs specific
-# set env vars, path updates, etc
-[[ -a $HOME/.rs-vars ]] \
-  && source $HOME/.rs-vars \
-  && export PATH=$PATH:$HOME/.rd/bin \
-  && . /usr/local/opt/asdf/libexec/asdf.sh
-
-# login shortcuts
-alias assume="source assume"
-alias login-bunk='aws sso login --profile'
-alias login-bunk-id-list="grep sso_account_id $HOME/.aws/config"
-alias login-pulumi-bunk='pulumi login '$PULUMI_LOGIN_TARGET'$(aws sts get-caller-identity --query Account --output text)'
-
-# git stuff
-alias git-push-to-develop='git branch -D develop; git checkout -b develop; git push origin develop -uf; git checkout -'
-alias gpdev='git-push-to-develop'
-
-# misc shortcuts
-alias journal="cd $DIR_HOME_BOX; $EDITOR .current-journal"
-alias kra="cd $DIR_HOME_BOX/process/kra; open .current_kra"
-alias gll="cd $DIR_DEV/git/lampo/gitlab"
-alias bet='bundle exec rspec'
-alias bel='bundle exec standardrb'
-alias belr='bundle exec rubocop'
-alias prt='poetry run pytest'
-alias prl='poetry run black'
-
--- a/src_files/.local/bin/mvd
+++ b/src_files/.local/bin/mvd
@@ -0,0 +1,5 @@
+#!/bin/zsh
+
+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
@@ -1,21 +0,0 @@
-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/tmux-session-init
+++ b/src_files/.local/scripts/tmux-session-init
@@ -0,0 +1,40 @@
+#!/bin/zsh
+
+tmux_switch_to() {
+    [[ -z $TMUX ]] && tmux attach-session -t $1 || tmux switch-client -t $1
+}
+
+tmux_hydrate() {
+    local tmux_hydrate_files_dir="$XDG_CONFIG_HOME/tmux/session-hydrate-files"
+    local tmux_hydrate_path="$tmux_hydrate_files_dir/.tmux-session-hydrate-default"
+    [[ $1 = "thinking" ]] && tmux_hydrate_path="$tmux_hydrate_files_dir/.tmux-session-hydrate-thinking"
+    [[ $1 = "listening" ]] && tmux_hydrate_path="$tmux_hydrate_files_dir/.tmux-session-hydrate-listening"
+    [[ -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=$([[ -n $(pgrep tmux) ]] && tmux list-sessions || 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 [[ $tmux_target_path = "thinking" ]]; then tmux_target_name="thinking" && tmux_target_path="$DIR_SCRATCH_NOTES";
+elif [[ $tmux_target_path = "listening" ]]; then tmux_target_name="listening" && tmux_target_path="$DIR_MUSIC";
+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
@@ -1,37 +0,0 @@
-#!/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/executable_wrappers_macos/gimp
+++ b/src_files/executable_wrappers_macos/gimp
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/Applications/GIMP.app/Contents/MacOS/gimp
Author	SHA1	Message	Date
david	992f81fc04	Simplify structure for nvim config files	2025-09-16 12:24:46 -05:00
david	c9bad270d2	Switch macos wm from yabai to aerospace	2025-09-11 15:55:39 -05:00
david	7f287b591e	Add system-type filters, add git-clone handling to main script	2025-09-06 15:56:40 -05:00
david	891b605dbe	Modify tmux config/setup, zsh, some nvim & skhd key mappings, etc	2025-09-05 13:04:24 -05:00
david	759958b126	Consolidate some scripts; simplify unneeded logic; take OS as arg	2025-08-28 23:16:10 -05:00
david	d4f05595d2	Minor changes to tmux key bindings and names; minor clean-up	2025-08-28 21:38:15 -05:00
david	624a06cc36	Update tmux keybindings and a few nvim configs	2025-08-26 13:56:44 -05:00
david	1c8e6c2165	Fix nvim wrap setting	2025-08-22 13:58:43 -05:00
david	34a62957e8	Add minor env var and alias changes	2025-08-22 13:14:26 -05:00
david	fd4a95bc36	Set up LSP, completion, etc; adjust a few other small settings	2025-08-20 11:09:42 -05:00
david	424e2be8ee	Remove vim config, the time of neovim has begun	2025-08-18 17:01:00 -05:00
david	9440c6ef57	Add more neovim configuration	2025-08-18 16:39:41 -05:00
david	3caa97137b	initial neovim config, plugins and a few mappings/settings	2025-08-17 23:56:04 -05:00
david	371a034035	Add partial config for music streaming player (ncspot)	2025-08-15 21:00:39 -05:00
david	7dbe5a57ba	Fix some asdf issues	2025-08-15 21:00:39 -05:00
david	fb04063cdc	small settings/keybindings updates for tmux, nvim, zsh	2025-08-15 21:00:28 -05:00
david	74988a2080	Remove job-rs things, make zsh-general-dev file	2025-08-04 09:08:46 +02:00
				`@@ -0,0 +1 @@`
				`# source "$XDG_CONFIG_HOME/shell/profile" # TODO: where to put this?`