From b71cbe7312f8f9fbb983bd75e92c936dcb887e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20Dom=C3=ADnguez=20Ochoa?= <inakidomoc@gmail.com>
Date: Sat, 8 Aug 2026 15:46:57 +0200
Subject: [PATCH] merging workstation diffs

---
 nvim/.config/nvim/nvim-pack-lock.json                   | 4 ----
 scripts/hcf/package_repo_changes                        | 0
 scripts/hcf/podman_setup                                | 0
 scripts/hcf/rose_pine_switch                            | 0
 telegram/.config/autostart/org.telegram.desktop.desktop | 0
 tmux/.is_vim.sh                                         | 0
 zsh/.zsh_aliases                                        | 9 ++++++---
 zsh/.zshenv                                             | 2 +-
 zsh/zsh-completions                                     | 2 +-
 9 files changed, 8 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 scripts/hcf/package_repo_changes
 mode change 100755 => 100644 scripts/hcf/podman_setup
 mode change 100755 => 100644 scripts/hcf/rose_pine_switch
 mode change 100755 => 100644 telegram/.config/autostart/org.telegram.desktop.desktop
 mode change 100755 => 100644 tmux/.is_vim.sh

diff --git a/nvim/.config/nvim/nvim-pack-lock.json b/nvim/.config/nvim/nvim-pack-lock.json
index 623b75a..95ceaeb 100644
--- a/nvim/.config/nvim/nvim-pack-lock.json
+++ b/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"
diff --git a/scripts/hcf/package_repo_changes b/scripts/hcf/package_repo_changes
old mode 100755
new mode 100644
diff --git a/scripts/hcf/podman_setup b/scripts/hcf/podman_setup
old mode 100755
new mode 100644
diff --git a/scripts/hcf/rose_pine_switch b/scripts/hcf/rose_pine_switch
old mode 100755
new mode 100644
diff --git a/telegram/.config/autostart/org.telegram.desktop.desktop b/telegram/.config/autostart/org.telegram.desktop.desktop
old mode 100755
new mode 100644
diff --git a/tmux/.is_vim.sh b/tmux/.is_vim.sh
old mode 100755
new mode 100644
diff --git a/zsh/.zsh_aliases b/zsh/.zsh_aliases
index f8f57fb..96cdc7a 100644
--- a/zsh/.zsh_aliases
+++ b/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
diff --git a/zsh/.zshenv b/zsh/.zshenv
index c6d86c3..644a0fc 100644
--- a/zsh/.zshenv
+++ b/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
diff --git a/zsh/zsh-completions b/zsh/zsh-completions
index 8b97eaf..334c14d 160000
--- a/zsh/zsh-completions
+++ b/zsh/zsh-completions
@@ -1 +1 @@
-Subproject commit 8b97eaf521ba04e6fef021f144a2650b0d6aa0da
+Subproject commit 334c14d1b49ec8393292b16b2a972f20570361ac