From f43139d032466ba15c94bee965049aab3250fd1e Mon Sep 17 00:00:00 2001 From: aleidk Date: Sun, 17 Mar 2024 20:09:01 -0300 Subject: [PATCH] minor updates --- chezmoi/.chezmoiexternal.toml | 2 +- chezmoi/executable_dot_zprofile | 44 +++++++++++++++++++++++++++++++++ chezmoi/executable_dot_zshrc | 2 +- 3 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 chezmoi/executable_dot_zprofile diff --git a/chezmoi/.chezmoiexternal.toml b/chezmoi/.chezmoiexternal.toml index 6b9161e..8c85e83 100644 --- a/chezmoi/.chezmoiexternal.toml +++ b/chezmoi/.chezmoiexternal.toml @@ -6,7 +6,7 @@ [".config/bat/themes/Catppuccin-macchiato.tmTheme"] # Run "bat cache --build" to make the theme available type = "file" - url = "https://github.com/catppuccin/bat/raw/main/Catppuccin-macchiato.tmTheme" + url = "https://github.com/catppuccin/bat/raw/main/themes/Catppuccin%20Macchiato.tmTheme" refreshPeriod = "168h" ["Repos/Source/xdg-ninja"] diff --git a/chezmoi/executable_dot_zprofile b/chezmoi/executable_dot_zprofile new file mode 100644 index 0000000..54bedb7 --- /dev/null +++ b/chezmoi/executable_dot_zprofile @@ -0,0 +1,44 @@ +#!/usr/bin/zsh + +update_path() { + export PATH="$PATH:$1" +} + +# Set manually +export DOTS="$HOME/Repos/Private/dots" +export EDITOR=nvim +export VISUAL="$EDITOR" +export QT_STYLE_OVERRIDE=kvantum +export MOZ_ENABLE_WAYLAND=1 + +# Dev Stuff +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" +. "$HOME/.cargo/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 [[ -e "$DOTS/config/zsh/zprofile.local" ]]; then + source "$DOTS/config/zsh/zprofile.local" +fi + +if [[ $OSTYPE =~ 'darwin' ]]; then + eval "$(/opt/homebrew/bin/brew shellenv)" +fi diff --git a/chezmoi/executable_dot_zshrc b/chezmoi/executable_dot_zshrc index e643dd3..86b60d0 100644 --- a/chezmoi/executable_dot_zshrc +++ b/chezmoi/executable_dot_zshrc @@ -47,7 +47,7 @@ setopt COMPLETE_IN_WORD # Complete from both ends of a word. setopt GLOB_COMPLETE # Show autocompletion menu with globs setopt MENU_COMPLETE # Automatically highlight first element of completion menu -fpath+=${ZSH_CUSTOM:-${ZSH:-$XDG_DATA_HOME/oh-my-zsh}/custom}/plugins/zsh-completions/src +# fpath+=${ZSH_CUSTOM:-${ZSH:-$XDG_DATA_HOME/oh-my-zsh}/custom}/plugins/zsh-completions/src fpath+=${XDG_CONFIG_HOME:-$DOTS/config}/zsh/completions zstyle ':completion:*:descriptions' format '%U%B%d%b%u'