From 9b55efedc4ca43e27b379b4849ee2fb36acef691 Mon Sep 17 00:00:00 2001
From: david <david@silverwolf.studio>
Date: Sun, 2 Feb 2025 20:32:32 -0600
Subject: [PATCH] Reorganinze and add to installs dir

---
 README.md                                     | 16 +++++++-----
 .../manual_runs/s99_neovim_from_source        | 25 ++++++++++++++++++
 installs_and_builds/{s03_shells => s03_shell} |  0
 installs_and_builds/s04_terminal              |  6 +++++
 .../{s22_tmux => s05_terminal_multiplexer}    |  0
 installs_and_builds/s06_window_manager        |  3 +++
 .../{s21_neovim => s07_text_editor}           |  0
 installs_and_builds/s10_mail_client           |  3 +++
 installs_and_builds/s11_calendar_and_time     |  3 +++
 installs_and_builds/s12_web_browser           |  7 +++++
 installs_and_builds/s13_rss                   |  4 +++
 installs_and_builds/s14_audio_player          |  5 ++++
 installs_and_builds/s15_video_player          |  3 +++
 installs_and_builds/s16_image_viewer          |  4 +++
 installs_and_builds/s17_doc_viewer            |  4 +++
 installs_and_builds/s18_file_manager          |  4 +++
 installs_and_builds/s20_audio_editor          |  6 +++++
 installs_and_builds/s21_video_editor          |  4 +++
 .../{s30_gimp => s22_image_editor}            |  2 ++
 installs_and_builds/{s20_git => s30_git}      |  0
 .../{s10_docker => s31_docker}                |  0
 ...s19_lang_general => s49_languages_general} |  0
 installs_and_builds/s99_neovim_from_source    | 26 -------------------
 23 files changed, 93 insertions(+), 32 deletions(-)
 create mode 100755 installs_and_builds/manual_runs/s99_neovim_from_source
 rename installs_and_builds/{s03_shells => s03_shell} (100%)
 create mode 100755 installs_and_builds/s04_terminal
 rename installs_and_builds/{s22_tmux => s05_terminal_multiplexer} (100%)
 create mode 100755 installs_and_builds/s06_window_manager
 rename installs_and_builds/{s21_neovim => s07_text_editor} (100%)
 create mode 100755 installs_and_builds/s10_mail_client
 create mode 100755 installs_and_builds/s11_calendar_and_time
 create mode 100755 installs_and_builds/s12_web_browser
 create mode 100755 installs_and_builds/s13_rss
 create mode 100755 installs_and_builds/s14_audio_player
 create mode 100755 installs_and_builds/s15_video_player
 create mode 100755 installs_and_builds/s16_image_viewer
 create mode 100755 installs_and_builds/s17_doc_viewer
 create mode 100755 installs_and_builds/s18_file_manager
 create mode 100755 installs_and_builds/s20_audio_editor
 create mode 100755 installs_and_builds/s21_video_editor
 rename installs_and_builds/{s30_gimp => s22_image_editor} (64%)
 rename installs_and_builds/{s20_git => s30_git} (100%)
 rename installs_and_builds/{s10_docker => s31_docker} (100%)
 rename installs_and_builds/{s19_lang_general => s49_languages_general} (100%)
 delete mode 100755 installs_and_builds/s99_neovim_from_source

diff --git a/README.md b/README.md
index 2333966..cf09a94 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,17 @@
 - from the repo's root directory, run `./box_setup`
 
 ### todo items
-- nvim config
-- consider: optional vim config as a backup?
+- config for nvim
+- config for mpd, mpc, ncmpcpp
+- config for ghostty
+- config for mpv
+    - also, on macos, get it to open within terminal or just don't install it
+- config for gimp, `src_files/.config/GIMP` (dir)
+    - set things in gtkrc only? still need to nest that within a sub dir?
+    - or maybe just configure in gimp's gui, copy the whole resulting dir into
+      `src_files/.config/GIMP` (edit out and delete what i don't need) and call it a day
+- decide on window managers, then do config (for each OS; macos will likely be different)
 - decide on and implement approach for languages and versioning
     - docker? or alternatives like podman? any license concerns?
     - asdf, or language-specific version managers?
     - hybrid of the above?
-- gimp config, 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
diff --git a/installs_and_builds/manual_runs/s99_neovim_from_source b/installs_and_builds/manual_runs/s99_neovim_from_source
new file mode 100755
index 0000000..270c0f2
--- /dev/null
+++ b/installs_and_builds/manual_runs/s99_neovim_from_source
@@ -0,0 +1,25 @@
+#!/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\""
+
+[ ! -d $neovim_dir ] && git clone https://github.com/neovim/neovim.git $neovim_dir
+git -C $neovim_dir fetch --all
+git -C $neovim_dir checkout $neovim_version
+
+make -C $neovim_dir clean
+make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
+sudo make -C $neovim_dir install
+
+# from primeagen's dev repo, uncomment/edit as needed
+# git clone https://github.com/ThePrimeagen/harpoon.git $HOME/personal/harpoon
+# cd $HOME/personal/harpoon
+# git fetch
+# git checkout harpoon2
+
+# git clone https://github.com/ThePrimeagen/vim-apm.git $HOME/personal/vim-apm
+# git clone https://github.com/ThePrimeagen/caleb.git $HOME/personal/caleb
+# git clone https://github.com/nvim-lua/plenary.nvim.git $HOME/personal/plenary
+
diff --git a/installs_and_builds/s03_shells b/installs_and_builds/s03_shell
similarity index 100%
rename from installs_and_builds/s03_shells
rename to installs_and_builds/s03_shell
diff --git a/installs_and_builds/s04_terminal b/installs_and_builds/s04_terminal
new file mode 100755
index 0000000..e5b07fc
--- /dev/null
+++ b/installs_and_builds/s04_terminal
@@ -0,0 +1,6 @@
+#!/bin/zsh
+
+local option_prefix=''
+[[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
+# NOTE: ghostty not currently in debian repos, maybe build from source
+${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" ghostty
diff --git a/installs_and_builds/s22_tmux b/installs_and_builds/s05_terminal_multiplexer
similarity index 100%
rename from installs_and_builds/s22_tmux
rename to installs_and_builds/s05_terminal_multiplexer
diff --git a/installs_and_builds/s06_window_manager b/installs_and_builds/s06_window_manager
new file mode 100755
index 0000000..7be1d31
--- /dev/null
+++ b/installs_and_builds/s06_window_manager
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+# ${=BOX_SETUP_INSTALL_COMMAND} zxcv-placeholder
diff --git a/installs_and_builds/s21_neovim b/installs_and_builds/s07_text_editor
similarity index 100%
rename from installs_and_builds/s21_neovim
rename to installs_and_builds/s07_text_editor
diff --git a/installs_and_builds/s10_mail_client b/installs_and_builds/s10_mail_client
new file mode 100755
index 0000000..c006c1e
--- /dev/null
+++ b/installs_and_builds/s10_mail_client
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+${=BOX_SETUP_INSTALL_COMMAND} mutt
diff --git a/installs_and_builds/s11_calendar_and_time b/installs_and_builds/s11_calendar_and_time
new file mode 100755
index 0000000..f2ca454
--- /dev/null
+++ b/installs_and_builds/s11_calendar_and_time
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+${=BOX_SETUP_INSTALL_COMMAND} khal
diff --git a/installs_and_builds/s12_web_browser b/installs_and_builds/s12_web_browser
new file mode 100755
index 0000000..eee009d
--- /dev/null
+++ b/installs_and_builds/s12_web_browser
@@ -0,0 +1,7 @@
+#!/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"
diff --git a/installs_and_builds/s13_rss b/installs_and_builds/s13_rss
new file mode 100755
index 0000000..7a8f6c5
--- /dev/null
+++ b/installs_and_builds/s13_rss
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+# TODO: pick rss reader; newsboat? others? option with inbox and separate queues?
+# ${=BOX_SETUP_INSTALL_COMMAND} zxcv-placeholder
diff --git a/installs_and_builds/s14_audio_player b/installs_and_builds/s14_audio_player
new file mode 100755
index 0000000..5566f34
--- /dev/null
+++ b/installs_and_builds/s14_audio_player
@@ -0,0 +1,5 @@
+#!/bin/zsh
+
+# possible mpd clients to consider: ncmpc, inori
+${=BOX_SETUP_INSTALL_COMMAND} mpd mpc ncmpcpp
+# TODO: ${=BOX_SETUP_INSTALL_COMMAND} <spotify stuff here>
diff --git a/installs_and_builds/s15_video_player b/installs_and_builds/s15_video_player
new file mode 100755
index 0000000..ecd26a6
--- /dev/null
+++ b/installs_and_builds/s15_video_player
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+${=BOX_SETUP_INSTALL_COMMAND} mpv
diff --git a/installs_and_builds/s16_image_viewer b/installs_and_builds/s16_image_viewer
new file mode 100755
index 0000000..7397805
--- /dev/null
+++ b/installs_and_builds/s16_image_viewer
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+[[ "$BOX_SETUP_OS" = "macos" ]] && exit 0 # TODO: maybe find an option for macos
+${=BOX_SETUP_INSTALL_COMMAND} nsxiv
diff --git a/installs_and_builds/s17_doc_viewer b/installs_and_builds/s17_doc_viewer
new file mode 100755
index 0000000..c35d365
--- /dev/null
+++ b/installs_and_builds/s17_doc_viewer
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+[[ "$BOX_SETUP_OS" = "macos" ]] && exit 0 # TODO: maybe find an option for macos
+${=BOX_SETUP_INSTALL_COMMAND} zathura
diff --git a/installs_and_builds/s18_file_manager b/installs_and_builds/s18_file_manager
new file mode 100755
index 0000000..0be0990
--- /dev/null
+++ b/installs_and_builds/s18_file_manager
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+# TODO: pick filemanager; consider: lf, ranger, others?
+# ${=BOX_SETUP_INSTALL_COMMAND} zxcv-placeholder
diff --git a/installs_and_builds/s20_audio_editor b/installs_and_builds/s20_audio_editor
new file mode 100755
index 0000000..994d1bf
--- /dev/null
+++ b/installs_and_builds/s20_audio_editor
@@ -0,0 +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
diff --git a/installs_and_builds/s21_video_editor b/installs_and_builds/s21_video_editor
new file mode 100755
index 0000000..932ad85
--- /dev/null
+++ b/installs_and_builds/s21_video_editor
@@ -0,0 +1,4 @@
+#!/bin/zsh
+
+# TODO: set this up; likely using ffmpeg (work on macos?), maybe others
+# ${=BOX_SETUP_INSTALL_COMMAND} zxcv-placeholder
diff --git a/installs_and_builds/s30_gimp b/installs_and_builds/s22_image_editor
similarity index 64%
rename from installs_and_builds/s30_gimp
rename to installs_and_builds/s22_image_editor
index 850f3ab..9a5ee10 100755
--- a/installs_and_builds/s30_gimp
+++ b/installs_and_builds/s22_image_editor
@@ -3,3 +3,5 @@
 local option_prefix=''
 [[ "$BOX_SETUP_OS" = "macos" ]] && option_prefix='--cask'
 ${=BOX_SETUP_INSTALL_COMMAND} "$option_prefix" gimp
+
+# ${=BOX_SETUP_INSTALL_COMMAND} imagemagick # TODO: consider this program too
diff --git a/installs_and_builds/s20_git b/installs_and_builds/s30_git
similarity index 100%
rename from installs_and_builds/s20_git
rename to installs_and_builds/s30_git
diff --git a/installs_and_builds/s10_docker b/installs_and_builds/s31_docker
similarity index 100%
rename from installs_and_builds/s10_docker
rename to installs_and_builds/s31_docker
diff --git a/installs_and_builds/s19_lang_general b/installs_and_builds/s49_languages_general
similarity index 100%
rename from installs_and_builds/s19_lang_general
rename to installs_and_builds/s49_languages_general
diff --git a/installs_and_builds/s99_neovim_from_source b/installs_and_builds/s99_neovim_from_source
deleted file mode 100755
index dafb176..0000000
--- a/installs_and_builds/s99_neovim_from_source
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/zsh
-
-# from primeagen's dev repo, uncomment/edit as needed
-
-# local neovim_dir=$HOME/.local/build/neovim
-# local neovim_version="v0.10.3"
-# [ ! -z $NVIM_VERSION ] && neovim_version="$NVIM_VERSION"
-# echo "neovim_version: \"$neovim_version\""
-# 
-# [ ! -d $neovim_dir ] && git clone https://github.com/neovim/neovim.git $neovim_dir
-# git -C $neovim_dir fetch --all
-# git -C $neovim_dir checkout $neovim_version
-# 
-# make -C $neovim_dir clean
-# make -C $neovim_dir CMAKE_BUILD_TYPE=RelWithDebInfo
-# sudo make -C $neovim_dir install
-
-# git clone https://github.com/ThePrimeagen/harpoon.git $HOME/personal/harpoon
-# cd $HOME/personal/harpoon
-# git fetch
-# git checkout harpoon2
-
-# git clone https://github.com/ThePrimeagen/vim-apm.git $HOME/personal/vim-apm
-# git clone https://github.com/ThePrimeagen/caleb.git $HOME/personal/caleb
-# git clone https://github.com/nvim-lua/plenary.nvim.git $HOME/personal/plenary
-