Rework profile/env for shells

I dug at this for a while and it never worked well. There might be some
way to do this with what currently exists, but it isn't obvious if so
and I don't think it is worth it. I think I may prefer to just set brave
to dark mode and keep the frame minimal. Also, my plan is to switch to
using qutebrowser as my primary browser anyway.

.tmux-session-hydrate

@@ -0,0 +1,3 @@
+source "$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
+tmux rename-window -t procs nv-kickstart
+tmux send-keys -t :nv-kickstart "cd $DIR_GIT_PROJECTS/other/kickstart.nvim" c-M

box_setup.sh

@@ -49,13 +49,12 @@ export BOX_SETUP_UPDATE_PKG_MANAGER_AND_DEFS_CMD="$update_pkg_manager_and_defs_c
 export BOX_SETUP_UPDATE_PKGS_CMD="$update_pkgs_cmd"
 
 # make dirs and copy configs/dotfiles
-source ./src_files/.config/zsh/.zshenv
+. ./src_files/shell/profile
 ./make_dirs.sh
 ./copy_dotfiles.sh $1
 
 # install programs
-source $ZDOTDIR/.zshenv
+. $ZDOTDIR/.zshrc
-source $ZDOTDIR/.zshrc
 ./install_programs.sh $1
 
 echo "setting the default theme: $DEFAULT_THEME_NAME"

copy_dotfiles.sh

@@ -34,11 +34,14 @@ sym_link() {
 }
 
 echo "---- copying dotfiles ------------------"
-source src_files/.config/zsh/.zshenv
+. ./src_files/shell/profile
-copy_file src_files/.config/zsh/.zshenv $HOME # copy first, ensure $ZDOTDIR set
-# copy_file src_files/.config/ksh/.profile $HOME # TODO: if using oksh, get it working
 
-# configs/executables/scripts from .config and .local
+# copy over env/profile files used by shell(s)
+copy_file src_files/shell/profile $XDG_CONFIG_HOME
+copy_file src_files/shell/.profile $HOME
+copy_file src_files/.config/zsh/.zshenv $HOME
+
+# copy over configs, executables, and scripts
 copy_dir src_files/.config $XDG_CONFIG_HOME
 copy_dir src_files/.local/bin $DIR_BIN
 copy_dir src_files/.local/scripts $DIR_SCRIPTS

make_dirs.sh

@@ -1,7 +1,7 @@
 #!/bin/zsh
 
 echo "---- making system dirs ----------------"
-source ./src_files/.config/zsh/.zshenv # ensure env vars set for use below
+. ./src_files/shell/profile # ensure env vars set for use below
 
 # some standard/common directories, some overlap/use in XDG directories
 [[ ! -d "$DIR_LOCAL" ]] && mkdir -p "$DIR_LOCAL"

src_files/.config/kitty/kitty.conf

@@ -20,7 +20,7 @@ macos_custom_beam_cursor          yes
 # theme stuff
 # NOTE: on linux, may want background_opacity at 1.0 and let hyprland handle transparency
 include ~/.config/kitty/theme.conf
-background_opacity 0.95
+background_opacity 0.94
 
 # etc
 enable_audio_bell no

src_files/.config/nvim/lua/plugins_lazy/harpoon.lua

@@ -8,7 +8,7 @@ return {
                 settings = {
                     save_on_toggle = true,
 				    sync_on_ui_close = true,
-                }
+                },
             })
         end,
     },

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

@@ -1,4 +1,10 @@
 return {
+    {
+        "L3MON4D3/LuaSnip",
+        version = "v2.*",
+        -- build = "make install_jsregexp"
+    },
+    {
         "neovim/nvim-lspconfig",
         dependencies = {
             "stevearc/conform.nvim",
@@ -120,4 +126,5 @@ return {
             -- vim.lsp.enable('standardrb')
             -- vim.lsp.enable('herb_ls') -- targets html + ruby (erb files)
         end,
+    },
 }

src_files/.config/nvim/lua/plugins_lazy/themes.lua

@@ -1,4 +1,31 @@
 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,
+        },
+    },
+    {
+        'ribru17/bamboo.nvim',
+        config = function()
+            require('bamboo').setup { }
+            require('bamboo').load()
+        end,
+    },
+    {
+        dir = vim.fn.stdpath("config") .. "/themes/pina",
+        name = "pina",
+    },
+    {
+        'steve-lohmeyer/mars.nvim',
+        name = 'mars',
+    },
     {
         "ellisonleao/gruvbox.nvim",
         name = "gruvbox",
@@ -27,6 +54,7 @@ return {
         },
     },
     {
+        -- even if not connected to a zz-this-box theme, keep this for nvim diffthis
         "rose-pine/neovim",
         name = "rose-pine",
     },
@@ -44,27 +72,4 @@ return {
             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',
-        config = function()
-            require('bamboo').setup { }
-            require('bamboo').load()
-        end,
-    },
-    {
-        dir = vim.fn.stdpath("config") .. "/themes/pina",
-        name = "pina",
-    },
 }

src_files/.config/zsh/.zshenv

@@ -1,48 +1 @@
-# default programs
+[ -r "$HOME/.config/profile" ] && . $HOME/.config/profile
-export BROWSER='brave'
-export EDITOR='nvim'
-export TERMINAL='kitty'
-
-# env vars used for my organization structure
-export DIR_HOME_BOX="$HOME/dbox"
-export DIR_NOTES="$DIR_HOME_BOX/notes"
-export DIR_MUSIC="$DIR_HOME_BOX/music/listen"
-export DIR_DEV="$HOME/dev"
-export DIR_GIT_PROJECTS="$DIR_DEV/git"
-
-# 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_SCRIPTS="$DIR_LOCAL/scripts"
-export DIR_USER_OPT="$HOME/opt"
-export DIR_USER_LIB="$DIR_LOCAL/lib"
-
-# xdg base directory vars
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_DATA_HOME="$DIR_LOCAL/share"
-export XDG_STATE_HOME="$DIR_LOCAL/state"
-export XDG_DATA_DIRS="/usr/local/share:/usr/share"
-#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS?
-
-# directory for theme/style stuff
-export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes"
-export DEFAULT_THEME_NAME="tokyodark"
-
-# zsh
-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
-export DIR_REAPER_PORTABLE_SHARED="$DIR_USER_OPT/reaper-portable/shared"
-export DIR_REAPER_PORTABLE_LINUX="$DIR_USER_OPT/reaper-portable/linux"
-export DIR_REAPER_PORTABLE_MACOS="$DIR_USER_OPT/reaper-portable/macos"
-
-# clean-up of home dir
-export __CF_USER_TEXT_ENCODING="0x0:0x0" # TODO: does this actually accomplish anything?
-

src_files/.config/zsh/.zshrc

@@ -35,7 +35,7 @@ alias weather='curl "wttr.in/dfw?2&F"'
 alias shrug='echo "¯\\_(ツ)_/¯"'
 
 # source extensions and system-specific files
-[[ -a "$ZDOTDIR/zsh-general-dev" ]] && source "$ZDOTDIR/zsh-general-dev"
+[[ -a "$ZDOTDIR/zsh-general-dev" ]] && . "$ZDOTDIR/zsh-general-dev"
 
 # programming and language setup
 [[ -n $(command -v mise) ]] && eval "$(mise activate zsh)"

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

@@ -1,5 +1,5 @@
 # set env vars, path updates, etc
-[[ -a $HOME/.local-box-vars ]] && source $HOME/.local-box-vars
+[[ -a $HOME/.local-box-vars ]] && . $HOME/.local-box-vars
 
 # login shortcuts
 alias assume="source assume"

src_files/.config/zz-this-box/themes/pina/brave.theme

@@ -0,0 +1 @@
+125,176,133

src_files/.local/bin/launch-reaper

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # trying the "portable install" option; using this launch script to point to that
-source "$XDG_CONFIG_HOME/zsh/.zshenv"
+. $XDG_CONFIG_HOME/profile
 
 reaper_portable_exec_linux="$DIR_REAPER_PORTABLE_LINUX/REAPER/reaper"
 [[ ! -x "$reaper_portable_exec_linux" ]] && {

src_files/.local/scripts/theme-set

@@ -45,12 +45,12 @@ theme_update_browser() {
     )
     [[ "$OSTYPE" != *"darwin"* ]] && {
         echo "{\"$policy\": \"$color_hex\"}" > "/etc/brave/policies/managed/color.json"
-    } || {
-        # currently not working, property is set and seen by brave, but colors are not
-        # actually applied, leaving here as is for now; TODO: fix or just remove
-        defaults write com.brave.browser $policy -string "$color_hex"
-    }
         brave --refresh-platform-policy --no-startup-window > /dev/null
+    } || {
+        # TODO: fix or just remove this macos part; currently, property is set and seen
+        # by brave, but colors are applied either with a huge delay or not at all
+        # defaults write com.brave.Browser $policy -string "$color_hex"
+    }
 }
 
 [[ ! -z $1 ]] && raw_target="$1" ||

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

@@ -7,7 +7,7 @@ tmux_switch_to() {
 tmux_hydrate() {
     local tmux_hydrate_path="$XDG_CONFIG_HOME/tmux/.tmux-session-hydrate-default"
     [[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate"
-    [[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 "source $tmux_hydrate_path" c-M
+    [[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 ". $tmux_hydrate_path" c-M
 }
 
 tmux_existing_sessions=$(tmux list-sessions 2> /dev/null || echo '')

src_files/bin_overrides_macos/launch-reaper

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # trying the "portable install" option; using this launch script to point to that
-source "$XDG_CONFIG_HOME/zsh/.zshenv"
+. $XDG_CONFIG_HOME/profile
 
 reaper_portable_exec_macos="$DIR_REAPER_PORTABLE_MACOS/REAPER.app/Contents/MacOS/REAPER"
 [[ ! -x "$reaper_portable_exec_macos" ]] && {

src_files/imports/themes-omarchy-extra/mars/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Steve Lohmeyer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

src_files/imports/themes-omarchy-extra/mars/chromium.theme

@@ -0,0 +1 @@
+45,26,26

src_files/imports/themes-omarchy-extra/mars/hyprland.conf

@@ -0,0 +1,4 @@
+general {
+    col.active_border = rgba(C45A3Fff) rgba(7B534Eff) 45deg
+}
+

src_files/imports/themes-omarchy-extra/mars/hyprlock.conf

@@ -0,0 +1,5 @@
+$color = rgba(00, 00, 00, 1.0)
+$inner_color = rgba(47, 27, 27, 0.8)
+$outer_color = rgba(217, 175, 167, 1.0)
+$font_color = rgba(217, 175, 167, 1.0)
+$check_color = rgba(255, 107, 74, 1.0)

src_files/imports/themes-omarchy-extra/mars/kitty.conf

@@ -0,0 +1,39 @@
+## original name ghostty.conf
+## license: MIT
+## author: Steve Lohmeyer (github: steve-lohmeyer)
+## upstream: https://github.com/steve-lohmeyer/omarchy-mars-theme/blob/master/ghostty.conf
+
+# This file is adapted from the ghostty.conf theme file from omarchy-mars-theme
+# (https://github.com/steve-lohmeyer/omarchy-mars-theme).
+
+##########################################################################################
+
+foreground              #D9AFA7
+background              #000000
+selection_foreground    #000000
+selection_background    #4A2C2C
+active_tab_foreground   #000000
+active_tab_background   #D9AFA7
+inactive_tab_foreground #D9AFA7
+inactive_tab_background #000000
+cursor                  #FF6B4A
+cursor_text_color       #000000
+
+# black, red, green, yellow, blue, magenta, cyan, white
+color0   #000000
+color1   #E07B5F
+color2   #7B534E
+color3   #C45A3F
+color4   #7B534E
+color5   #A0392F
+color6   #7B534E
+color7   #D9AFA7
+# black, red, green, yellow, blue, magenta, cyan, white
+color8   #4A2C2C
+color9   #FF6B4A
+color10  #7B534E
+color11  #E07B5F
+color12  #7B534E
+color13  #C45A3F
+color14  #7B534E
+color15  #D9AFA7

src_files/imports/themes-omarchy-extra/mars/waybar.css

@@ -0,0 +1,3 @@
+/* Waybar CSS for Mars theme */
+@define-color foreground #D9AFA7;
+@define-color background #000000;

src_files/imports/themes-omarchy-extra/pina/chromium.theme

@@ -1 +0,0 @@
-224,212,128

src_files/imports/themes-omarchy-extra/pina/kitty.conf

@@ -1,6 +1,6 @@
 ## original name ghostty.conf
-## author: bjarneo (aka: iamdothash)
 ## license: (no license was specified)
+## author: bjarneo (aka: iamdothash)
 ## upstream: https://github.com/bjarneo/omarchy-pina-theme/blob/main/ghostty.conf
 
 # This file is adapted from the ghostty.conf theme file from omarchy-pina-theme
@@ -12,42 +12,29 @@ foreground              #D4D5D5
 background              #171A18
 selection_foreground    #171A18
 selection_background    #D4D5D5
-cursor                  #E4DAD9
-cursor_text_color       #070A08
 active_tab_foreground   #171A18
 active_tab_background   #D4D5D5
 inactive_tab_foreground #D4D5D5
 inactive_tab_background #171A18
+cursor                  #E4DAD9
+cursor_text_color       #070A08
 
-# black
+# black, red, green, yellow, blue, magenta, cyan, white
 color0   #171A18
-color8   #6B8071
-
-# red
 color1   #7DB085
-color9   #8CC098
-
-# green
 color2   #B8C082
-color10  #CDD590
-
-# yellow
 color3   #E0D480
-color11  #F2E590
-
-# blue
 color4   #7DD2B8
-color12  #92E2C8
-
-# magenta
 color5   #B5C9A4
-color13  #C8DAB8
-
-# cyan
 color6   #C5E8C5
-color14  #D8F5D8
-
-# white
 color7   #D4D5D5
+# black, red, green, yellow, blue, magenta, cyan, white
+color8   #6B8071
+color9   #8CC098
+color10  #CDD590
+color11  #F2E590
+color12  #92E2C8
+color13  #C8DAB8
+color14  #D8F5D8
 color15  #E2E3E3
 

src_files/shell/.profile

@@ -0,0 +1 @@
+[ -r "$HOME/.config/profile" ] && . $HOME/.config/profile

src_files/shell/profile

@@ -0,0 +1,51 @@
+# default programs
+export BROWSER='brave'
+export EDITOR='nvim'
+export TERMINAL='kitty'
+
+# set ENV for ksh/oksh (should be ignored by zsh and bash)
+export ENV="$HOME/.config/ksh/kshrc"
+
+# env vars used for my organization structure
+export DIR_HOME_BOX="$HOME/dbox"
+export DIR_NOTES="$DIR_HOME_BOX/notes"
+export DIR_MUSIC="$DIR_HOME_BOX/music/listen"
+export DIR_DEV="$HOME/dev"
+export DIR_GIT_PROJECTS="$DIR_DEV/git"
+
+# 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_SCRIPTS="$DIR_LOCAL/scripts"
+export DIR_USER_OPT="$HOME/opt"
+export DIR_USER_LIB="$DIR_LOCAL/lib"
+
+# xdg base directory vars
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_DATA_HOME="$DIR_LOCAL/share"
+export XDG_STATE_HOME="$DIR_LOCAL/state"
+export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+#export XDG_CONFIG_DIRS="/etc/xdg" # TODO: does this work on macOS?
+
+# directory for theme/style stuff
+export DIR_THEME_SETTINGS="$XDG_CONFIG_HOME/zz-this-box/themes"
+export DEFAULT_THEME_NAME="tokyodark"
+
+# zsh
+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
+export DIR_REAPER_PORTABLE_SHARED="$DIR_USER_OPT/reaper-portable/shared"
+export DIR_REAPER_PORTABLE_LINUX="$DIR_USER_OPT/reaper-portable/linux"
+export DIR_REAPER_PORTABLE_MACOS="$DIR_USER_OPT/reaper-portable/macos"
+
+# clean-up of home dir
+export __CF_USER_TEXT_ENCODING="0x0:0x0" # TODO: does this actually accomplish anything?
+

theme_config.sh

@@ -8,7 +8,7 @@ sym_link() {
 }
 
 echo "---- configuring themes ----------------"
-source src_files/.config/zsh/.zshenv
+. ./src_files/shell/profile
 
 echo "copying theme imports into config dirs"
 omarchy_themes=(`find src_files/imports/themes-omarchy-* -mindepth 1 -maxdepth 1 -type d`)