From 95579e3ca181036af31c0c9039fe3edc65c231b4 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 5 Sep 2024 20:20:06 +0200
Subject: feat(1password): make completion loading async

---
 plugins/1password/1password.plugin.zsh | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'plugins/1password')

diff --git a/plugins/1password/1password.plugin.zsh b/plugins/1password/1password.plugin.zsh
index 941523ca8..e8f91f8fe 100644
--- a/plugins/1password/1password.plugin.zsh
+++ b/plugins/1password/1password.plugin.zsh
@@ -1,9 +1,15 @@
 # Do nothing if op is not installed
 (( ${+commands[op]} )) || return
 
-# Load op completion
-eval "$(op completion zsh)"
-compdef _op op
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `op`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_op" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _op
+  _comps[op]=_op
+fi
+
+op completion zsh >| "$ZSH_CACHE_DIR/completions/_op" &|
 
 # Load opswd function
 autoload -Uz opswd
-- 
cgit v1.2.3-70-g09d2


From 80fa5e137672a529f65a05e396b40f0d133b2432 Mon Sep 17 00:00:00 2001
From: Carlo Sala <carlosalag@protonmail.com>
Date: Thu, 5 Sep 2024 20:20:45 +0200
Subject: fix(1password): copy password properly in `opswd`

Closes #12635
---
 plugins/1password/opswd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/1password')

diff --git a/plugins/1password/opswd b/plugins/1password/opswd
index 0f667d2ff..753de9f99 100644
--- a/plugins/1password/opswd
+++ b/plugins/1password/opswd
@@ -27,7 +27,7 @@ function opswd() {
 
   local password
   # Copy the password to the clipboard
-  if ! password=$(op item get "$service" --fields password 2>/dev/null); then
+  if ! password=$(op item get "$service" --reveal --fields password 2>/dev/null); then
     echo "error: could not obtain password for $service"
     return 1
   fi
-- 
cgit v1.2.3-70-g09d2