From ea5957f6d445bbea741202dbf48fccf704cffedd Mon Sep 17 00:00:00 2001 From: aleidk Date: Wed, 20 Nov 2024 12:12:03 -0300 Subject: [PATCH] transform zsh files into templates --- config/zsh/zprofile | 45 +++++++++++++++++++++++++++------------------ config/zsh/zshrc | 3 +++ 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/config/zsh/zprofile b/config/zsh/zprofile index cd1614c..ebeea46 100644 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -5,37 +5,46 @@ update_path() { } # Set manually -export DOTS="$HOME/.local/share/chezmoi" +export REPOS="$HOME/.local/share/chezmoi" +export DOTS="$REPOS/Private/dots" export EDITOR=nvim export VISUAL="$EDITOR" export QT_STYLE_OVERRIDE=kvantum export MOZ_ENABLE_WAYLAND=1 +update_path "$DOTS/scripts" +update_path "$HOME/.local/bin" +update_path "$HOME/bin" +update_path "/usr/local/bin" + # Dev Stuff +{{ #if (is_executable "npm") }} export NPM_PACKAGES="$HOME/.npm-packages" export NODE_PATH="$NPM_PACKAGES/lib/node_modules${NODE_PATH:+:$NODE_PATH}" -export PNPM_HOME="$HOME/.local/share/pnpm" -export ESLINT_USE_FLAT_CONFIG=true -# . "$HOME/.cargo/env" -# source "$HOME/.rye/env" # Unset manpath so we can inherit from /etc/manpath via the `manpath` # command unset MANPATH # delete if you already modified MANPATH elsewhere in your config export MANPATH="$NPM_PACKAGES/share/man:$(manpath)" -# PATH -update_path "/usr/local/bin" -update_path "$HOME/.local/bin" -update_path "$HOME/.cargo/bin/" -update_path "$HOME/.spicetify" -update_path "$DOTS/scripts" -update_path "$HOME/bin" update_path "$NPM_PACKAGES/bin" -update_path "$PNPM_HOME" -update_path "$HOME/.local/share/rtx/shims" -update_path "$HOME/.spicetify" +{{ /if }} -if [[ $OSTYPE =~ 'darwin' ]]; then - eval "$(/opt/homebrew/bin/brew shellenv)" -fi +{{ #if (is_executable "pnpm") }} +export PNPM_HOME="$HOME/.local/share/pnpm" +export ESLINT_USE_FLAT_CONFIG=true +update_path "$PNPM_HOME" +{{ /if }} + +{{ #if (is_executable "rye") }} +source "$HOME/.rye/env" +{{ /if }} + +{{ #if (is_executable "cargo") }} +. "$HOME/.cargo/env" +update_path "$HOME/.cargo/bin/" +{{ /if }} + +{{~ #if (eq (env_var "OS") "macos") }} +eval "$(/opt/homebrew/bin/brew shellenv)" +{{ /if ~}} diff --git a/config/zsh/zshrc b/config/zsh/zshrc index 21c40f2..33e96a1 100644 --- a/config/zsh/zshrc +++ b/config/zsh/zshrc @@ -26,7 +26,10 @@ zinit snippet "https://raw.githubusercontent.com/catppuccin/zsh-syntax-highlight zinit light zsh-users/zsh-syntax-highlighting zinit light zsh-users/zsh-completions zinit light zsh-users/zsh-autosuggestions + +{{ #if dotter.packages.fzf }} zinit light Aloxaf/fzf-tab +{{ /if }} # ╭──────────────────────────────────────────────────────────╮ # │ Oh My Zsh snippets │