From ce341189d5aa9529358e6b9af368e4a5f6497e52 Mon Sep 17 00:00:00 2001 From: Chen Asraf Date: Sun, 22 Dec 2024 02:11:11 +0200 Subject: [PATCH] refactor: common plugin --- aliases.zsh | 2 +- plugins/{ascii-font.zsh => ascii-font.plugin.zsh} | 0 plugins/{functions.plugin.zsh => common.plugin.zsh} | 5 +---- plugins/{ => common}/colors.zsh | 0 plugins/{ => common}/copilot.zsh | 0 plugins/{ => common}/defaults.zsh | 0 plugins/{ => common}/docker.zsh | 0 plugins/{ => common}/dotfiles_edit.zsh | 0 plugins/{ => common}/fs_utils.zsh | 0 plugins/{ => common}/git.zsh | 0 plugins/{ => common}/git_utils.zsh | 0 plugins/{ => common}/input_utils.zsh | 0 plugins/{ => common}/markdown-preview.zsh | 0 plugins/{ => common}/nextcloud.zsh | 0 plugins/{ => common}/number_utils.zsh | 0 plugins/{ => common}/ollama.zsh | 0 plugins/{ => common}/os_utils.zsh | 0 plugins/{ => common}/pkg_utils.zsh | 0 plugins/{ => common}/proc_utils.zsh | 0 plugins/{ => common}/ssh_utils.zsh | 0 plugins/{ => common}/string_utils.zsh | 0 plugins/{ => common}/tpl.zsh | 0 plugins/motd/16-df | 3 --- 23 files changed, 2 insertions(+), 8 deletions(-) rename plugins/{ascii-font.zsh => ascii-font.plugin.zsh} (100%) rename plugins/{functions.plugin.zsh => common.plugin.zsh} (75%) rename plugins/{ => common}/colors.zsh (100%) rename plugins/{ => common}/copilot.zsh (100%) rename plugins/{ => common}/defaults.zsh (100%) rename plugins/{ => common}/docker.zsh (100%) rename plugins/{ => common}/dotfiles_edit.zsh (100%) rename plugins/{ => common}/fs_utils.zsh (100%) rename plugins/{ => common}/git.zsh (100%) rename plugins/{ => common}/git_utils.zsh (100%) rename plugins/{ => common}/input_utils.zsh (100%) rename plugins/{ => common}/markdown-preview.zsh (100%) rename plugins/{ => common}/nextcloud.zsh (100%) rename plugins/{ => common}/number_utils.zsh (100%) rename plugins/{ => common}/ollama.zsh (100%) rename plugins/{ => common}/os_utils.zsh (100%) rename plugins/{ => common}/pkg_utils.zsh (100%) rename plugins/{ => common}/proc_utils.zsh (100%) rename plugins/{ => common}/ssh_utils.zsh (100%) rename plugins/{ => common}/string_utils.zsh (100%) rename plugins/{ => common}/tpl.zsh (100%) diff --git a/aliases.zsh b/aliases.zsh index c054b341..602dd98d 100755 --- a/aliases.zsh +++ b/aliases.zsh @@ -15,7 +15,7 @@ addalias() { source "$HOME/.dotfiles/aliases.zsh" } -source "$HOME/.dotfiles/plugins/functions.plugin.zsh" +source "$HOME/.dotfiles/plugins/common/os_utils.zsh" # Aliases alias ".."="cd .." diff --git a/plugins/ascii-font.zsh b/plugins/ascii-font.plugin.zsh similarity index 100% rename from plugins/ascii-font.zsh rename to plugins/ascii-font.plugin.zsh diff --git a/plugins/functions.plugin.zsh b/plugins/common.plugin.zsh similarity index 75% rename from plugins/functions.plugin.zsh rename to plugins/common.plugin.zsh index 5cb8de0d..2c6991eb 100755 --- a/plugins/functions.plugin.zsh +++ b/plugins/common.plugin.zsh @@ -4,10 +4,7 @@ source $DOTFILES/autoload_completions.zsh dir="${0:A:h}" -for file in $dir/*.zsh; do - if [[ "$file" =~ ".*\.plugin\.zsh" ]]; then - continue - fi +for file in $dir/common/*.zsh; do source $file done diff --git a/plugins/colors.zsh b/plugins/common/colors.zsh similarity index 100% rename from plugins/colors.zsh rename to plugins/common/colors.zsh diff --git a/plugins/copilot.zsh b/plugins/common/copilot.zsh similarity index 100% rename from plugins/copilot.zsh rename to plugins/common/copilot.zsh diff --git a/plugins/defaults.zsh b/plugins/common/defaults.zsh similarity index 100% rename from plugins/defaults.zsh rename to plugins/common/defaults.zsh diff --git a/plugins/docker.zsh b/plugins/common/docker.zsh similarity index 100% rename from plugins/docker.zsh rename to plugins/common/docker.zsh diff --git a/plugins/dotfiles_edit.zsh b/plugins/common/dotfiles_edit.zsh similarity index 100% rename from plugins/dotfiles_edit.zsh rename to plugins/common/dotfiles_edit.zsh diff --git a/plugins/fs_utils.zsh b/plugins/common/fs_utils.zsh similarity index 100% rename from plugins/fs_utils.zsh rename to plugins/common/fs_utils.zsh diff --git a/plugins/git.zsh b/plugins/common/git.zsh similarity index 100% rename from plugins/git.zsh rename to plugins/common/git.zsh diff --git a/plugins/git_utils.zsh b/plugins/common/git_utils.zsh similarity index 100% rename from plugins/git_utils.zsh rename to plugins/common/git_utils.zsh diff --git a/plugins/input_utils.zsh b/plugins/common/input_utils.zsh similarity index 100% rename from plugins/input_utils.zsh rename to plugins/common/input_utils.zsh diff --git a/plugins/markdown-preview.zsh b/plugins/common/markdown-preview.zsh similarity index 100% rename from plugins/markdown-preview.zsh rename to plugins/common/markdown-preview.zsh diff --git a/plugins/nextcloud.zsh b/plugins/common/nextcloud.zsh similarity index 100% rename from plugins/nextcloud.zsh rename to plugins/common/nextcloud.zsh diff --git a/plugins/number_utils.zsh b/plugins/common/number_utils.zsh similarity index 100% rename from plugins/number_utils.zsh rename to plugins/common/number_utils.zsh diff --git a/plugins/ollama.zsh b/plugins/common/ollama.zsh similarity index 100% rename from plugins/ollama.zsh rename to plugins/common/ollama.zsh diff --git a/plugins/os_utils.zsh b/plugins/common/os_utils.zsh similarity index 100% rename from plugins/os_utils.zsh rename to plugins/common/os_utils.zsh diff --git a/plugins/pkg_utils.zsh b/plugins/common/pkg_utils.zsh similarity index 100% rename from plugins/pkg_utils.zsh rename to plugins/common/pkg_utils.zsh diff --git a/plugins/proc_utils.zsh b/plugins/common/proc_utils.zsh similarity index 100% rename from plugins/proc_utils.zsh rename to plugins/common/proc_utils.zsh diff --git a/plugins/ssh_utils.zsh b/plugins/common/ssh_utils.zsh similarity index 100% rename from plugins/ssh_utils.zsh rename to plugins/common/ssh_utils.zsh diff --git a/plugins/string_utils.zsh b/plugins/common/string_utils.zsh similarity index 100% rename from plugins/string_utils.zsh rename to plugins/common/string_utils.zsh diff --git a/plugins/tpl.zsh b/plugins/common/tpl.zsh similarity index 100% rename from plugins/tpl.zsh rename to plugins/common/tpl.zsh diff --git a/plugins/motd/16-df b/plugins/motd/16-df index 2996ee46..bd153f85 100755 --- a/plugins/motd/16-df +++ b/plugins/motd/16-df @@ -1,8 +1,5 @@ #!/usr/bin/env zsh -source "$DOTFILES/plugins/functions.plugin.zsh" -source "$DOTFILES/aliases.zsh" - if is_mac; then df -h /System/Volumes/Data NE else