Adjust workspace use and related aerospace configs; minor other changes

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

installs_and_builds/s12_web_browser

@@ -1,10 +1,8 @@
 #!/bin/zsh
 
-# TODO: get browser config and install set up
-# current idea: qutebrowser for general, tor for sensitive, brave as a backup option
-
+# 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_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"

ref/workflow-and-workspaces-scheme.md

@@ -14,9 +14,9 @@ idea from the ThePrimeagen: designated workspace/label/desktop per app/purpose
 | 4. drawing (currently: gimp)                                 | stack                  |
 | 5. music/audio listening                                     | stack                  |
 | 6. comms (stack: emails, chats, av/calls)                    | stack                  |
-| 7. web browser                                               | stack                  |
+| 7. programming - misc (whatever is not in terminal)          | stack                  |
 | 8. terminal (primary; one-offs & tui apps can be anywhere)   | stack                  |
-| 9. programming - misc (whatever is not in terminal)          | stack                  |
+| 9. web browser                                               | stack                  |
 | 0. general - misc (catch-all)                                | stack                  |
 
 ### ideas/guidelines:

src_files/.config/aerospace/aerospace.toml

@@ -61,9 +61,8 @@ automatically-unhide-macos-hidden-apps = true
     # '''
 
     # See: https://nikitabobko.github.io/AeroSpace/commands#layout
-    alt-comma = 'layout v_accordion'
-    alt-period = 'layout h_tiles'
-    alt-slash = 'layout horizontal vertical'
+    alt-slash = 'layout tiles horizontal vertical'
+    alt-comma = 'layout accordion 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
@@ -120,8 +119,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']
-    g = ['flatten-workspace-tree', 'layout h_tiles', 'mode main']
+    t = ['flatten-workspace-tree', 'layout tiling', 'mode main']
+    s = ['layout v_accordion', 'mode main']
+    g = ['layout h_tiles', 'mode main']
 
     alt-shift-h = ['join-with left', 'mode main']
     alt-shift-j = ['join-with down', 'mode main']

src_files/.config/git/ignore

@@ -3,6 +3,7 @@
 zxcv*
 
 # compilation/debug/cache/build/etc
+**/bin/
 **/build/
 **/__pycache__/
 *.o

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,17 @@
+local defaultColorScheme = "tokyodark"
+
+function SetColorSchemeWrapper(scheme)
+  scheme = scheme or defaultColorScheme
+  vim.cmd.colorscheme(scheme)
+end
+
+SetColorSchemeWrapper(defaultColorScheme)
+--
+-- SetColorSchemeWrapper("tokyodark")
+-- SetColorSchemeWrapper("tokyonight-night")
+-- SetColorSchemeWrapper("bamboo-vulgaris")
+-- SetColorSchemeWrapper("rose-pine-main")
+-- SetColorSchemeWrapper("gruvbox")
+-- SetColorSchemeWrapper("slate")
+-- SetColorSchemeWrapper("sorbet")
+

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

@@ -22,13 +22,8 @@ vim.opt.rtp:prepend(path_lazy_nvim)
 
 require("lazy").setup({
     spec = {
-        { import = "plugins_lazy" },
+      { import = "plugins_lazy" },
     },
     checker = { enabled = false },
     change_detection = { notify = false },
-    dev = {
-        path = "~/dev/git/other/omarchy/plugins",
-        patterns = { 'LazyVim' },
-        fallback = false,
-    },
 })

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

@@ -5,14 +5,13 @@
   "autoPairBrackets": false,
   "autoPairMarkdown": false,
   "useTab": false,
-  "autoConvertHtml": true,
-  "vimMode": false,
+  "autoConvertHtml": false,
+  "vimMode": true,
   "trashOption": "none",
   "newFileLocation": "folder",
   "newFileFolderPath": "inbox",
   "showUnsupportedFiles": true,
   "attachmentFolderPath": "inbox",
   "showInlineTitle": false,
-  "readableLineLength": false,
-  "livePreview": false
+  "readableLineLength": false
 }

src_files/.config/obsidian/appearance.json

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

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 +1,16 @@
 {
   "markdown:toggle-preview": [
+    {
+      "modifiers": [
+        "Mod"
+      ],
+      "key": "E"
+    },
     {
       "modifiers": [
         "Alt"
       ],
       "key": "R"
     }
-  ],
-  "switcher:open": [
-    {
-      "modifiers": [
-        "Ctrl"
-      ],
-      "key": "F"
-    }
   ]
 }

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

@@ -10,7 +10,6 @@ alias login-aws-id-list="grep sso_account_id $HOME/.aws/config"
 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'

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