From 98b3c763558a526e2c42d5da39a4883d8dbf77e4 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Mon, 9 Dec 2024 19:26:38 +0100 Subject: [PATCH 1/4] feat: reduce plugins for better performance --- plugins/alias-finder/plugin.sh | 27 --------------------------- plugins/bun-js/plugin.sh | 27 --------------------------- plugins/catimg/plugin.sh | 27 --------------------------- plugins/composer/plugin.sh | 27 --------------------------- plugins/direnv/plugin.sh | 27 --------------------------- plugins/genpass/plugin.sh | 27 --------------------------- plugins/k8s/plugin.sh | 1 - plugins/node/plugin.sh | 29 ----------------------------- plugins/redis-cli/plugin.sh | 27 --------------------------- plugins/rsync/plugin.sh | 27 --------------------------- plugins/vscode/plugin.sh | 27 --------------------------- plugins/yarn/plugin.sh | 27 --------------------------- 12 files changed, 300 deletions(-) delete mode 100644 plugins/alias-finder/plugin.sh delete mode 100644 plugins/bun-js/plugin.sh delete mode 100644 plugins/catimg/plugin.sh delete mode 100644 plugins/composer/plugin.sh delete mode 100644 plugins/direnv/plugin.sh delete mode 100644 plugins/genpass/plugin.sh delete mode 100644 plugins/node/plugin.sh delete mode 100644 plugins/redis-cli/plugin.sh delete mode 100644 plugins/rsync/plugin.sh delete mode 100644 plugins/vscode/plugin.sh delete mode 100644 plugins/yarn/plugin.sh diff --git a/plugins/alias-finder/plugin.sh b/plugins/alias-finder/plugin.sh deleted file mode 100644 index 27d12c3..0000000 --- a/plugins/alias-finder/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-alias-finder-installer -# Description : Enables oh-my-zsh's alias finder -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "alias-finder" diff --git a/plugins/bun-js/plugin.sh b/plugins/bun-js/plugin.sh deleted file mode 100644 index c57629a..0000000 --- a/plugins/bun-js/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-bun-installer -# Description : Enables oh-my-zsh's bun javascript runtime plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "bun" diff --git a/plugins/catimg/plugin.sh b/plugins/catimg/plugin.sh deleted file mode 100644 index 4d1b11a..0000000 --- a/plugins/catimg/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-catimg-installer -# Description : Enables oh-my-zsh's catimg plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "catimg" diff --git a/plugins/composer/plugin.sh b/plugins/composer/plugin.sh deleted file mode 100644 index 2f9bc0f..0000000 --- a/plugins/composer/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-composer-installer -# Description : Enables oh-my-zsh's composer plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "composer" diff --git a/plugins/direnv/plugin.sh b/plugins/direnv/plugin.sh deleted file mode 100644 index 83f0987..0000000 --- a/plugins/direnv/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-direnv-installer -# Description : Enables oh-my-zsh's direnv plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "direnv" diff --git a/plugins/genpass/plugin.sh b/plugins/genpass/plugin.sh deleted file mode 100644 index 7b5e790..0000000 --- a/plugins/genpass/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-genpass-installer -# Description : Enables oh-my-zsh's genpass plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "genpass" diff --git a/plugins/k8s/plugin.sh b/plugins/k8s/plugin.sh index 7eebbb4..bb48b50 100644 --- a/plugins/k8s/plugin.sh +++ b/plugins/k8s/plugin.sh @@ -24,6 +24,5 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_ohmyzsh_plugin "helm" apply_ohmyzsh_plugin "kubectl" apply_ohmyzsh_plugin "kubectx" diff --git a/plugins/node/plugin.sh b/plugins/node/plugin.sh deleted file mode 100644 index dccdc00..0000000 --- a/plugins/node/plugin.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-node-installer -# Description : Enables oh-my-zsh's node and npm plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "node" -apply_ohmyzsh_plugin "npm" -apply_ohmyzsh_plugin "nvm" diff --git a/plugins/redis-cli/plugin.sh b/plugins/redis-cli/plugin.sh deleted file mode 100644 index 2513237..0000000 --- a/plugins/redis-cli/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-redis-cli-installer -# Description : Enables oh-my-zsh's redis-cli plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "redis-cli" diff --git a/plugins/rsync/plugin.sh b/plugins/rsync/plugin.sh deleted file mode 100644 index cd8fdd1..0000000 --- a/plugins/rsync/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-rysnc-installer -# Description : Enables oh-my-zsh's rsync plugin -# Args : - -# Author : Nico Just -# Email : nicojust@users.noreply.github.com -#================================================================== - -apply_ohmyzsh_plugin "rsync" diff --git a/plugins/vscode/plugin.sh b/plugins/vscode/plugin.sh deleted file mode 100644 index d7936fb..0000000 --- a/plugins/vscode/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-vscode-aliases-installer -# Description : Enables oh-my-zsh's vscode aliases plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "vscode" diff --git a/plugins/yarn/plugin.sh b/plugins/yarn/plugin.sh deleted file mode 100644 index 0ea8f50..0000000 --- a/plugins/yarn/plugin.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# -# Copyright 2024 Pascal Zarrad -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#================================================================== -# Script Name : psh-yarn-installer -# Description : Enables oh-my-zsh's yarn plugin -# Args : - -# Author : Pascal Zarrad -# Email : P.Zarrad@outlook.de -#================================================================== - -apply_ohmyzsh_plugin "yarn" From 83882cd02c8f0bf49204f6faf74c99a04babb0f0 Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Mon, 9 Dec 2024 19:32:40 +0100 Subject: [PATCH 2/4] feat: unlock version of zsh autocomplete --- plugins/zsh-enhancements/plugin.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/plugins/zsh-enhancements/plugin.sh b/plugins/zsh-enhancements/plugin.sh index a8bde86..237f9b2 100644 --- a/plugins/zsh-enhancements/plugin.sh +++ b/plugins/zsh-enhancements/plugin.sh @@ -37,7 +37,4 @@ apply_plugin "zsh-users/zsh-autosuggestions" # This plugin adds autocompletion to further speed up command # line work. Together with autosuggestions, it makes typing # commands a breeze. -# The plugin has been locked to a specific commit as ~ expansion -# on path autocomplete "broke" one commit after this one. -# See: https://github.com/marlonrichert/zsh-autocomplete/issues/741 -apply_plugin_version "marlonrichert/zsh-autocomplete" "a66d6ae6f7e703b1bf5ae57e48a7da3cf307aeab" +apply_plugin "marlonrichert/zsh-autocomplete" From 2d12419c2e08413e48e2b589a97aea42652f3bec Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Mon, 9 Dec 2024 19:58:44 +0100 Subject: [PATCH 3/4] feat: enable async prompt and include lib --- plugins/clipboard-enhancements/plugin.sh | 1 - .../git_integration_disable_async_prompt.template.zshrc | 2 -- templates/load_ohmyzsh_lib.template.zshrc | 6 ++++++ 3 files changed, 6 insertions(+), 3 deletions(-) delete mode 100644 templates/git_integration_disable_async_prompt.template.zshrc create mode 100644 templates/load_ohmyzsh_lib.template.zshrc diff --git a/plugins/clipboard-enhancements/plugin.sh b/plugins/clipboard-enhancements/plugin.sh index ec71c6d..5256908 100644 --- a/plugins/clipboard-enhancements/plugin.sh +++ b/plugins/clipboard-enhancements/plugin.sh @@ -24,7 +24,6 @@ # Email : P.Zarrad@outlook.de #================================================================== -apply_ohmyzsh_lib "clipboard" apply_ohmyzsh_plugin "copypath" apply_ohmyzsh_plugin "copybuffer" apply_ohmyzsh_plugin "copyfile" diff --git a/templates/git_integration_disable_async_prompt.template.zshrc b/templates/git_integration_disable_async_prompt.template.zshrc deleted file mode 100644 index 7a1a647..0000000 --- a/templates/git_integration_disable_async_prompt.template.zshrc +++ /dev/null @@ -1,2 +0,0 @@ -#PSH_TEMPLATE=AFTER_PLUGINS_BEFORE_ZPLUG_APPLY -zstyle ':omz:alpha:lib:git' async-prompt no diff --git a/templates/load_ohmyzsh_lib.template.zshrc b/templates/load_ohmyzsh_lib.template.zshrc new file mode 100644 index 0000000..20092cb --- /dev/null +++ b/templates/load_ohmyzsh_lib.template.zshrc @@ -0,0 +1,6 @@ +#PSH_TEMPLATE=BETWEEN_OH_MY_ZSH_AND_PLUGINS +# With zplug we must load lib scripts ourselves. +# Clipboard plugins or async git requires this. +# This is included as template as it is basically needed +# by multiple plugins. +zplug "lib/*", from:oh-my-zsh From 32dd0021acf9825937c1c5a47ae69082fbe6a33d Mon Sep 17 00:00:00 2001 From: Pascal Zarrad Date: Mon, 9 Dec 2024 20:00:20 +0100 Subject: [PATCH 4/4] chore: bump version to v2.2.0 --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 6f69d06..21697b7 100755 --- a/install.sh +++ b/install.sh @@ -26,7 +26,7 @@ #================================================================== # Semantic versioning version constant -readonly PSH_VERSION="2.1.0" +readonly PSH_VERSION="2.2.0" echo "PSH - VERSION: ${PSH_VERSION}" if [ -f /etc/os-release ]; then