diff --git a/chezmoi/.chezmoidata/packages.yaml b/chezmoi/.chezmoidata/packages.yaml index 52f4694..fc09d12 100644 --- a/chezmoi/.chezmoidata/packages.yaml +++ b/chezmoi/.chezmoidata/packages.yaml @@ -1,7 +1,4 @@ packages: - cargo: - - du-dust - - mise pkg: packages: - bat @@ -10,11 +7,10 @@ packages: - eza - fd - fzf - - build-base + - dust - git - neovim - openssl - - openssl-dev - ripgrep - sd - starship diff --git a/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl b/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl index e24d45a..68695c0 100644 --- a/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl +++ b/chezmoi/.chezmoiscripts/run_onchange_bootstrap.tmpl @@ -40,18 +40,3 @@ echo -e "${C_DODGERBLUE1}Installing packages...${NO_FORMAT}" sudo dnf install -y {{ range .packages.dnf.packages }} {{ . | quote }} {{- end -}} {{ end }} - -# ╭──────────────────────────────────────────────────────────╮ -# │ Install Rust │ -# ╰──────────────────────────────────────────────────────────╯ - -curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain stable - -. "$HOME/.cargo/env" - -# ╭──────────────────────────────────────────────────────────╮ -# │ Install Cargo Packages │ -# ╰──────────────────────────────────────────────────────────╯ - -cargo install {{ range .packages.cargo }} {{ . | quote }} {{- end -}} - diff --git a/chezmoi/executable_dot_zprofile.tmpl b/chezmoi/executable_dot_zprofile.tmpl index 325dd44..628e00d 100644 --- a/chezmoi/executable_dot_zprofile.tmpl +++ b/chezmoi/executable_dot_zprofile.tmpl @@ -5,28 +5,17 @@ update_path() { } # Set manually -export DOTS="$(dirname $(chezmoi source-path))" + +export DOTS="$HOME/.local/share/chezmoi" export EDITOR=nvim export VISUAL="$EDITOR" # 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" export ESLINT_USE_FLAT_CONFIG=true -. "$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 "$DOTS/scripts" update_path "$HOME/bin" -update_path "$NPM_PACKAGES/bin" -update_path "$PNPM_HOME" -update_path "$HOME/.local/share/rtx/shims" diff --git a/chezmoi/executable_dot_zshrc b/chezmoi/executable_dot_zshrc index 503d5c8..4aa4c7a 100644 --- a/chezmoi/executable_dot_zshrc +++ b/chezmoi/executable_dot_zshrc @@ -139,4 +139,3 @@ done eval "$(fzf --zsh)" eval "$(zoxide init --cmd cd zsh)" eval "$(starship init zsh)" -eval "$(mise activate zsh)"