Merge 3ce427d196 into a79b37b954

This reverts commit 475b18f39a.

lib/clipboard.zsh

@@ -84,6 +84,17 @@ function detect-clipboard() {
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
     function clipcopy() { tmux load-buffer -w "${1:--}"; }
     function clippaste() { tmux save-buffer -; }
+  elif [[ "$TERM" == "xterm"* || "$TERM" == "screen"* || "$TERM" == "tmux"* ]]; then
+    # OSC 52 support
+    function clipcopy() {
+      local content_tocopy
+      content_tocopy=$(cat "${1:-/dev/stdin}" | base64 | tr -d '\n')
+      printf "\033]52;c;%s\a" "$content_tocopy" > /dev/tty
+    }
+    function clippaste() {
+      echo "OSC 52 does not support pasting from the clipboard."
+      return 1
+    }
   else
     function _retry_clipboard_detection_or_fail() {
       local clipcmd="${1}"; shift

plugins/copybuffer/copybuffer.plugin.zsh

@@ -14,3 +14,4 @@ zle -N copybuffer
 bindkey -M emacs "^O" copybuffer
 bindkey -M viins "^O" copybuffer
 bindkey -M vicmd "^O" copybuffer
+bindkey -M vicmd "yy" copybuffer

plugins/kubectl/README.md

@@ -90,7 +90,7 @@ plugins=(... kubectl)
 | kga      | `kubectl get all`                                       | List all resources in ps format                                                                  |
 | kgaa     | `kubectl get all --all-namespaces`                      | List the requested object(s) across all namespaces                                               |
 |          |                                                         | **Logs**                                                                                         |
-| klog     | `kubectl logs`                                          | Print the logs for a container or resource                                                       |
+| kl       | `kubectl logs`                                          | Print the logs for a container or resource                                                       |
 | klf      | `kubectl logs -f`                                       | Stream the logs for a container or resource (follow)                                             |
 |          |                                                         | **File copy**                                                                                    |
 | kcp      | `kubectl cp`                                            | Copy files and directories to and from containers                                                |

plugins/kubectl/kubectl.plugin.zsh

@@ -135,7 +135,7 @@ alias kga='kubectl get all'
 alias kgaa='kubectl get all --all-namespaces'
 
 # Logs
-alias klog='kubectl logs'
+alias kl='kubectl logs'
 alias kl1h='kubectl logs --since 1h'
 alias kl1m='kubectl logs --since 1m'
 alias kl1s='kubectl logs --since 1s'