Simplify tmux-session-hydrate logic; update tmux key binds

README.md

@@ -1,33 +1,33 @@
 # dotfiles, plus scripts for box setup
 
-### prereqs
+### prereqs, linux distros
-- zsh and git installed
+- zsh is installed (scripts are written for zsh)
-- git clone this repo
-
-#### specific prereqs, linux distros
 - sudo access is configured for current user
 
-#### specific prereqs, macos
+### 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 [ref/macos-system-settings](ref/macos-system-settings.txt)
+- manual settings, refer to [macos-system-settings](ref/macos-system-settings.txt)
 
 ### script run
-- to do the full setup, from git root dir, run: `./box_setup.sh`
+- if repo present on system, run from the repo's root:
-- to copy dotfiles only, from git root dir, run: `./copy_dotfiles.sh`
+    - ```
-
+      ./box_setup.sh <OS-name>
-### after script run
+      ```
-- complete manual actions specified in [ref/post-run](ref/post-run.md)
+- 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
 - 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?
+- config for gimp, `src_files/.config/GIMP` (dir)
-- switch installation approach, use csv file with programs to install, install types,
+    - set things in gtkrc only? still need to nest that within a sub dir?
-  any extra flags/opts, comments
+    - or configure in gimp, copy resulting dir to `src_files/.config/GIMP`, call it a day
-    - regarding the system-types idea i'd started to build in already, maybe have a
+- decide on and implement approach for languages and versioning
-      column for filtering in the csv file, or just have multiple csv files corresponding
+    - language-specific? asdf? no, not asdf, mise seems better from what i hear so far
-      to a base/core install, a music-studio install, a employer/work machine, etc.
+    - docker? or alternatives like podman? any license concerns?
-- add command in tmux to perform cd to a given dir in all windows of the current session

box_setup.sh

@@ -1,30 +1,35 @@
 #!/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 "\nusage: ./box_setup.sh [system-type]"
+    echo "usage: ./box_setup.sh <OS-name> [system-type]\n"
-    echo "\nsystem-type options: personal, studio-music, work-placeholder"
+    echo "OS-name options: arch, artix, debian, macos"
-    echo "\nexamples:\n    ./box_setup.sh\n    ./box_setup.sh studio-music\n"
+    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
 }
 
-# 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
+# TODO: test this git stuff, see if it works
-[[ "$setup_os" = "macos" ]] && {
+temp_placement_git_dir="no"
-    install_cmd="brew install"
+[[ ! -d ".git" && "$(basename $(pwd))" != "box-setup" ]] && {
-    update_pkg_manager_and_defs_cmd='brew update'
+    temp_placement_git_dir="yes"
-    update_pkgs_cmd='brew upgrade'
+    git clone "https://git.drinkingtea.net/david/box-setup.git" || {
-} || {
+        echo "failed to clone box-setup git repo"
-    [[ "$setup_os" = "linux" ]] && {
+        exit 1
-        case $setup_distro in
+    }
+    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?
@@ -35,13 +40,13 @@
         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 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"
@@ -49,10 +54,14 @@ 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
+./copy_dotfiles.sh $2
 
 # install programs
 source $ZDOTDIR/.zshenv
 source $ZDOTDIR/.zshrc
-./install_programs.sh $1
+./install_programs.sh $2
 
+[[ $temp_placement_git_dir == "yes" ]] && {
+    popd > /dev/null
+    mv "box-setup" "$DIR_GIT_PROJECTS/me/"
+}

copy_dotfiles.sh

@@ -31,7 +31,8 @@ link_dir() {
     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 "sym-linking $link_dir -> $src_dir"
+    ln -s $src_dir $link_dir
 }
 
 echo "---- copying dotfiles ------------------------------------------------"
@@ -40,16 +41,14 @@ copy_file src_files/.config/zsh/.zshenv $HOME # duplicate, copy anyway, ensures
 
 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
+[[ "$BOX_SETUP_OS" = "macos" ]] && {
-    [[ ! -d "$obs_dir/.obsidian" ]] && mkdir "$obs_dir/.obsidian"
+    copy_dir src_files/executable_wrappers_macos $DIR_BIN
-    copy_dir $XDG_CONFIG_HOME/obsidian "$obs_dir/.obsidian"
+    link_dir "$XDG_CONFIG_HOME/GIMP" "$HOME/Library/Application Support/GIMP"
-done
+}
 
-# [[ $1 = "studio-music" ]] {
+# [[ $1 = "studio-music" ]] &&
-#     [[ "$OSTYPE" = *"darwin"* ]] &&
+#     [[ "$BOX_SETUP_OS" = "macos" ]] &&
-#         link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" # TODO: get reaper config set up
+#     link_dir "$XDG_CONFIG_HOME/REAPER" "$HOME/Library/Application Support/REAPER" && # TODO: get reaper config set up
-# }
 

installs_and_builds/s02_utils

@@ -12,16 +12,5 @@ ${=BOX_SETUP_INSTALL_COMMAND} \
     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
-
 [[ "$BOX_SETUP_OS" = "macos" ]] &&
-    ${=BOX_SETUP_INSTALL_COMMAND} coreutils findutils
+    ${=BOX_SETUP_INSTALL_COMMAND} coreutils

installs_and_builds/s12_web_browser

@@ -1,10 +1,8 @@
 #!/bin/zsh
 
-# TODO: get browser config and install set up
+# TODO: replace firefox with brave or another browser
-# 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_OS" = "debian" ]] && firefox_package_name='firefox-esr'
 # ${=BOX_SETUP_INSTALL_COMMAND} "$install_option_prefix" "$firefox_package_name"

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
+# TODO: decide on docker vs others; below is included just for reference
-[[ "$BOX_SETUP_DISTRO" = "debian" ]] && setup_docker_on_debian || {
+# case $BOX_SETUP_OS in
-    ${=BOX_SETUP_INSTALL_COMMAND} docker
+#     (arch | artix)
-}
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+#     (debian)
+#         setup_docker_on_debian
+#         ;;
+#     (macos)
+#         ${=BOX_SETUP_INSTALL_COMMAND} docker
+#         ;;
+# esac

installs_and_builds/s49_languages_general

@@ -1,12 +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

make_dirs.sh

@@ -2,30 +2,25 @@
 
 source ./src_files/.config/zsh/.zshenv # ensure env vars set for use below
 
-# some standard/common directories, some overlap/use in XDG directories
+# some standard/common dirs, some overlap/use in XDG dirs
-[[ ! -d "$DIR_LOCAL" ]] && mkdir -p "$DIR_LOCAL"
+[[ ! -d "$DIR_LOCAL" ]] && mkdir "$DIR_LOCAL"
-[[ ! -d "$DIR_BIN" ]] && mkdir -p "$DIR_BIN"
+[[ ! -d "$DIR_BIN" ]] && mkdir "$DIR_BIN"
-[[ ! -d "$DIR_SCRIPTS" ]] && mkdir -p "$DIR_SCRIPTS"
+[[ ! -d "$DIR_BUILD" ]] && mkdir "$DIR_BUILD"
-[[ ! -d "$DIR_TMP" ]] && mkdir -p "$DIR_TMP"
+[[ ! -d "$DIR_SCRIPTS" ]] && mkdir "$DIR_SCRIPTS"
-[[ ! -d "$DIR_USER_OPT" ]] && mkdir -p "$DIR_USER_OPT"
+[[ ! -d "$DIR_TMP" ]] && mkdir "$DIR_TMP"
-[[ ! -d "$DIR_USER_LIB" ]] && mkdir -p "$DIR_USER_LIB"
 
-# directories related to XDG Base Directory specification
+# dirs related to XDG Base Directory specification
-[[ ! -d "$XDG_CONFIG_HOME" ]] && mkdir -p "$XDG_CONFIG_HOME"
+[[ ! -d "$XDG_CONFIG_HOME" ]] && mkdir "$XDG_CONFIG_HOME"
-[[ ! -d "$XDG_CACHE_HOME" ]] && mkdir -p "$XDG_CACHE_HOME"
+[[ ! -d "$XDG_CACHE_HOME" ]] && mkdir "$XDG_CACHE_HOME"
-[[ ! -d "$XDG_DATA_HOME" ]] && mkdir -p "$XDG_DATA_HOME"
+[[ ! -d "$XDG_DATA_HOME" ]] && mkdir "$XDG_DATA_HOME"
-[[ ! -d "$XDG_STATE_HOME" ]] && mkdir -p "$XDG_STATE_HOME"
+[[ ! -d "$XDG_STATE_HOME" ]] && mkdir "$XDG_STATE_HOME"
 
-# additional directories for how i'm organizing my system
+# dirs for how i'm organizing my system
-[[ ! -d "$DIR_HOME_BOX" ]] && mkdir -p $DIR_HOME_BOX
+[[ ! -d "$DIR_HOME_BOX" ]] && mkdir $DIR_HOME_BOX
-[[ ! -d "$DIR_MUSIC" ]] && mkdir -p $DIR_MUSIC
+[[ ! -d "$DIR_MUSIC" ]] && mkdir $DIR_MUSIC
-[[ ! -d "$DIR_NOTES" ]] && mkdir -p $DIR_NOTES
+[[ ! -d "$DIR_DEV" ]] && mkdir $DIR_DEV
-[[ ! -d "$DIR_DEV" ]] && mkdir -p $DIR_DEV
+[[ ! -d "$DIR_GIT_PROJECTS" ]] && mkdir $DIR_GIT_PROJECTS
-[[ ! -d "$DIR_GIT_PROJECTS" ]] && mkdir -p $DIR_GIT_PROJECTS
+[[ ! -d "$DIR_GIT_PROJECTS/me" ]] && mkdir $DIR_DEV/git/me
-[[ ! -d "$DIR_GIT_PROJECTS/me" ]] && mkdir -p $DIR_DEV/git/me
+[[ ! -d "$DIR_GIT_PROJECTS/other" ]] && mkdir $DIR_DEV/git/other
-[[ ! -d "$DIR_GIT_PROJECTS/other" ]] && mkdir -p $DIR_DEV/git/other
+[[ ! -d "$DIR_SCRATCH_NOTES" ]] && mkdir -p $DIR_SCRATCH_NOTES
-
+[[ ! -d "$DIR_SCRATCH_DRAWINGS" ]] && mkdir -p $DIR_SCRATCH_DRAWINGS
-# 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

ref/macos-system-settings.txt

@@ -1,4 +1,4 @@
-// settings for manual configuration in macOS system settings app
+// 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:

ref/post-run.md

@@ -1,3 +0,0 @@
-# Manual steps needed after dotfile copy and/or installs
-
-currently none, wooooo

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
-

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)
+

src_files/.config/aerospace/aerospace.toml

@@ -9,7 +9,7 @@ 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
+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
@@ -61,24 +61,21 @@ automatically-unhide-macos-hidden-apps = true
     # '''
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#layout
-    alt-comma = 'layout v_accordion'
+    alt-slash = 'layout tiles horizontal vertical'
-    alt-period = 'layout h_tiles'
+    alt-comma = 'layout accordion horizontal vertical'
-    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 down'
-    alt-j = 'focus up'
+    alt-k = '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-j = 'move down'
+    alt-shift-k = 'move up'
     alt-shift-l = 'move right'
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#resize
@@ -95,7 +92,6 @@ automatically-unhide-macos-hidden-apps = true
     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'
@@ -107,7 +103,6 @@ automatically-unhide-macos-hidden-apps = true
     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'
@@ -120,8 +115,9 @@ automatically-unhide-macos-hidden-apps = true
 
     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']
+    t = ['flatten-workspace-tree', 'layout tiling', 'mode main']
-    g = ['flatten-workspace-tree', 'layout h_tiles', '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']

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']

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

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

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

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

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

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

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")

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

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

src_files/.config/git/config

@@ -5,5 +5,3 @@
 	email = david@pinewoods.xyz
 [push]
     autoSetupRemote = true
-[pull]
-    rebase = true

src_files/.config/git/ignore

@@ -1,28 +1,7 @@
-# my own stuff/conventions
+.tool-versions
-.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
 *.swp
 *.swo
-
+.npmrc
-# miscellaneous
+.tmux-session-hydrate
+zxcv*
 .DS_Store
-.liccor*
-

src_files/.config/mise/config.toml

@@ -2,7 +2,3 @@
 go = "1"
 python = "3"
 ruby = "3"
-
-[settings]
-idiomatic_version_file_enable_tools = ["ruby"]
-

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"

src_files/.config/nvim/init.lua

@@ -4,7 +4,7 @@ local csgAutocmd = vim.api.nvim_create_autocmd
 require("settings")
 require("plugin_manager")
 require("key_mappings")
-require("theme")
+require("colorscheme_settings")
 
 csgAutocmd({"BufWritePre"}, {
     group = csGroup,

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
+-- })
+

src_files/.config/nvim/lua/key_mappings.lua

@@ -61,36 +61,6 @@ vim.keymap.set("n", "<C-l>", [[<C-w>l]])
 -- 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
 
@@ -115,20 +85,28 @@ kmgAutocmd('LspAttach', {
 -- plugins
 
 -- telescope
-local tscBuiltin = require('telescope.builtin')
+local builtin = require('telescope.builtin')
-local custom_grep_str_w_regex = function()
+local custom_tscope_grep = function()
-    tscBuiltin.grep_string({ search = vim.fn.input("grep > "), use_regex = true, additional_args = "-i", })
+    builtin.grep_string({ search = vim.fn.input("grep > ")})
 end
-vim.keymap.set('n', '<leader>ft', tscBuiltin.live_grep, { desc = 'tscope find text, live_grep' })
+vim.keymap.set('n', '<leader>ft', builtin.live_grep, {
-vim.keymap.set('n', '<leader>fT', custom_grep_str_w_regex, { desc = 'tscope find text, static grep w/regex' })
+    desc = 'Telescope find text (live_grep)'
-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>fT', custom_tscope_grep, {
-vim.keymap.set('n', '<leader>fb', tscBuiltin.buffers, { desc = 'tscope buffers' })
+    desc = 'Telescope find text (grep_string)'
-vim.keymap.set('n', '<leader>fh', tscBuiltin.help_tags, { desc = 'tscope help tags' })
+})
+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>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)

src_files/.config/nvim/lua/plugin_manager.lua

@@ -26,9 +26,4 @@ require("lazy").setup({
     },
     checker = { enabled = false },
     change_detection = { notify = false },
-    dev = {
-        path = "~/dev/git/other/omarchy/plugins",
-        patterns = { 'LazyVim' },
-        fallback = false,
-    },
 })

src_files/.config/nvim/lua/plugins_lazy/colorschemes.lua

@@ -3,7 +3,6 @@ return {
     {
         "ellisonleao/gruvbox.nvim",
         name = "gruvbox",
-        -- lazy = false,
         -- priority = 1000,
         opts = {
             terminal_colors = true, -- add neovim terminal colors
@@ -46,28 +45,7 @@ return {
                 colors.hint = colors.orange
                 colors.error = "#ff0000"
                 colors.fg_gutter = "#9098B8"
-            end,
+            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,
         },
     }
+}

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,
-    },
-}

src_files/.config/nvim/lua/plugins_lazy/lsp.lua

@@ -9,8 +9,9 @@ return {
         "hrsh7th/cmp-path",
         "hrsh7th/cmp-cmdline",
         "hrsh7th/nvim-cmp",
-        "L3MON4D3/LuaSnip", -- snippets, using luasnip for now
+        -- snippets, using luasnip for now
-        "saadparwaiz1/cmp_luasnip", -- snippets, using luasnip for now
+        "L3MON4D3/LuaSnip",
+        "saadparwaiz1/cmp_luasnip",
     },
 
     config = function()
@@ -114,7 +115,7 @@ return {
             },
         })
 
-        -- TODO: needed? seems like neovim/nvim-lspconfig covers by default
+        -- TODO: enables needed? or does neovim/nvim-lspconfig cover by default?
         -- vim.lsp.enable('clangd')
         -- vim.lsp.enable('ruby_lsp')
         -- vim.lsp.enable('standardrb')

src_files/.config/nvim/lua/plugins_lazy/telescope.lua

@@ -1,3 +1,12 @@
+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",
@@ -17,18 +26,14 @@ return {
         pickers = {
             find_files = {
                 find_command = {
-                    "rg", "--hidden", "--files", -- "--no-ignore",
+                    "rg", "--no-ignore", "--hidden", "--files",
-                    "-g", "!**/.git/**",
+                    unpack(glob_patterns_find_files),
-                    "-g", "!**/build/**",
-                    "-g", "!**/node_modules/**",
                 },
             },
             live_grep = {
                 additional_args = {
-                    "--hidden", "--no-binary", -- "--no-ignore",
+                    "--no-ignore", "--hidden",
-                    "-g", "!**/.git/**",
+                    unpack(glob_patterns_live_grep),
-                    "-g", "!**/build/**",
-                    "-g", "!**/node_modules/**",
                 }
             },
         },

src_files/.config/nvim/lua/settings.lua

@@ -40,5 +40,5 @@ vim.opt.undofile = true
 vim.g.netrw_browse_split = 0
 vim.g.netrw_preview = 1
 vim.g.netrw_banner = 0
-vim.g.netrw_winsize = 50
+vim.g.netrw_winsize = 25
 

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)
-

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
-}

src_files/.config/obsidian/appearance.json

@@ -1,5 +0,0 @@
-{
-  "theme": "obsidian",
-  "accentColor": "#2f930e",
-  "baseFontSize": 18
-}

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
-}

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
-}

src_files/.config/obsidian/hotkeys.json

@@ -1,18 +0,0 @@
-{
-  "markdown:toggle-preview": [
-    {
-      "modifiers": [
-        "Alt"
-      ],
-      "key": "R"
-    }
-  ],
-  "switcher:open": [
-    {
-      "modifiers": [
-        "Ctrl"
-      ],
-      "key": "F"
-    }
-  ]
-}

src_files/.config/tmux/.tmux-session-hydrate-default

@@ -1,6 +1,6 @@
 tmux_omitted_dirs=(
     $HOME
-    $(find $DIR_HOME_BOX -type d -maxdepth 1)
+    $DIR_HOME_BOX
     $DIR_DEV
     $DIR_GIT_PROJECTS
 )
@@ -8,8 +8,8 @@ tmux_omitted_dirs=(
 [[ ! ${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 debug
-    tmux new-window -d -n procs
+    tmux new-window -d -n run
     tmux rename-window cmd
     tmux send-keys -t :cmd "clear; [[ -d .git ]] && git status" c-M
 }

src_files/.config/tmux/tmux.conf

@@ -10,7 +10,6 @@ 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
@@ -25,17 +24,19 @@ 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"
 
-# closing the current session
+# kill the current session
-bind-key q kill-session
+# TODO: would it clash with other bindings to change these to C-q and C-w ?
-bind-key w run-shell "$DIR_SCRIPTS/tmux-session-close #{session_name}"
+# 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
 
 # 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 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

src_files/.config/zsh/.zprofile

@@ -0,0 +1 @@
+# source "$XDG_CONFIG_HOME/shell/profile" # TODO: where to put this?

src_files/.config/zsh/.zshenv

@@ -8,15 +8,15 @@ 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"
+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"
 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"
@@ -32,14 +32,6 @@ 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"
-
 # clean-up of home dir
 export __CF_USER_TEXT_ENCODING="0x0:0x0"
 

src_files/.config/zsh/.zshrc

@@ -29,6 +29,7 @@ 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"
 

src_files/.config/zsh/zsh-general-dev

@@ -8,12 +8,10 @@ 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'
+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'

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 \
-    &

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 \
-    &

src_files/.local/bin/mvd

@@ -1,6 +1,5 @@
 #!/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 "$@"

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

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

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

src_files/.local/scripts/tmux-session-init

@@ -5,12 +5,13 @@ tmux_switch_to() {
 }
 
 tmux_hydrate() {
-    local tmux_hydrate_path="$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
+    local tmux_hydrate_files_dir="$XDG_CONFIG_HOME/tmux/session-hydrate-files"
+    local tmux_hydrate_path="$tmux_hydrate_files_dir/.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_existing_sessions=$([[ -n $(pgrep tmux) ]] && tmux list-sessions || echo '')
 tmux_search_dirs=(
     $DIR_HOME_BOX
     $DIR_DEV

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 \
-    &

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 \
-    &

src_files/executable_wrappers_macos/gimp

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/Applications/GIMP.app/Contents/MacOS/gimp

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,
-    },
-}

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,
-    },
-}

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",
-		},
-	},
-}

theme-switcher-testing/neovim-everforest.lua

@@ -1,15 +0,0 @@
-return {
-	{
-        "neanias/everforest-nvim",
-		opts = {
-			background = "soft",
-		},
-    },
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "everforest",
-			background = "soft",
-		},
-	},
-}

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,
-        },
-    },
-}

theme-switcher-testing/neovim-matteblack.lua

@@ -1,9 +0,0 @@
-return {
-  { "tahayvr/matteblack.nvim", lazy = false, priority = 1000 },
-  {
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "matteblack",
-		},
-	},
-}

theme-switcher-testing/neovim-nordfox.lua

@@ -1,9 +0,0 @@
-return {
-	{ "EdenEast/nightfox.nvim" },
-	{
-		"LazyVim/LazyVim",
-		opts = {
-			colorscheme = "nordfox",
-		},
-	},
-}

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,
-        },
-    },
-}

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,
-        },
-    },
-}

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,
-        },
-    },
-}

theme-switcher-testing/plugins/LazyVim/lua/LazyVim/init.lua

@@ -1,8 +0,0 @@
-local M = {}
-
-M.opts = {}
-
-function M.setup(opts)
-end
-
-return M

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