From fd80c6873fe45c3dd79b6df6c5f56cac0c5d0d28 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Tue, 26 Mar 2024 00:36:00 +0100 Subject: [PATCH 1/2] docs: prepare README for switch to zplug --- README.MD | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/README.MD b/README.MD index 8509eae..37e4a35 100644 --- a/README.MD +++ b/README.MD @@ -1,9 +1,23 @@ # psh ![CI](https://github.com/pascal-zarrad/psh/workflows/CI/badge.svg?branch=master) -psh - which stands for Pascal's Shell is a configuration tool for zsh. It is a composition of the finest plugins and a nice looking theme (currently it is one bundled with oh-my-zsh) that helps myself and hopefully also others to grow their productivity by customizing their shell experience. - -This installer enables the fast installation of zsh, antigen (bundled with oh-my-zsh) and other stuff that is required for a great zsh experience on the shell. The installer generates always a custom .zshrc which can be modified by adding own customizations to the plugins folder. To make customizations even easier, psh has a template system that allows the import of personalized .zshrc snippets that are composed together and inserted into the generated configuration! - -It was never that easy and therefore fast to install a customized shell than with psh - and with some knowledge about shell scripting with bash, you will be able to implement everything you could imagine in a configuration for zsh. +psh - which stands for Pascal's Shell is a configuration tool for zsh. +It is a composition of the finest plugins and a nice looking theme (currently it is one bundled with oh-my-zsh) +that helps myself and hopefully also others to grow their productivity by customizing their shell experience. + +This installer enables the fast installation of zsh, zplug and other stuff that is required for a great zsh experience on the shell. +The installer generates always a custom .zshrc which can be modified by adding own customizations to the plugins folder. +To make customizations even easier, psh has a template system that allows the import of personalized .zshrc snippets that are composed together +and inserted into the generated configuration! + +It was never that easy and therefore fast to install a customized shell than with psh - and with some knowledge about shell scripting with bash, +you will be able to implement everything you could imagine in a configuration for zsh. + +> Why psh if I could just use zplug? +> +> First of all, psh is pre-configured in a way that is already quite powerful. +> Secondly, psh takes care of dependencies. You setup your new os, clone this repository +> and run the `install.sh` script. If your system is supported, psh installs literally +> everything necessary - from zsh to git or curl - you can just start working without +> any further manual stuff to do for your shell setup. ![PSH Installer](https://github.com/pascal-zarrad/psh/raw/master/.github/MEDIA/psh.gif) @@ -22,13 +36,12 @@ But as the installer uses ```apt```, you need any system that supports ```apt``` Currently psh is only tested in the following environments: * Arch Linux * Manjaro Linux - * Ubuntu 22.04 (Windows Subsystem for Linux 1) (Take a look at "Note on WSL 1") - * Ubuntu 22.04 (Windows Subsystem for Linux 2) - * Ubuntu 22.04 - * Ubuntu 20.04 (Windows Subsystem for Linux 1) (Take a look at "Note on WSL 1") - * Ubuntu 20.04 (Windows Subsystem for Linux 2) - * Ubuntu 20.04 - * Debian 11 + + Windows Subsystem for Linux 2 (WSL2) + * Ubuntu + * Debian + + PopOs! + +Always assume that the newest operating system version relativ to the newest release has been used. You can find further information in the wiki under [Compatibility](https://github.com/pascal-zarrad/psh/wiki/Compatibility). From 0e6795b538a9987589591e0d83c3b63a4abb5eb3 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Tue, 26 Mar 2024 01:09:51 +0100 Subject: [PATCH 2/2] feat: replace antigen with zplug --- install.sh | 59 ++++++++++--------- lib/plugin_api.sh | 37 ++++++++---- lib/template_engine.sh | 24 ++++---- plugins/alias-finder/plugin.sh | 2 +- plugins/aliases-cheatsheet/plugin.sh | 2 +- plugins/ansible/plugin.sh | 2 +- plugins/aws/plugin.sh | 2 +- plugins/azure/plugin.sh | 2 +- plugins/bgnotify/plugin.sh | 2 +- plugins/brew/plugin.sh | 2 +- plugins/bun-js/plugin.sh | 2 +- plugins/catimg/plugin.sh | 2 +- plugins/command-not-found/plugin.sh | 2 +- plugins/common-aliases/plugin.sh | 2 +- plugins/composer/plugin.sh | 2 +- plugins/copypath/plugin.sh | 2 +- plugins/direnv/plugin.sh | 2 +- plugins/docker/plugin.sh | 6 +- plugins/encode64/plugin.sh | 2 +- plugins/extract/plugin.sh | 2 +- plugins/genpass/plugin.sh | 2 +- plugins/git/plugin.sh | 6 +- plugins/github-cli/plugin.sh | 2 +- plugins/golang/plugin.sh | 2 +- plugins/gradle/plugin.sh | 2 +- plugins/jsontools/plugin.sh | 2 +- plugins/k8s/plugin.sh | 6 +- plugins/mvn/plugin.sh | 2 +- plugins/node/plugin.sh | 6 +- plugins/python/plugin.sh | 6 +- plugins/redis-cli/plugin.sh | 2 +- plugins/rsync/plugin.sh | 2 +- plugins/safe-paste/plugin.sh | 2 +- plugins/ssh-agent/plugin.sh | 2 +- plugins/theme-loader/plugin.sh | 2 +- plugins/timer/plugin.sh | 2 +- plugins/universal-archive/plugin.sh | 2 +- plugins/urltools/plugin.sh | 2 +- plugins/vscode/plugin.sh | 2 +- plugins/web-search/plugin.sh | 2 +- plugins/yarn/plugin.sh | 4 +- plugins/zsh-enhancements/plugin.sh | 8 +-- plugins/zsh-z/plugin.sh | 2 +- ...zsh-completions-dir-missing.template.zshrc | 5 -- templates/ssh_agent_lazy.template.zshrc | 2 +- 45 files changed, 121 insertions(+), 114 deletions(-) delete mode 100644 templates/fix-zsh-completions-dir-missing.template.zshrc diff --git a/install.sh b/install.sh index 6323402..3de761b 100755 --- a/install.sh +++ b/install.sh @@ -207,30 +207,30 @@ fi print_success "Installed all system dependencies for psh!" print_message "" -# Install antigen to ~/.antigen/antigen.sh +# Install zplug to ~/.zplug print_message "" print_message "The basic installation of zsh is now done." print_message "Now components required for customization will be installed." -print_message "Antigen is used for plugin management." +print_message "zplug is used for plugin management." print_message "To enable this plugin manager, it will now be installed..." -readonly ANTIGEN_FOLDER_PATH="${CUSTOM_USER_HOME_DIR}/.antigen" -readonly ANTIGEN_PATH="${ANTIGEN_FOLDER_PATH}/antigen.zsh" -if [ -f "${ANTIGEN_PATH}" ] +readonly ZPLUG_FOLDER_PATH="${CUSTOM_USER_HOME_DIR}/.zplug" +readonly ZPLUG_PATH="${ZPLUG_FOLDER_PATH}/init.zsh" +if [ -f "${ZPLUG_PATH}" ] then - print_success "Antigen is already installed." + print_success "zplug is already installed." else - if ! [ -d "${ANTIGEN_FOLDER_PATH}" ]; then - mkdir "${ANTIGEN_FOLDER_PATH}" + if ! [ -d "${ZPLUG_FOLDER_PATH}" ]; then + mkdir "${ZPLUG_FOLDER_PATH}" fi - if curl -L git.io/antigen > "${ANTIGEN_PATH}" + if git clone https://github.com/zplug/zplug "${ZPLUG_FOLDER_PATH}" then - print_success "Successfully installed antigen to ${ANTIGEN_PATH}" + print_success "Successfully installed zplug to ${ZPLUG_PATH}" else - print_error "Failed to install antigen!" + print_error "Failed to install zplug!" exit 1 fi fi -fix_user_permissions "${start_arg_install_for_user_parameter}" "${ANTIGEN_FOLDER_PATH}" +fix_user_permissions "${start_arg_install_for_user_parameter}" "${ZPLUG_FOLDER_PATH}" # Load plugin API source "lib/plugin_api.sh" @@ -263,7 +263,7 @@ print_message "" source "lib/template_engine.sh" print_message "" -# Now reset ~/.zshrc, as we build our own only using antigen +# Now reset ~/.zshrc, as we build our own only using zplug # to load things { echo "# This .zshrc has been generated by psh." @@ -274,20 +274,14 @@ print_message "" # Include templates the the start of the file after the header include_templates "${TEMPLATE_START}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" -# Enable antigen +# Enable zplug { - echo "# Enable antigen" - echo "source ${ANTIGEN_PATH}" + echo "# Enable zplug" + echo "source ${ZPLUG_PATH}" } >> "${ZSHRC_PATH}" -# Include templates after antigen has been loaded but before oh-my-zsh is being loaded -include_templates "${TEMPLATE_BETWEEN_ANTIGEN_AND_OH_MY_ZSH}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" - -# Load oh-my-zsh library -{ - echo "# Load oh-my-zsh library" - echo "antigen use oh-my-zsh" -} >> "${ZSHRC_PATH}" +# Include templates after zplug has been loaded but before oh-my-zsh is being loaded +include_templates "${TEMPLATE_BETWEEN_ZPLUG_AND_OH_MY_ZSH}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" # Include templates between oh-my-zsh and the plugin execution include_templates "${TEMPLATE_BETWEEN_OH_MY_ZSH_AND_PLUGINS}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" @@ -333,14 +327,21 @@ if [ "${start_arg_disable_plugin_system_parameter}" -ne 1 ]; then print_message "" fi -# Include templates after plugins being loaded but before antigen settings are applied -include_templates "${TEMPLATE_AFTER_PLUGINS_BEFORE_ANTIGEN_APPLY}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" +# Include templates after plugins being loaded but before zplug settings are applied +include_templates "${TEMPLATE_AFTER_PLUGINS_BEFORE_ZPLUG_APPLY}" "${start_arg_disable_template_engine_parameter}" "${ZSHRC_PATH}" { - # Now finish by telling antigen to apply the bundles and themes + # Now finish by telling zplug to inhstall and load the bundles and themes # Now load oh-my-zsh library - echo "# Apply everything" - echo "antigen apply" + echo "# Install plugins" + echo "if ! zplug check --verbose; then" + echo " printf \"Install? [y/N]: \"" + echo " if read -q; then;" + echo " echo; zplug install" + echo " fi" + echo "fi" + echo "# Load plugins" + echo "zplug load" } >> "${ZSHRC_PATH}" # Include templates at the end of the .zshrc diff --git a/lib/plugin_api.sh b/lib/plugin_api.sh index 0d3880b..0b1a8fd 100644 --- a/lib/plugin_api.sh +++ b/lib/plugin_api.sh @@ -37,24 +37,35 @@ function write_zshrc() { echo "$content" >> "${ZSHRC_PATH}" } -# Function that checks if antigen bundle is loaded or not -# and then adds the bundle to the .zshrc -# -# @param $1 The bundle to add to the .zshrc -function apply_antigen_bundle() { - antigen_bundle="$1" - if ! grep -q "$antigen_bundle" "${ZSHRC_PATH}" ; then - write_zshrc "antigen bundle ${antigen_bundle}" +# Function that checks if zplug plugin is loaded or not +# and then adds the plugin to the .zshrc +# +# @param $1 The plugin to add to the .zshrc +function apply_plugin() { + zplug_plugin="$1" + if ! grep -q "zplug \"${zplug_plugin}\"" "${ZSHRC_PATH}" ; then + write_zshrc "zplug \"${zplug_plugin}\"" + fi +} + +# Function that checks if zplug oh-my-zsh plugin is loaded or not +# and then adds the plugin to the .zshrc +# +# @param $1 The plugin to add to the .zshrc +function apply_ohmyzsh_plugin() { + zplug_plugin="$1" + if ! grep -q "zplug \"plugins/${zplug_plugin}\", from:oh-my-zsh" "${ZSHRC_PATH}" ; then + write_zshrc "zplug \"plugins/${zplug_plugin}\", from:oh-my-zsh" fi } -# Function that checks if antigen theme is loaded or not +# Function that checks if zplug theme is loaded or not # and then adds the theme to the .zshrc # # @param $1 The name if the theme that should be added to the zshrc -function apply_antigen_theme() { - antigen_theme="$1" - if ! grep -q "antigen theme" "${ZSHRC_PATH}" ; then - write_zshrc "antigen theme ${antigen_theme}" +function apply_ohmyzsh_theme() { + zplug_theme="$1" + if ! grep -q "zplug \"themes/${zplug_theme}\", from:oh-my-zsh, as:theme" "${ZSHRC_PATH}" ; then + write_zshrc "zplug \"themes/$zplug_theme\", from:oh-my-zsh, as:theme" fi } diff --git a/lib/template_engine.sh b/lib/template_engine.sh index 51dd288..f9bd45f 100644 --- a/lib/template_engine.sh +++ b/lib/template_engine.sh @@ -28,17 +28,17 @@ export readonly TEMPLATE_DIRECTIVE="#PSH_TEMPLATE=" # Different template insertion points export readonly TEMPLATE_START="START" -export readonly TEMPLATE_BETWEEN_ANTIGEN_AND_OH_MY_ZSH="BETWEEN_ANTIGEN_AND_OH_MY_ZSH" +export readonly TEMPLATE_BETWEEN_ZPLUG_AND_OH_MY_ZSH="BETWEEN_ZPLUG_AND_OH_MY_ZSH" export readonly TEMPLATE_BETWEEN_OH_MY_ZSH_AND_PLUGINS="BETWEEN_OH_MY_ZSH_AND_PLUGINS" -export readonly TEMPLATE_AFTER_PLUGINS_BEFORE_ANTIGEN_APPLY="AFTER_PLUGINS_BEFORE_ANTIGEN_APPLY" +export readonly TEMPLATE_AFTER_PLUGINS_BEFORE_ZPLUG_APPLY="AFTER_PLUGINS_BEFORE_ZPLUG_APPLY" export readonly TEMPLATE_END="END" # Store the paths of our different template types in the arrays # to reduce I/O operations in comparison to v1 of the engine. templates_start=() -templates_between_antigen_and_oh_my_zsh=() +templates_between_zplug_and_oh_my_zsh=() templates_between_oh_my_zsh_and_plugins=() -templates_after_plugins_before_antigen_apply=() +templates_after_plugins_before_zplug_apply=() templates_end=() # Load our templates echo "Searching for templates..." @@ -53,14 +53,14 @@ do "${TEMPLATE_DIRECTIVE}$TEMPLATE_START") templates_start=("${templates_start[@]}" "$templateFile") ;; - "${TEMPLATE_DIRECTIVE}$TEMPLATE_BETWEEN_ANTIGEN_AND_OH_MY_ZSH") - templates_between_antigen_and_oh_my_zsh=("${templates_between_antigen_and_oh_my_zsh[@]}" "$templateFile") + "${TEMPLATE_DIRECTIVE}$TEMPLATE_BETWEEN_ZPLUG_AND_OH_MY_ZSH") + templates_between_zplug_and_oh_my_zsh=("${templates_between_zplug_and_oh_my_zsh[@]}" "$templateFile") ;; "${TEMPLATE_DIRECTIVE}$TEMPLATE_BETWEEN_OH_MY_ZSH_AND_PLUGINS") templates_between_oh_my_zsh_and_plugins=("${templates_between_oh_my_zsh_and_plugins[@]}" "$templateFile") ;; - "${TEMPLATE_DIRECTIVE}$TEMPLATE_AFTER_PLUGINS_BEFORE_ANTIGEN_APPLY") - templates_after_plugins_before_antigen_apply=("${templates_after_plugins_before_antigen_apply[@]}" "$templateFile") + "${TEMPLATE_DIRECTIVE}$TEMPLATE_AFTER_PLUGINS_BEFORE_ZPLUG_APPLY") + templates_after_plugins_before_zplug_apply=("${templates_after_plugins_before_zplug_apply[@]}" "$templateFile") ;; "${TEMPLATE_DIRECTIVE}$TEMPLATE_END") templates_end=("${templates_end[@]}" "$templateFile") @@ -96,14 +96,14 @@ function include_templates() { "$TEMPLATE_START") currentTemplateFiles=("${templates_start[@]}") ;; - "$TEMPLATE_BETWEEN_ANTIGEN_AND_OH_MY_ZSH") - currentTemplateFiles=("${templates_between_antigen_and_oh_my_zsh[@]}") + "$TEMPLATE_BETWEEN_ZPLUG_AND_OH_MY_ZSH") + currentTemplateFiles=("${templates_between_zplug_and_oh_my_zsh[@]}") ;; "$TEMPLATE_BETWEEN_OH_MY_ZSH_AND_PLUGINS") currentTemplateFiles=("${templates_between_oh_my_zsh_and_plugins[@]}") ;; - "$TEMPLATE_AFTER_PLUGINS_BEFORE_ANTIGEN_APPLY") - currentTemplateFiles=("${templates_after_plugins_before_antigen_apply[@]}") + "$TEMPLATE_AFTER_PLUGINS_BEFORE_ZPLUG_APPLY") + currentTemplateFiles=("${templates_after_plugins_before_zplug_apply[@]}") ;; "$TEMPLATE_END") currentTemplateFiles=("${templates_end[@]}") diff --git a/plugins/alias-finder/plugin.sh b/plugins/alias-finder/plugin.sh index 0331e4c..27d12c3 100644 --- a/plugins/alias-finder/plugin.sh +++ b/plugins/alias-finder/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "alias-finder" +apply_ohmyzsh_plugin "alias-finder" diff --git a/plugins/aliases-cheatsheet/plugin.sh b/plugins/aliases-cheatsheet/plugin.sh index ec624ff..5ff03b6 100644 --- a/plugins/aliases-cheatsheet/plugin.sh +++ b/plugins/aliases-cheatsheet/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "aliases" +apply_ohmyzsh_plugin "aliases" diff --git a/plugins/ansible/plugin.sh b/plugins/ansible/plugin.sh index f8cb71c..fb868ac 100644 --- a/plugins/ansible/plugin.sh +++ b/plugins/ansible/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "ansible" +apply_ohmyzsh_plugin "ansible" diff --git a/plugins/aws/plugin.sh b/plugins/aws/plugin.sh index 83a00b0..9b510c7 100644 --- a/plugins/aws/plugin.sh +++ b/plugins/aws/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "aws" +apply_ohmyzsh_plugin "aws" diff --git a/plugins/azure/plugin.sh b/plugins/azure/plugin.sh index dba97c7..c06caa5 100644 --- a/plugins/azure/plugin.sh +++ b/plugins/azure/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "azure" +apply_ohmyzsh_plugin "azure" diff --git a/plugins/bgnotify/plugin.sh b/plugins/bgnotify/plugin.sh index a61bc6b..b188958 100644 --- a/plugins/bgnotify/plugin.sh +++ b/plugins/bgnotify/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "bgnotify" +apply_ohmyzsh_plugin "bgnotify" diff --git a/plugins/brew/plugin.sh b/plugins/brew/plugin.sh index eafdf62..93717d8 100644 --- a/plugins/brew/plugin.sh +++ b/plugins/brew/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "brew" +apply_ohmyzsh_plugin "brew" diff --git a/plugins/bun-js/plugin.sh b/plugins/bun-js/plugin.sh index d24fd06..c57629a 100644 --- a/plugins/bun-js/plugin.sh +++ b/plugins/bun-js/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "bun" +apply_ohmyzsh_plugin "bun" diff --git a/plugins/catimg/plugin.sh b/plugins/catimg/plugin.sh index ae0cdcb..4d1b11a 100644 --- a/plugins/catimg/plugin.sh +++ b/plugins/catimg/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "catimg" +apply_ohmyzsh_plugin "catimg" diff --git a/plugins/command-not-found/plugin.sh b/plugins/command-not-found/plugin.sh index 71e405f..0322278 100644 --- a/plugins/command-not-found/plugin.sh +++ b/plugins/command-not-found/plugin.sh @@ -24,4 +24,4 @@ # Email : nicojust@users.noreply.github.com #================================================================== -apply_antigen_bundle "command-not-found" +apply_ohmyzsh_plugin "command-not-found" diff --git a/plugins/common-aliases/plugin.sh b/plugins/common-aliases/plugin.sh index 7dafb16..e253ad0 100644 --- a/plugins/common-aliases/plugin.sh +++ b/plugins/common-aliases/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "common-aliases" +apply_ohmyzsh_plugin "common-aliases" diff --git a/plugins/composer/plugin.sh b/plugins/composer/plugin.sh index 2c5aba5..2f9bc0f 100644 --- a/plugins/composer/plugin.sh +++ b/plugins/composer/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "composer" +apply_ohmyzsh_plugin "composer" diff --git a/plugins/copypath/plugin.sh b/plugins/copypath/plugin.sh index 75d0cd5..2eb93ec 100644 --- a/plugins/copypath/plugin.sh +++ b/plugins/copypath/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "copypath" +apply_ohmyzsh_plugin "copypath" diff --git a/plugins/direnv/plugin.sh b/plugins/direnv/plugin.sh index cd252ce..83f0987 100644 --- a/plugins/direnv/plugin.sh +++ b/plugins/direnv/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "direnv" +apply_ohmyzsh_plugin "direnv" diff --git a/plugins/docker/plugin.sh b/plugins/docker/plugin.sh index 074a866..8e11403 100644 --- a/plugins/docker/plugin.sh +++ b/plugins/docker/plugin.sh @@ -25,6 +25,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "docker" -apply_antigen_bundle "docker-compose" -apply_antigen_bundle "ctop" +apply_ohmyzsh_plugin "docker" +apply_ohmyzsh_plugin "docker-compose" +apply_ohmyzsh_plugin "ctop" diff --git a/plugins/encode64/plugin.sh b/plugins/encode64/plugin.sh index 4e96dbf..03fbb51 100644 --- a/plugins/encode64/plugin.sh +++ b/plugins/encode64/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "encode64" +apply_ohmyzsh_plugin "encode64" diff --git a/plugins/extract/plugin.sh b/plugins/extract/plugin.sh index 1ca2dc8..819f0bd 100644 --- a/plugins/extract/plugin.sh +++ b/plugins/extract/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "extract" +apply_ohmyzsh_plugin "extract" diff --git a/plugins/genpass/plugin.sh b/plugins/genpass/plugin.sh index 0c58974..7b5e790 100644 --- a/plugins/genpass/plugin.sh +++ b/plugins/genpass/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "genpass" +apply_ohmyzsh_plugin "genpass" diff --git a/plugins/git/plugin.sh b/plugins/git/plugin.sh index cbda8ac..dd64470 100644 --- a/plugins/git/plugin.sh +++ b/plugins/git/plugin.sh @@ -24,6 +24,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "git" -apply_antigen_bundle "gitignore" -apply_antigen_bundle "git-commit" +apply_ohmyzsh_plugin "git" +apply_ohmyzsh_plugin "gitignore" +apply_ohmyzsh_plugin "git-commit" diff --git a/plugins/github-cli/plugin.sh b/plugins/github-cli/plugin.sh index 0ee0bf2..cc70a3a 100644 --- a/plugins/github-cli/plugin.sh +++ b/plugins/github-cli/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "gh" +apply_ohmyzsh_plugin "gh" diff --git a/plugins/golang/plugin.sh b/plugins/golang/plugin.sh index ff3edb1..6f623ef 100644 --- a/plugins/golang/plugin.sh +++ b/plugins/golang/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "golang" +apply_ohmyzsh_plugin "golang" diff --git a/plugins/gradle/plugin.sh b/plugins/gradle/plugin.sh index d656f26..1d48658 100644 --- a/plugins/gradle/plugin.sh +++ b/plugins/gradle/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "gradle" +apply_ohmyzsh_plugin "gradle" diff --git a/plugins/jsontools/plugin.sh b/plugins/jsontools/plugin.sh index 66c2bb9..8b244ea 100644 --- a/plugins/jsontools/plugin.sh +++ b/plugins/jsontools/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "jsontools" +apply_ohmyzsh_plugin "jsontools" diff --git a/plugins/k8s/plugin.sh b/plugins/k8s/plugin.sh index dadeee4..7eebbb4 100644 --- a/plugins/k8s/plugin.sh +++ b/plugins/k8s/plugin.sh @@ -24,6 +24,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "helm" -apply_antigen_bundle "kubectl" -apply_antigen_bundle "kubectx" +apply_ohmyzsh_plugin "helm" +apply_ohmyzsh_plugin "kubectl" +apply_ohmyzsh_plugin "kubectx" diff --git a/plugins/mvn/plugin.sh b/plugins/mvn/plugin.sh index 61e6075..83a7e6d 100644 --- a/plugins/mvn/plugin.sh +++ b/plugins/mvn/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "mvn" +apply_ohmyzsh_plugin "mvn" diff --git a/plugins/node/plugin.sh b/plugins/node/plugin.sh index 4a5e33d..dccdc00 100644 --- a/plugins/node/plugin.sh +++ b/plugins/node/plugin.sh @@ -24,6 +24,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "node" -apply_antigen_bundle "npm" -apply_antigen_bundle "nvm" +apply_ohmyzsh_plugin "node" +apply_ohmyzsh_plugin "npm" +apply_ohmyzsh_plugin "nvm" diff --git a/plugins/python/plugin.sh b/plugins/python/plugin.sh index f5e01b1..9c99810 100644 --- a/plugins/python/plugin.sh +++ b/plugins/python/plugin.sh @@ -24,6 +24,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "python" -apply_antigen_bundle "virtualenv" -apply_antigen_bundle "pip" +apply_ohmyzsh_plugin "python" +apply_ohmyzsh_plugin "virtualenv" +apply_ohmyzsh_plugin "pip" diff --git a/plugins/redis-cli/plugin.sh b/plugins/redis-cli/plugin.sh index 1f0e3eb..2513237 100644 --- a/plugins/redis-cli/plugin.sh +++ b/plugins/redis-cli/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "redis-cli" +apply_ohmyzsh_plugin "redis-cli" diff --git a/plugins/rsync/plugin.sh b/plugins/rsync/plugin.sh index 5ef3282..cd8fdd1 100644 --- a/plugins/rsync/plugin.sh +++ b/plugins/rsync/plugin.sh @@ -24,4 +24,4 @@ # Email : nicojust@users.noreply.github.com #================================================================== -apply_antigen_bundle "rsync" +apply_ohmyzsh_plugin "rsync" diff --git a/plugins/safe-paste/plugin.sh b/plugins/safe-paste/plugin.sh index 8f45f7e..1de0075 100644 --- a/plugins/safe-paste/plugin.sh +++ b/plugins/safe-paste/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "safe-paste" +apply_ohmyzsh_plugin "safe-paste" diff --git a/plugins/ssh-agent/plugin.sh b/plugins/ssh-agent/plugin.sh index 4224e6b..7dbe381 100644 --- a/plugins/ssh-agent/plugin.sh +++ b/plugins/ssh-agent/plugin.sh @@ -26,4 +26,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "ssh-agent" +apply_ohmyzsh_plugin "ssh-agent" diff --git a/plugins/theme-loader/plugin.sh b/plugins/theme-loader/plugin.sh index 1a196ec..c2600b4 100644 --- a/plugins/theme-loader/plugin.sh +++ b/plugins/theme-loader/plugin.sh @@ -25,4 +25,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_theme "candy" +apply_ohmyzsh_theme "candy" diff --git a/plugins/timer/plugin.sh b/plugins/timer/plugin.sh index 820cbf5..b56d5b7 100644 --- a/plugins/timer/plugin.sh +++ b/plugins/timer/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "ssh-agent" +apply_ohmyzsh_plugin "ssh-agent" diff --git a/plugins/universal-archive/plugin.sh b/plugins/universal-archive/plugin.sh index ca29938..66b27a5 100644 --- a/plugins/universal-archive/plugin.sh +++ b/plugins/universal-archive/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "universalarchive" +apply_ohmyzsh_plugin "universalarchive" diff --git a/plugins/urltools/plugin.sh b/plugins/urltools/plugin.sh index 3fa04ec..3229b67 100644 --- a/plugins/urltools/plugin.sh +++ b/plugins/urltools/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "urltools" +apply_ohmyzsh_plugin "urltools" diff --git a/plugins/vscode/plugin.sh b/plugins/vscode/plugin.sh index cdb4a58..d7936fb 100644 --- a/plugins/vscode/plugin.sh +++ b/plugins/vscode/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "vscode" +apply_ohmyzsh_plugin "vscode" diff --git a/plugins/web-search/plugin.sh b/plugins/web-search/plugin.sh index b965176..da2d48f 100644 --- a/plugins/web-search/plugin.sh +++ b/plugins/web-search/plugin.sh @@ -24,4 +24,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "web-search" +apply_ohmyzsh_plugin "web-search" diff --git a/plugins/yarn/plugin.sh b/plugins/yarn/plugin.sh index 92284d2..ce65d28 100644 --- a/plugins/yarn/plugin.sh +++ b/plugins/yarn/plugin.sh @@ -24,5 +24,5 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "yarn" -apply_antigen_bundle "yarn-autocompletions" +apply_ohmyzsh_plugin "yarn" +apply_ohmyzsh_plugin "yarn-autocompletions" diff --git a/plugins/zsh-enhancements/plugin.sh b/plugins/zsh-enhancements/plugin.sh index 2c3da34..52c9731 100644 --- a/plugins/zsh-enhancements/plugin.sh +++ b/plugins/zsh-enhancements/plugin.sh @@ -26,16 +26,16 @@ # Append zsh-users/zsh-syntax-highlighting bundle loading to .zshrc, # if not already applied -apply_antigen_bundle "zsh-users/zsh-syntax-highlighting" +apply_plugin "zsh-users/zsh-syntax-highlighting" # Additional completion definitions for Zsh. -apply_antigen_bundle "zsh-users/zsh-completions" +apply_plugin "zsh-users/zsh-completions" # It suggests commands as you type based on history and completions. -apply_antigen_bundle "zsh-users/zsh-autosuggestions" +apply_plugin "zsh-users/zsh-autosuggestions" # This is a clean-room implementation of the Fish shell's history # search feature, where you can type in any part of any command # from history and then press chosen keys, such as the UP and # DOWN arrows, to cycle through matches. -apply_antigen_bundle "zsh-users/zsh-history-substring-search" +apply_plugin "zsh-users/zsh-history-substring-search" diff --git a/plugins/zsh-z/plugin.sh b/plugins/zsh-z/plugin.sh index ca37aee..f418be7 100644 --- a/plugins/zsh-z/plugin.sh +++ b/plugins/zsh-z/plugin.sh @@ -25,4 +25,4 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_antigen_bundle "z" +apply_ohmyzsh_plugin "z" diff --git a/templates/fix-zsh-completions-dir-missing.template.zshrc b/templates/fix-zsh-completions-dir-missing.template.zshrc deleted file mode 100644 index c6375f0..0000000 --- a/templates/fix-zsh-completions-dir-missing.template.zshrc +++ /dev/null @@ -1,5 +0,0 @@ -#PSH_TEMPLATE=BETWEEN_ANTIGEN_AND_OH_MY_ZSH -# See: https://github.com/zsh-users/antigen/issues/688 -# By running this using zshrc, we can ensure that the directory is created -# and most likely by the user running the shell and therefore owning the directory. -mkdir -p ~/.antigen/bundles/robbyrussell/oh-my-zsh/cache/completions diff --git a/templates/ssh_agent_lazy.template.zshrc b/templates/ssh_agent_lazy.template.zshrc index e249a1e..78fcf8c 100644 --- a/templates/ssh_agent_lazy.template.zshrc +++ b/templates/ssh_agent_lazy.template.zshrc @@ -1,3 +1,3 @@ -#PSH_TEMPLATE=BETWEEN_ANTIGEN_AND_OH_MY_ZSH +#PSH_TEMPLATE=BETWEEN_ZPLUG_AND_OH_MY_ZSH # Configure ssh agent to not instantly load keys on zsh start zstyle :omz:plugins:ssh-agent lazy yes