feat(jj): add alias for jj abandon (#13510)

BREAKING CHANGE: `op` v1 support has been removed. Please migrate to v2
if you are affected by this change.

.github/workflows/dependencies/requirements.txt

@@ -4,4 +4,4 @@ idna==3.11
 PyYAML==6.0.3
 requests==2.32.5
 semver==3.0.4
-urllib3==2.6.2
+urllib3==2.6.3

plugins/1password/_opswd

@@ -6,14 +6,4 @@ function _opswd() {
   [[ -z "$services" ]] || compadd -a -- services
 }
 
-# TODO: 2022-03-26: Remove support for op CLI 1
-autoload -Uz is-at-least
-is-at-least 2.0.0 $(op --version) || {
-  function _opswd() {
-    local -a services
-    services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
-    [[ -z "$services" ]] || compadd -a -- services
-  }
-}
-
 _opswd "$@"

plugins/1password/opswd

@@ -46,45 +46,4 @@ function opswd() {
   (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
 }
 
-# TODO: 2022-03-26: Remove support for op CLI 1
-autoload -Uz is-at-least
-is-at-least 2.0.0 $(op --version) || {
-  print -ru2 ${(%):-"%F{yellow}opswd: usage with op version $(op --version) is deprecated. Upgrade to CLI 2 and reload zsh.
-For instructions, see https://developer.1password.com/docs/cli/upgrade.%f"}
-
-  # opswd puts the password of the named service into the clipboard. If there's a
-  # one time password, it will be copied into the clipboard after 10 seconds. The
-  # clipboard is cleared after another 20 seconds.
-  function opswd() {
-    if [[ $# -lt 1 ]]; then
-      echo "Usage: opswd <service>"
-      return 1
-    fi
-
-    local service=$1
-
-    # If not logged in, print error and return
-    op list users > /dev/null || return
-
-    local password
-    # Copy the password to the clipboard
-    if ! password=$(op get item "$service" --fields password 2>/dev/null); then
-      echo "error: could not obtain password for $service"
-      return 1
-    fi
-
-    echo -n "$password" | clipcopy
-    echo "✔ password for $service copied to clipboard"
-
-    # If there's a one time password, copy it to the clipboard after 5 seconds
-    local totp
-    if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
-      sleep 10 && echo -n "$totp" | clipcopy
-      echo "✔ TOTP for $service copied to clipboard"
-    fi
-
-    (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
-  }
-}
-
 opswd "$@"

plugins/jj/README.md

@@ -12,6 +12,7 @@ plugins=(... jj)
 
 | Alias  | Command                       |
 | ------ | ----------------------------- |
+| jja    | `jj abandon`                  |
 | jjb    | `jj bookmark`                 |
 | jjbc   | `jj bookmark create`          |
 | jjbd   | `jj bookmark delete`          |

plugins/jj/jj.plugin.zsh

@@ -34,6 +34,7 @@ function jj_prompt_template() {
 }
 
 # Aliases (sorted alphabetically)
+alias jja='jj abandon'
 alias jjb='jj bookmark'
 alias jjbc='jj bookmark create'
 alias jjbd='jj bookmark delete'

plugins/mise/mise.plugin.zsh

@@ -1,27 +1,17 @@
-# TODO: 2024-01-03 remove rtx support
-local __mise=mise
 if (( ! $+commands[mise] )); then
-  if (( $+commands[rtx] )); then
-    __mise=rtx
-  else
   return
 fi
-fi
 
 # Load mise hooks
-eval "$($__mise activate zsh)"
-
-# Hook mise into current environment
-eval "$($__mise hook-env -s zsh)"
+eval "$(mise activate zsh)"
 
 # If the completion file doesn't exist yet, we need to autoload it and
 # bind it to `mise`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_$__mise" ]]; then
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_mise" ]]; then
   typeset -g -A _comps
-  autoload -Uz _$__mise
-  _comps[$__mise]=_$__mise
+  autoload -Uz _mise
+  _comps[mise]=_mise
 fi
 
 # Generate and load mise completion
-$__mise completion zsh >| "$ZSH_CACHE_DIR/completions/_$__mise" &|
-unset __mise
+mise completion zsh >| "$ZSH_CACHE_DIR/completions/_mise" &|