diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0f7fe88 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,62 @@ +# Space or Tabs? +# https://stackoverflow.com/questions/35649847/objective-reasons-for-using-spaces-instead-of-tabs-for-indentation +# https://stackoverflow.com/questions/12093748/how-to-use-tabs-instead-of-spaces-in-a-shell-script +# +# 1. What happens when I press the Tab key in my text editor? +# 2. What happens when I request my editor to indent one or more lines? +# 3. What happens when I view a file containing U+0009 HORIZONTAL TAB characters? +# +# Answers: +# +# 1. Pressing the Tab key should indent the current line (or selected lines) one additional level. +# 2. As a secondary alternative, I can also tolerate an editor that, +# like Emacs, uses this key for a context-sensitive fix-my-indentation command. +# 3. Indenting one or more lines should follow the reigning convention, if consensus is sufficiently strong; otherwise, +# I greatly prefer 2-space indentation at each level. U+0009 characters should shift subsequent characters to the next tab stop. +# +# Note: VIM users should use alternate marks [[[ and ]]] as the original ones can confuse nested substitutions, e.g.: ${${${VAR}}} +# +# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*- +# vim: ft=zsh sw=2 ts=2 et + +root = true + +[*] +charset = utf-8 +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.{md,rst}] +insert_final_newline = false +trim_trailing_whitespace = false + +[*.{sh,bash,zsh,fish}] +indent_style = space +indent_size = 2 +tab_width = 2 + +[Makefile] +indent_style = tab +indent_size = 4 + +[*.{css,less}] +indent_style = space +indent_size = 2 + +[*.{py,rb}] +indent_style = space +indent_size = 4 + +[*.{go,java,scala,groovy,kotlin}] +indent_style = tab +indent_size = 4 + +[*.{js,jsx,html,xml,sass,json,yml,yaml,toml}] +charset = utf-8 +indent_style = space +indent_size = 2 + +[CHANGELOG.md] +indent_style = tab +indent_size = 4 diff --git a/.markdownlint.yaml b/.github/.markdownlint.yaml similarity index 100% rename from .markdownlint.yaml rename to .github/.markdownlint.yaml diff --git a/.github/workflows/trunk_check.yml b/.github/workflows/trunk_check.yml new file mode 100644 index 0000000..e683bf5 --- /dev/null +++ b/.github/workflows/trunk_check.yml @@ -0,0 +1,14 @@ +--- +name: "⭕ Trunk" +on: + push: + branches: ["main"] + tags: ["v*.*.*"] + pull_request: + types: [opened, synchronize] + workflow_dispatch: {} + +jobs: + check-call: + name: "⚡" + uses: z-shell/.github/.github/workflows/trunk-call.yml@main diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml index 8b5944d..a063091 100644 --- a/.trunk/trunk.yaml +++ b/.trunk/trunk.yaml @@ -1,12 +1,22 @@ version: 0.1 cli: - version: 0.9.3-beta + version: 0.12.1-beta +repo: + repo: + host: github.com + owner: z-shell + name: playground lint: + linters: + - name: markdownlint + command: + [markdownlint, -q, --config, .github/.markdownlint.yaml, "${target}"] + direct_configs: [.github/.markdownlint.yaml] enabled: - - actionlint@1.6.9 - - gitleaks@8.3.0 - - hadolint@2.8.0 + - actionlint@1.6.13 + - gitleaks@8.8.7 + - hadolint@2.10.0 - markdownlint@0.31.1 - - prettier@2.5.1 + - prettier@2.6.2 - shellcheck@0.8.0 - shfmt@3.4.0 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d21aaa0 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "conventionalCommits.scopes": [ + "maintenance", + "workspace", + "community", + "general", + "theme" + ], + "markdownlint.config": { + "extends": ".github/.markdownlint.yaml" + }, + "files.associations": { + "*.md": "mdx" + } +} diff --git a/Dockerfile b/Dockerfile index 8094903..7cfef7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,10 @@ ARG FOLDER ARG USERNAME=z-shell ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && \ - apt-get install --no-install-recommends -yq file dirmngr iproute2 procps sudo lsb-release zlib1g tree vim nano \ - ncurses-dev man telnet unzip zsh apt-transport-https jq gnupg2 git subversion curl make sudo locales \ - autoconf automake python3-minimal python3-pip libffi-dev python3-venv golang-go rsync socat build-essential \ - less vim htop -RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install --no-install-recommends -yq file dirmngr iproute2 procps sudo lsb-release \ +zlib1g tree vim nano ncurses-dev man telnet unzip zsh apt-transport-https jq gnupg2 git subversion curl make sudo \ +locales autoconf automake python3-minimal python3-pip libffi-dev python3-venv golang-go rsync socat build-essential \ +less vim htop && apt-get clean -y && rm -rf /var/lib/apt/lists/* RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && locale-gen ENV LANG en_US.UTF-8 @@ -40,5 +38,5 @@ RUN if [ -f /home/${USERNAME}/bootstrap.sh ]; then \ fi WORKDIR /home/${USERNAME} -RUN SHELL=/bin/zsh zsh -i -ls -c -- 'zi module build; @zi-scheduler burst || true ' +RUN SHELL=/bin/zsh zsh -i -lc -- 'zi module build; @zi-scheduler burst || true ' CMD ["zsh", "-i", "-l"] diff --git a/jubi/bootstrap.sh b/jubi/bootstrap.sh deleted file mode 100644 index bb2f2a6..0000000 --- a/jubi/bootstrap.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env zsh - -case $(uname) in -Darwin) - brew install fzf - ;; -Linux) - # No such package - # sudo apt install fzf - : - ;; -*) - : - ;; -esac diff --git a/playground.plugin.zsh b/playground.plugin.zsh index 2d4bb27..10b8833 100644 --- a/playground.plugin.zsh +++ b/playground.plugin.zsh @@ -2,5 +2,5 @@ CURRENT_DIR=${0:a:h} playground() { - "${CURRENT_DIR}"/run.sh + "${CURRENT_DIR}"/run.sh } diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/LICENSE b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/LICENSE similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/LICENSE rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/LICENSE diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/README.md b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/README.md similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/README.md rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/README.md diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_clight b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_clight similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_clight rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_clight diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_colorls b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_colorls similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_colorls rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_colorls diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_dynamicwall b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_dynamicwall similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_dynamicwall rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_dynamicwall diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_gebaard b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_gebaard similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_gebaard rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_gebaard diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_groff b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_groff similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_groff rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_groff diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_nl b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_nl similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_nl rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_nl diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/_tlp-stat b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_tlp-stat similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/_tlp-stat rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/_tlp-stat diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/completions/err_ggrep b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/err_ggrep similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/completions/err_ggrep rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/completions/err_ggrep diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/config-files.plugin.zsh b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/config-files.plugin.zsh similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/config-files.plugin.zsh rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/config-files.plugin.zsh diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/apt-history b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/apt-history similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/apt-history rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/apt-history diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/autoenv-files b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/autoenv-files similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/autoenv-files rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/autoenv-files diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/chpwd_ls b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/chpwd_ls similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/chpwd_ls rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/chpwd_ls diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/dotscheck b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/dotscheck similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/dotscheck rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/dotscheck diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/history-stat b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/history-stat similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/history-stat rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/history-stat diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/kate b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/kate similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/kate rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/kate diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/mcsvr b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/mcsvr similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/mcsvr rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/mcsvr diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/sudo b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/sudo similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/sudo rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/sudo diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/whichedit b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/whichedit similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/whichedit rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/whichedit diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/functions/zicompinit_fast b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/zicompinit_fast similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/functions/zicompinit_fast rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/functions/zicompinit_fast diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/patches/LS_COLORS.patch b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/LS_COLORS.patch similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/patches/LS_COLORS.patch rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/LS_COLORS.patch diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/patches/fz.patch b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/fz.patch similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/patches/fz.patch rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/fz.patch diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/patches/rm-trash.patch b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/rm-trash.patch similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/patches/rm-trash.patch rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/rm-trash.patch diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/patches/zsh-dircycle.patch b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/zsh-dircycle.patch similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/patches/zsh-dircycle.patch rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/patches/zsh-dircycle.patch diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/themes/dolphin-post.zsh b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/themes/dolphin-post.zsh similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/themes/dolphin-post.zsh rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/themes/dolphin-post.zsh diff --git a/NICHOLAS85/.zi/plugins/_local---config-files/themes/p10k-post.zsh b/profiles/NICHOLAS85/.zi/plugins/_local---config-files/themes/p10k-post.zsh similarity index 100% rename from NICHOLAS85/.zi/plugins/_local---config-files/themes/p10k-post.zsh rename to profiles/NICHOLAS85/.zi/plugins/_local---config-files/themes/p10k-post.zsh diff --git a/NICHOLAS85/.zshenv b/profiles/NICHOLAS85/.zshenv similarity index 100% rename from NICHOLAS85/.zshenv rename to profiles/NICHOLAS85/.zshenv diff --git a/NICHOLAS85/.zshrc b/profiles/NICHOLAS85/.zshrc similarity index 100% rename from NICHOLAS85/.zshrc rename to profiles/NICHOLAS85/.zshrc diff --git a/NICHOLAS85/bootstrap.sh b/profiles/NICHOLAS85/bootstrap.sh similarity index 100% rename from NICHOLAS85/bootstrap.sh rename to profiles/NICHOLAS85/bootstrap.sh diff --git a/agkozak/.profile b/profiles/agkozak/.profile similarity index 100% rename from agkozak/.profile rename to profiles/agkozak/.profile diff --git a/agkozak/.shrc b/profiles/agkozak/.shrc similarity index 100% rename from agkozak/.shrc rename to profiles/agkozak/.shrc diff --git a/agkozak/.zprofile b/profiles/agkozak/.zprofile similarity index 100% rename from agkozak/.zprofile rename to profiles/agkozak/.zprofile diff --git a/agkozak/.zshenv b/profiles/agkozak/.zshenv similarity index 100% rename from agkozak/.zshenv rename to profiles/agkozak/.zshenv diff --git a/agkozak/.zshrc b/profiles/agkozak/.zshrc similarity index 100% rename from agkozak/.zshrc rename to profiles/agkozak/.zshrc diff --git a/brucebentley/.zshenv b/profiles/brucebentley/.zshenv similarity index 100% rename from brucebentley/.zshenv rename to profiles/brucebentley/.zshenv diff --git a/brucebentley/zshrc.zsh b/profiles/brucebentley/zshrc.zsh similarity index 100% rename from brucebentley/zshrc.zsh rename to profiles/brucebentley/zshrc.zsh diff --git a/colerar/zshrc.zsh b/profiles/colerar/zshrc.zsh similarity index 100% rename from colerar/zshrc.zsh rename to profiles/colerar/zshrc.zsh diff --git a/jubi/.zshrc b/profiles/jubi/.zshrc similarity index 100% rename from jubi/.zshrc rename to profiles/jubi/.zshrc diff --git a/profiles/jubi/bootstrap.sh b/profiles/jubi/bootstrap.sh new file mode 100644 index 0000000..fadb2b3 --- /dev/null +++ b/profiles/jubi/bootstrap.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env zsh + +case $(uname) in +Darwin) + brew install fzf + ;; +Linux) + # No such package + # sudo apt install fzf + : + ;; +*) + : + ;; +esac diff --git a/lainiwa/1st_config/.zsh/aliases.zsh b/profiles/lainiwa/1st_config/.zsh/aliases.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/aliases.zsh rename to profiles/lainiwa/1st_config/.zsh/aliases.zsh diff --git a/lainiwa/1st_config/.zsh/completions.zsh b/profiles/lainiwa/1st_config/.zsh/completions.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/completions.zsh rename to profiles/lainiwa/1st_config/.zsh/completions.zsh diff --git a/lainiwa/1st_config/.zsh/completions/_my b/profiles/lainiwa/1st_config/.zsh/completions/_my similarity index 100% rename from lainiwa/1st_config/.zsh/completions/_my rename to profiles/lainiwa/1st_config/.zsh/completions/_my diff --git a/lainiwa/1st_config/.zsh/other/command-not-found.zsh b/profiles/lainiwa/1st_config/.zsh/other/command-not-found.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/other/command-not-found.zsh rename to profiles/lainiwa/1st_config/.zsh/other/command-not-found.zsh diff --git a/lainiwa/1st_config/.zsh/prompts.zsh b/profiles/lainiwa/1st_config/.zsh/prompts.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/prompts.zsh rename to profiles/lainiwa/1st_config/.zsh/prompts.zsh diff --git a/lainiwa/1st_config/.zsh/set_history.zsh b/profiles/lainiwa/1st_config/.zsh/set_history.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/set_history.zsh rename to profiles/lainiwa/1st_config/.zsh/set_history.zsh diff --git a/lainiwa/1st_config/.zsh/zi.zsh b/profiles/lainiwa/1st_config/.zsh/zi.zsh similarity index 100% rename from lainiwa/1st_config/.zsh/zi.zsh rename to profiles/lainiwa/1st_config/.zsh/zi.zsh diff --git a/lainiwa/1st_config/.zshenv b/profiles/lainiwa/1st_config/.zshenv similarity index 100% rename from lainiwa/1st_config/.zshenv rename to profiles/lainiwa/1st_config/.zshenv diff --git a/lainiwa/1st_config/.zshrc b/profiles/lainiwa/1st_config/.zshrc similarity index 100% rename from lainiwa/1st_config/.zshrc rename to profiles/lainiwa/1st_config/.zshrc diff --git a/lainiwa/2nd_config/.zsh/aliases.zsh b/profiles/lainiwa/2nd_config/.zsh/aliases.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/aliases.zsh rename to profiles/lainiwa/2nd_config/.zsh/aliases.zsh diff --git a/lainiwa/2nd_config/.zsh/completions.zsh b/profiles/lainiwa/2nd_config/.zsh/completions.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/completions.zsh rename to profiles/lainiwa/2nd_config/.zsh/completions.zsh diff --git a/lainiwa/2nd_config/.zsh/completions/_my b/profiles/lainiwa/2nd_config/.zsh/completions/_my similarity index 100% rename from lainiwa/2nd_config/.zsh/completions/_my rename to profiles/lainiwa/2nd_config/.zsh/completions/_my diff --git a/lainiwa/2nd_config/.zsh/other/command-not-found.zsh b/profiles/lainiwa/2nd_config/.zsh/other/command-not-found.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/other/command-not-found.zsh rename to profiles/lainiwa/2nd_config/.zsh/other/command-not-found.zsh diff --git a/lainiwa/2nd_config/.zsh/prompts.zsh b/profiles/lainiwa/2nd_config/.zsh/prompts.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/prompts.zsh rename to profiles/lainiwa/2nd_config/.zsh/prompts.zsh diff --git a/lainiwa/2nd_config/.zsh/set_history.zsh b/profiles/lainiwa/2nd_config/.zsh/set_history.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/set_history.zsh rename to profiles/lainiwa/2nd_config/.zsh/set_history.zsh diff --git a/lainiwa/2nd_config/.zsh/zinit.zsh b/profiles/lainiwa/2nd_config/.zsh/zinit.zsh similarity index 100% rename from lainiwa/2nd_config/.zsh/zinit.zsh rename to profiles/lainiwa/2nd_config/.zsh/zinit.zsh diff --git a/lainiwa/2nd_config/.zshenv b/profiles/lainiwa/2nd_config/.zshenv similarity index 100% rename from lainiwa/2nd_config/.zshenv rename to profiles/lainiwa/2nd_config/.zshenv diff --git a/lainiwa/2nd_config/.zshrc b/profiles/lainiwa/2nd_config/.zshrc similarity index 100% rename from lainiwa/2nd_config/.zshrc rename to profiles/lainiwa/2nd_config/.zshrc diff --git a/numToStr/zshrc.zsh b/profiles/numToStr/zshrc.zsh similarity index 100% rename from numToStr/zshrc.zsh rename to profiles/numToStr/zshrc.zsh diff --git a/psprint/.p10k.zsh b/profiles/psprint/.p10k.zsh similarity index 100% rename from psprint/.p10k.zsh rename to profiles/psprint/.p10k.zsh diff --git a/psprint/.zshenv b/profiles/psprint/.zshenv similarity index 100% rename from psprint/.zshenv rename to profiles/psprint/.zshenv diff --git a/psprint/bootstrap.sh b/profiles/psprint/bootstrap.sh similarity index 79% rename from psprint/bootstrap.sh rename to profiles/psprint/bootstrap.sh index 0e4c2ab..7c60814 100644 --- a/psprint/bootstrap.sh +++ b/profiles/psprint/bootstrap.sh @@ -2,7 +2,7 @@ sudo apt update sudo DEBIAN_FRONTEND=noninteractive apt install --yes cmake redis-server libhiredis-dev \ - tree gem libfreetype6-dev libfontconfig-dev autoconf automake nodejs npm + tree gem libfreetype6-dev libfontconfig-dev autoconf automake nodejs npm # For zdharma/zredis sudo mkdir -p usr/local/var/db/redis diff --git a/psprint/functions/.gitignore b/profiles/psprint/functions/.gitignore similarity index 100% rename from psprint/functions/.gitignore rename to profiles/psprint/functions/.gitignore diff --git a/psprint/functions/LICENSE b/profiles/psprint/functions/LICENSE similarity index 100% rename from psprint/functions/LICENSE rename to profiles/psprint/functions/LICENSE diff --git a/psprint/functions/README.md b/profiles/psprint/functions/README.md similarity index 100% rename from psprint/functions/README.md rename to profiles/psprint/functions/README.md diff --git a/psprint/functions/acc_print b/profiles/psprint/functions/acc_print similarity index 100% rename from psprint/functions/acc_print rename to profiles/psprint/functions/acc_print diff --git a/psprint/functions/deploy-code b/profiles/psprint/functions/deploy-code similarity index 100% rename from psprint/functions/deploy-code rename to profiles/psprint/functions/deploy-code diff --git a/psprint/functions/exchange b/profiles/psprint/functions/exchange similarity index 100% rename from psprint/functions/exchange rename to profiles/psprint/functions/exchange diff --git a/psprint/functions/f1biggest b/profiles/psprint/functions/f1biggest similarity index 100% rename from psprint/functions/f1biggest rename to profiles/psprint/functions/f1biggest diff --git a/psprint/functions/f1rechg b/profiles/psprint/functions/f1rechg similarity index 100% rename from psprint/functions/f1rechg rename to profiles/psprint/functions/f1rechg diff --git a/psprint/functions/f1rechg_x_min b/profiles/psprint/functions/f1rechg_x_min similarity index 100% rename from psprint/functions/f1rechg_x_min rename to profiles/psprint/functions/f1rechg_x_min diff --git a/psprint/functions/g1all b/profiles/psprint/functions/g1all similarity index 100% rename from psprint/functions/g1all rename to profiles/psprint/functions/g1all diff --git a/psprint/functions/g1zip b/profiles/psprint/functions/g1zip similarity index 100% rename from psprint/functions/g1zip rename to profiles/psprint/functions/g1zip diff --git a/psprint/functions/is_macports b/profiles/psprint/functions/is_macports similarity index 100% rename from psprint/functions/is_macports rename to profiles/psprint/functions/is_macports diff --git a/psprint/functions/localbin_off b/profiles/psprint/functions/localbin_off similarity index 100% rename from psprint/functions/localbin_off rename to profiles/psprint/functions/localbin_off diff --git a/psprint/functions/localbin_on b/profiles/psprint/functions/localbin_on similarity index 100% rename from psprint/functions/localbin_on rename to profiles/psprint/functions/localbin_on diff --git a/psprint/functions/mandelbrot b/profiles/psprint/functions/mandelbrot similarity index 100% rename from psprint/functions/mandelbrot rename to profiles/psprint/functions/mandelbrot diff --git a/psprint/functions/n1dict b/profiles/psprint/functions/n1dict similarity index 100% rename from psprint/functions/n1dict rename to profiles/psprint/functions/n1dict diff --git a/psprint/functions/n1diki b/profiles/psprint/functions/n1diki similarity index 100% rename from psprint/functions/n1diki rename to profiles/psprint/functions/n1diki diff --git a/psprint/functions/n1gglinks b/profiles/psprint/functions/n1gglinks similarity index 100% rename from psprint/functions/n1gglinks rename to profiles/psprint/functions/n1gglinks diff --git a/psprint/functions/n1ggw3m b/profiles/psprint/functions/n1ggw3m similarity index 100% rename from psprint/functions/n1ggw3m rename to profiles/psprint/functions/n1ggw3m diff --git a/psprint/functions/n1ling b/profiles/psprint/functions/n1ling similarity index 100% rename from psprint/functions/n1ling rename to profiles/psprint/functions/n1ling diff --git a/psprint/functions/n1ssl_rtunnel b/profiles/psprint/functions/n1ssl_rtunnel similarity index 100% rename from psprint/functions/n1ssl_rtunnel rename to profiles/psprint/functions/n1ssl_rtunnel diff --git a/psprint/functions/n1ssl_tunnel b/profiles/psprint/functions/n1ssl_tunnel similarity index 100% rename from psprint/functions/n1ssl_tunnel rename to profiles/psprint/functions/n1ssl_tunnel diff --git a/psprint/functions/optlbin_off b/profiles/psprint/functions/optlbin_off similarity index 100% rename from psprint/functions/optlbin_off rename to profiles/psprint/functions/optlbin_off diff --git a/psprint/functions/optlbin_on b/profiles/psprint/functions/optlbin_on similarity index 100% rename from psprint/functions/optlbin_on rename to profiles/psprint/functions/optlbin_on diff --git a/psprint/functions/pngimage b/profiles/psprint/functions/pngimage similarity index 100% rename from psprint/functions/pngimage rename to profiles/psprint/functions/pngimage diff --git a/psprint/functions/pscopy_xauth b/profiles/psprint/functions/pscopy_xauth similarity index 100% rename from psprint/functions/pscopy_xauth rename to profiles/psprint/functions/pscopy_xauth diff --git a/psprint/functions/psffconv b/profiles/psprint/functions/psffconv similarity index 100% rename from psprint/functions/psffconv rename to profiles/psprint/functions/psffconv diff --git a/psprint/functions/psfind b/profiles/psprint/functions/psfind similarity index 100% rename from psprint/functions/psfind rename to profiles/psprint/functions/psfind diff --git a/psprint/functions/pslist b/profiles/psprint/functions/pslist similarity index 100% rename from psprint/functions/pslist rename to profiles/psprint/functions/pslist diff --git a/psprint/functions/psls b/profiles/psprint/functions/psls similarity index 100% rename from psprint/functions/psls rename to profiles/psprint/functions/psls diff --git a/psprint/functions/psprobe_host b/profiles/psprint/functions/psprobe_host similarity index 100% rename from psprint/functions/psprobe_host rename to profiles/psprint/functions/psprobe_host diff --git a/psprint/functions/psrecompile b/profiles/psprint/functions/psrecompile similarity index 100% rename from psprint/functions/psrecompile rename to profiles/psprint/functions/psrecompile diff --git a/psprint/functions/pssetup_ssl_cert b/profiles/psprint/functions/pssetup_ssl_cert similarity index 100% rename from psprint/functions/pssetup_ssl_cert rename to profiles/psprint/functions/pssetup_ssl_cert diff --git a/psprint/functions/setopt b/profiles/psprint/functions/setopt similarity index 100% rename from psprint/functions/setopt rename to profiles/psprint/functions/setopt diff --git a/psprint/functions/t1countdown b/profiles/psprint/functions/t1countdown similarity index 100% rename from psprint/functions/t1countdown rename to profiles/psprint/functions/t1countdown diff --git a/psprint/functions/t1fromhex b/profiles/psprint/functions/t1fromhex similarity index 100% rename from psprint/functions/t1fromhex rename to profiles/psprint/functions/t1fromhex diff --git a/psprint/functions/t1uncolor b/profiles/psprint/functions/t1uncolor similarity index 100% rename from psprint/functions/t1uncolor rename to profiles/psprint/functions/t1uncolor diff --git a/psprint/functions/x1iso2dmg b/profiles/psprint/functions/x1iso2dmg similarity index 100% rename from psprint/functions/x1iso2dmg rename to profiles/psprint/functions/x1iso2dmg diff --git a/psprint/functions/zman b/profiles/psprint/functions/zman similarity index 100% rename from psprint/functions/zman rename to profiles/psprint/functions/zman diff --git a/psprint/zshrc.zsh b/profiles/psprint/zshrc.zsh similarity index 100% rename from psprint/zshrc.zsh rename to profiles/psprint/zshrc.zsh diff --git a/z-shell/kickstart/.zshrc b/profiles/z-shell/kickstart/.zshrc similarity index 69% rename from z-shell/kickstart/.zshrc rename to profiles/z-shell/kickstart/.zshrc index 65cd1c4..a1b1924 100644 --- a/z-shell/kickstart/.zshrc +++ b/profiles/z-shell/kickstart/.zshrc @@ -1,24 +1,20 @@ -# ■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ ❮ Z-SHELL ❯ ❮ ZI ❯ +# ■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■■ ❮ Z-SHELL ❯ ❮ ZI ❯ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" fi source <(curl -sL https://init.zshell.dev); zzinit zi for z-shell/z-a-meta-plugins @annexes \ - skip'hexyl hyperfine vivid tig' @console-tools \ + skip'git-extras' @ext-git \ skip'peko skim fzy' @fuzzy \ - skip'git-extras' @ext-git @romkatv \ - skip'F-Sy-H' @z-shell @zsh-users+fast + skip'hexyl hyperfine vivid tig' @console-tools \ + skip'F-Sy-H' @z-shell @zsh-users+fast @romkatv \ array=({git,functions,history,completion,prompt_info_functions,grep,completion,vcs_info}.zsh) zi-turbo '0a' lucid is-snippet for has'svn' svn multisrc'$array' pick'/dev/null' \ - atinit'HISTFILE=${HOME}/.cache/zi/zsh-history; COMPLETION_WAITING_DOTS=true' \ - OMZ::lib + atinit'HISTFILE=${HOME}/.cache/zi/zsh-history; COMPLETION_WAITING_DOTS=true' OMZ::lib zi-turbo '0b' lucid is-snippet for \ - atload"unalias grv g" \ - OMZP::git -zi-turbo '0c' lucid light-mode for MichaelAquilina/zsh-you-should-use \ - atinit'ZSH_SYSTEM_CLIPBOARD_TMUX_SUPPORT=true' \ - kutsan/zsh-system-clipboard \ - atinit'AUTOCD=1' \ - zplugin/zsh-exa + atload"unalias grv g" OMZP::git +zi-turbo '0c' lucid light-mode for \ + atinit'AUTOCD=1' zplugin/zsh-exa \ + MichaelAquilina/zsh-you-should-use \ [[ ! -f "${HOME}/.p10k.zsh" ]] && p10k configure diff --git a/z-shell/meta-loader/.p10k.zsh b/profiles/z-shell/meta-loader/.p10k.zsh similarity index 100% rename from z-shell/meta-loader/.p10k.zsh rename to profiles/z-shell/meta-loader/.p10k.zsh diff --git a/z-shell/meta-loader/.zshenv b/profiles/z-shell/meta-loader/.zshenv similarity index 100% rename from z-shell/meta-loader/.zshenv rename to profiles/z-shell/meta-loader/.zshenv diff --git a/z-shell/meta-loader/.zshrc b/profiles/z-shell/meta-loader/.zshrc similarity index 100% rename from z-shell/meta-loader/.zshrc rename to profiles/z-shell/meta-loader/.zshrc diff --git a/z-shell/meta-loader/bootstrap.sh b/profiles/z-shell/meta-loader/bootstrap.sh similarity index 100% rename from z-shell/meta-loader/bootstrap.sh rename to profiles/z-shell/meta-loader/bootstrap.sh diff --git a/run.sh b/run.sh index c6c4a8d..b9e3893 100755 --- a/run.sh +++ b/run.sh @@ -8,7 +8,7 @@ set -o nounset # exit on undeclared variable # Folders containing `.zshrc` FOLDERS_WITH_ZSHRC=$( cd "${0:a:h}" -find * \( -name .zshrc -o -name zshrc.zsh \) -type f -exec dirname {} \; + find profiles/* \( -name .zshrc -o -name zshrc.zsh \) -type f -exec dirname {} \; ) # A fuzzy finder available @@ -22,9 +22,11 @@ else fi # Folder to load, chosen by user -FOLDER=$(${FUZZY_FINDER} <<< ${FOLDERS_WITH_ZSHRC}) +FOLDER=$(${FUZZY_FINDER} <<< "${FOLDERS_WITH_ZSHRC}") # Build an image +# trunk-ignore(shellcheck/SC2296) +# trunk-ignore(shfmt/parse) FOLDER_LOWERCASE="${(L)FOLDER}" docker build --build-arg FOLDER="${FOLDER}" --build-arg TERM="${TERM}" -t "zi/${FOLDER_LOWERCASE}" "${0:a:h}"