diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/fzf/fzf.plugin.zsh | 5 | ||||
| -rw-r--r-- | plugins/keychain/keychain.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/lol/lol.plugin.zsh | 2 | ||||
| -rw-r--r-- | plugins/sbt/README.md | 10 | ||||
| -rw-r--r-- | plugins/sbt/_sbt | 20 | ||||
| -rw-r--r-- | plugins/sbt/sbt.plugin.zsh | 10 | ||||
| -rw-r--r-- | plugins/tmux/README.md | 3 | ||||
| -rw-r--r-- | plugins/tmux/tmux.plugin.zsh | 3 |
8 files changed, 31 insertions, 24 deletions
diff --git a/plugins/fzf/fzf.plugin.zsh b/plugins/fzf/fzf.plugin.zsh index fe471a363..83626009d 100644 --- a/plugins/fzf/fzf.plugin.zsh +++ b/plugins/fzf/fzf.plugin.zsh @@ -67,7 +67,10 @@ function setup_using_debian_package() { # NOTE: There is no need to configure PATH for debian package, all binaries # are installed to /usr/bin by default - local completions="/usr/share/zsh/vendor-completions/_fzf" + # Determine completion file path: first bullseye/sid, then buster/stretch + local completions="/usr/share/doc/fzf/examples/completion.zsh" + [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf" + local key_bindings="/usr/share/doc/fzf/examples/key-bindings.zsh" # Auto-completion diff --git a/plugins/keychain/keychain.plugin.zsh b/plugins/keychain/keychain.plugin.zsh index af34793e7..def97d8d1 100644 --- a/plugins/keychain/keychain.plugin.zsh +++ b/plugins/keychain/keychain.plugin.zsh @@ -15,7 +15,7 @@ function _start_agent() { zstyle -a :omz:plugins:keychain options options # start keychain... - keychain ${^options:-} --agents ${agents:-gpg} ${^identities} + keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST # Get the filenames to store/lookup the environment from _keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh" diff --git a/plugins/lol/lol.plugin.zsh b/plugins/lol/lol.plugin.zsh index 585f96e4f..3c30259a1 100644 --- a/plugins/lol/lol.plugin.zsh +++ b/plugins/lol/lol.plugin.zsh @@ -45,7 +45,7 @@ alias bringz='git pull' alias chicken='git add' alias oanward='git commit -m' alias ooanward='git commit -am' -alias yolo='git commit -m "$(curl -s https://whatthecommit.com/index.txt)"' +alias yolo='git commit -m "$(curl -s http://whatthecommit.com/index.txt)"' alias letcat='git checkout' alias violenz='git rebase' diff --git a/plugins/sbt/README.md b/plugins/sbt/README.md index f1a5753b9..f0201938e 100644 --- a/plugins/sbt/README.md +++ b/plugins/sbt/README.md @@ -17,16 +17,16 @@ plugins=(... sbt) | sbcln | `sbt clean` | Deletes all generated files | | sbcc | `sbt clean compile` | Deletes generated files, compiles the main sources | | sbco | `sbt console` | Starts Scala with the compiled sources and all dependencies | -| sbcq | `sbt console-quick` | Starts Scala with all dependencies | -| sbcp | `sbt console-project` | Starts Scala with sbt and the build definitions | +| sbcq | `sbt consoleQuick` | Starts Scala with all dependencies | +| sbcp | `sbt consoleProject` | Starts Scala with sbt and the build definitions | | sbd | `sbt doc` | Generates API documentation for Scala source files | | sbdc | `sbt dist:clean` | Deletes the distribution packages | | sbdi | `sbt dist` | Creates the distribution packages | -| sbgi | `sbt gen-idea` | Create Idea project files | +| sbgi | `sbt genIdea` | Create Idea project files | | sbp | `sbt publish` | Publishes artifacts to the repository | -| sbpl | `sbt publish-local` | Publishes artifacts to the local Ivy repository | +| sbpl | `sbt publishLocal` | Publishes artifacts to the local Ivy repository | | sbr | `sbt run` | Runs the main class for the project | -| sbrm | `sbt run-main` | Runs the specified main class for the project | +| sbrm | `sbt runMain` | Runs the specified main class for the project | | sbu | `sbt update` | Resolves and retrieves external dependencies | | sbx | `sbt test` | Compiles and runs all tests | | sba | `sbt assembly` | Create a fat JAR with all dependencies | diff --git a/plugins/sbt/_sbt b/plugins/sbt/_sbt index a601c9b97..2138a722f 100644 --- a/plugins/sbt/_sbt +++ b/plugins/sbt/_sbt @@ -6,23 +6,23 @@ _sbt_commands=( 'clean:delete files produced by the build' 'compile:compile sources' 'console:start the Scala REPL with project classes on the classpath' - 'console-quick:start the Scala REPL with project deps on the classpath' - 'console-project:start the Scala REPL w/sbt+build-def on the classpath' + 'consoleQuick:start the Scala REPL with project deps on the classpath' + 'consoleProject:start the Scala REPL w/sbt+build-def on the classpath' 'dist:generate distribution artifacts' 'dist\:clean:clean distribution artifacts' 'doc:generate API documentation' - 'gen-idea:generate Intellij Idea project files' + 'genIdea:generate Intellij Idea project files' 'package:produce the main artifact, such as a binary jar' - 'package-doc:produce a doc artifact, such as a jar containing API docs' - 'package-src:produce a source artifact, such as a jar containing sources' + 'packageDoc:produce a doc artifact, such as a jar containing API docs' + 'packageSrc:produce a source artifact, such as a jar containing sources' 'publish:publish artifacts to a repository' - 'publish-local:publish artifacts to the local repository' - 'publish-m2:publish artifacts to the local Maven 2 repository' + 'publishLocal:publish artifacts to the local repository' + 'publishM2:publish artifacts to the local Maven 2 repository' 'run:run a main class' - 'run-main:run the main class selected by the first argument' + 'runMain:run the main class selected by the first argument' 'test:execute all tests' - 'test-only:execute the tests provided as arguments' - 'test-quick:execute previously failed tests' + 'testOnly:execute the tests provided as arguments' + 'testQuick:execute previously failed tests' 'update:resolve and optionally retrieve dependencies' ) diff --git a/plugins/sbt/sbt.plugin.zsh b/plugins/sbt/sbt.plugin.zsh index f883b7fee..851302c68 100644 --- a/plugins/sbt/sbt.plugin.zsh +++ b/plugins/sbt/sbt.plugin.zsh @@ -9,17 +9,17 @@ alias sbc='sbt compile' alias sbcc='sbt clean compile' alias sbco='sbt console' -alias sbcq='sbt console-quick' +alias sbcq='sbt consoleQuick' alias sbcln='sbt clean' -alias sbcp='sbt console-project' +alias sbcp='sbt consoleProject' alias sbd='sbt doc' alias sbdc='sbt dist:clean' alias sbdi='sbt dist' -alias sbgi='sbt gen-idea' +alias sbgi='sbt genIdea' alias sbp='sbt publish' -alias sbpl='sbt publish-local' +alias sbpl='sbt publishLocal' alias sbr='sbt run' -alias sbrm='sbt run-main' +alias sbrm='sbt runMain' alias sbu='sbt update' alias sbx='sbt test' alias sba='sbt assembly' diff --git a/plugins/tmux/README.md b/plugins/tmux/README.md index 1e25af38f..db57f5be2 100644 --- a/plugins/tmux/README.md +++ b/plugins/tmux/README.md @@ -37,4 +37,5 @@ The plugin also supports the following - | `ZSH_TMUX_ITERM2` | Sets the `-CC` option for iTerm2 tmux integration (default: `false`) | | `ZSH_TMUX_FIXTERM_WITHOUT_256COLOR` | `$TERM` to use for non 256-color terminals (default: `screen`) | | `ZSH_TMUX_FIXTERM_WITH_256COLOR` | `$TERM` to use for 256-color terminals (default: `screen-256color` | -| `ZSH_TMUX_CONFIG` | Set the configuration path (default: `$HOME/.tmux.conf`) |
\ No newline at end of file +| `ZSH_TMUX_CONFIG` | Set the configuration path (default: `$HOME/.tmux.conf`) | +| `ZSH_TMUX_UNICODE` | Set `tmux -u` option to support unicode | diff --git a/plugins/tmux/tmux.plugin.zsh b/plugins/tmux/tmux.plugin.zsh index dad3db578..e52443a71 100644 --- a/plugins/tmux/tmux.plugin.zsh +++ b/plugins/tmux/tmux.plugin.zsh @@ -36,6 +36,8 @@ alias tkss='tmux kill-session -t' : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color} # Set the configuration path : ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf} +# Set -u option to support unicode +: ${ZSH_TMUX_UNICODE:=false} # Determine if the terminal supports 256 colors if [[ $terminfo[colors] == 256 ]]; then @@ -62,6 +64,7 @@ function _zsh_tmux_plugin_run() { local -a tmux_cmd tmux_cmd=(command tmux) [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC) + [[ "$ZSH_TMUX_UNICODE" == "true" ]] && tmux_cmd+=(-u) # Try to connect to an existing session. [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach |