merging workstation diffs

nvim/.config/nvim/nvim-pack-lock.json

@@ -91,10 +91,6 @@
       "rev": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e",
       "src": "https://github.com/folke/snacks.nvim"
     },
-    "themery.nvim": {
-      "rev": "bfa58f4b279d21cb515b28023e1b68ec908584b2",
-      "src": "https://github.com/zaldih/themery.nvim"
-    },
     "vim-fugitive": {
       "rev": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0",
       "src": "https://github.com/tpope/vim-fugitive"

zsh/.zsh_aliases

@@ -81,8 +81,10 @@ kptotps() { _kp_run show -st "$KEEPASS_DB" "$1"; }
 
 # run with KP_DEBUG=1 to troubleshoot if needed
 function load_gemini() {
-    export GEMINI_API_KEY=$(kpgets "Gemini API Key")
-    echo "Gemini API Key loaded into environment!"
+    if [[ -z "${MY_VARIABLE+set}" ]]; then
+        export GEMINI_API_KEY=$(kpgets "Gemini API Key")
+        echo "Gemini API Key loaded into environment!"
+    fi
 }
 
 function totp() {
@@ -101,7 +103,8 @@ function totp() {
     if $clip; then
         case "$UNAME_STRING" in
             Darwin) echo -n "$code" | pbcopy ;;
-            Linux)  if [[ "$XDG_SESSION_TYPE" == "wayland" ]]; then
+            Linux) SESSION_ID=$(loginctl session-status | head -n 1 | awk '{print $1}')
+                    if loginctl show-session "$SESSION_ID" -p Type | grep -q "Type=wayland"; then
                         echo -n "$code" | wl-copy
                     else
                         echo -n "$code" | xclip -selection clipboard

zsh/.zshenv

@@ -36,7 +36,7 @@ if [[ -t 0 ]]; then
         Linux*) eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" ;;
         Darwin*)
             eval "$(/opt/homebrew/bin/brew shellenv)"
-            export PATH="/opt/homebrew/bin/bash/bin:$PATH"
+            export PATH="/opt/homebrew/bin:$PATH"
             ;;
     esac
     if [[ -f "${HOME}/.cache/zsh/go-gopath" ]]; then