clean up

config/shell/zshrc

@@ -24,7 +24,7 @@ export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
 
 # ---- SSH agent socket ----
 # Match the socket used by ssh-agent.socket (OpenSSH), not GCR/gnome-keyring.
-export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.sock"
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
 
 # ---- Oh My Zsh ----
 export ZSH="$HOME/.oh-my-zsh"
@@ -73,7 +73,7 @@ if [ -z "${BW_SESSION:-}" ] && [ -f "$HOME/.config/Bitwarden CLI/.session" ]; th
 fi
 if [ -n "${BW_SESSION:-}" ]; then
   eval "$(bw get item Environment 2>/dev/null | jq -r '
-    .fields[] | select(.type != 0) |
+    .fields[] | select(.type == 0) |
     "export " + (.name | gsub(" "; "_")) + "=" + (.value | @sh)
   ' 2>/dev/null)" 2>/dev/null
 fi

config/systemd/bw-ssh-keys.service

@@ -8,7 +8,7 @@ Wants=ssh-agent.service
 [Service]
 Type=oneshot
 Environment=PATH=%h/.local/bin:/usr/local/bin:/usr/bin:/bin
-Environment=SSH_AUTH_SOCK=%t/ssh-agent.sock
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
 ExecStart=%h/.local/bin/bw-load-ssh.sh
 RemainAfterExit=yes
 Restart=on-failure

stages/01-repos.sh

@@ -100,12 +100,6 @@ EOF
     ok "  Signal repo added."
   fi
 
-  # ---- Papirus icon theme (PPA) ----
-  info "  Adding Papirus PPA..."
-  if [ ! -f /etc/apt/sources.list.d/papirus-ubuntu-papirus-*.sources ]; then
-    $REPO_ADD_PPA papirus/papirus 2>/dev/null && ok "  Papirus PPA added." || warn "  Papirus PPA failed."
-  fi
-
   # ---- Solaar (Logitech) PPA ----
   info "  Adding Solaar PPA..."
   if [ ! -f /etc/apt/sources.list.d/solaar-unifying-ubuntu-stable-*.sources ]; then
@@ -126,10 +120,6 @@ EOF
     ok "  Zotero repo added."
   fi
 
-  # ---- Yubico PPA ----
-  info "  Adding Yubico PPA..."
-  $REPO_ADD_PPA yubico/stable 2>/dev/null && ok "  Yubico PPA added." || warn "  Yubico PPA failed."
-
 # ==================================================================
 #  FEDORA / RHEL — DNF-based
 # ==================================================================
@@ -184,14 +174,11 @@ EOF
   info "  Note: Signal will be installed via Flatpak in stage 12."
 
   # ---- COPRs for extra packages ----
-  # Papirus icon theme is in RPM Fusion nonfree.
   # Solaar is in RPM Fusion.
-  # Yubico tools: use COPR
   info "  Adding COPR repos..."
   # Ghostty terminal emulator
   $REPO_ADD_COPR scottames/ghostty 2>/dev/null && ok "  Ghostty COPR added." || warn "  Ghostty COPR failed."
-  # $REPO_ADD_COPR atim/papirus-icon-theme 2>/dev/null || true
-  # $REPO_ADD_COPR sergiomb/Solaar 2>/dev/null || true
+  $REPO_ADD_COPR sergiomb/Solaar 2>/dev/null || true
 
   # ---- Zotero — no DNF repo, use Flatpak (handled in stage 13) ----
   info "  Note: Zotero will be installed via Flatpak or tarball in stage 13."

stages/09-desktop.sh

@@ -217,22 +217,3 @@ install_nerd_font "FiraCode"
 # Rebuild font cache
 fc-cache -f "$FONT_DIR" 2>/dev/null || true
 ok "Font cache rebuilt."
-
-# ===========================================================================
-#  7. GTK Theme (dark mode + Papirus icons)
-# ===========================================================================
-info "Setting GTK theme and icons..."
-gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' 2>/dev/null || true
-gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' 2>/dev/null || true
-gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark' 2>/dev/null || true
-ok "GTK dark theme + Papirus icons set."
-
-# ===========================================================================
-#  8. Solaar (Logitech peripherals) config
-# ===========================================================================
-# The Pop machine had config for MX Keys Mini + MX Master 3.
-# Solaar config is auto-generated when you pair devices. The config
-# template (if supplied) can be placed at ~/.config/solaar/config.yaml
-info "Solaar config will be generated automatically when you pair devices."
-
-ok "Stage 09 complete: desktop configured."