diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl index ec25204..45b6949 100644 --- a/dot_aliases.tmpl +++ b/dot_aliases.tmpl @@ -12,11 +12,6 @@ alias ls=lsd alias code=codium {{- end }} -# Platform-specific aliases -{{- if eq .chezmoi.os "darwin" }} -alias nproc='sysctl -n hw.logicalcpu' -{{- end }} - # Universal aliases alias config='git --git-dir=$HOME/.cfg/ --work-tree=$HOME' alias please='sudo $(fc -ln -1)' diff --git a/dot_hooks.tmpl b/dot_hooks.tmpl index 71a5e17..a025c71 100644 --- a/dot_hooks.tmpl +++ b/dot_hooks.tmpl @@ -1,7 +1,6 @@ -# shellcheck shell=sh # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$($HOME/miniconda3/bin/conda shell.$SH 'hook' 2> /dev/null)" +__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $(readlink -f /proc/$$/exe)) 'hook' 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__conda_setup" else @@ -19,7 +18,7 @@ fi # <<< conda initialize <<< {{- if lookPath "direnv" }} -eval "$(direnv hook $SH)" +eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))" {{- end }} if [ -f $HOME/.ion/bin/ion ]; then @@ -28,8 +27,8 @@ if [ -f $HOME/.ion/bin/ion ]; then fi # Import GNU parallel -if [ $(command -v env_parallel.$SH) ]; then - source $(which env_parallel.$SH) +if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then + source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe))) fi {{- if eq .machinetype "workstation" }} diff --git a/dot_profile.tmpl b/dot_profile similarity index 52% rename from dot_profile.tmpl rename to dot_profile index 035d52a..01f5e0d 100644 --- a/dot_profile.tmpl +++ b/dot_profile @@ -7,10 +7,18 @@ export PATH="$HOME/.julia/bin:$PATH" export PATH="$HOME/.julia/juliaup/bin:$PATH" export PATH="$HOME/.juliaup/bin:$PATH" -{{ if eq .chezmoi.os "darwin" }} -# Homebrew setup -eval "$(/opt/homebrew/bin/brew shellenv)" -{{ end }} +# Linuxbrew setup +if [ -d $HOME/../linuxbrew/.linuxbrew ]; then + BREWPATH=$HOME/../linuxbrew/.linuxbrew +elif [ -d $HOME/.linuxbrew ]; then + BREWPATH=$HOME/.linuxbrew +fi + +if [ -n "$BREWPATH" ]; then + eval "$($BREWPATH/bin/brew shellenv)" + export HOMEBREW_MAKE_JOBS=1 + export HOMEBREW_NO_ANALYTICS=1 +fi if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then . "$HOME/.nix-profile/etc/profile.d/nix.sh" diff --git a/executable_dot_bashrc.tmpl b/executable_dot_bashrc.tmpl index 619df33..34b39c0 100644 --- a/executable_dot_bashrc.tmpl +++ b/executable_dot_bashrc.tmpl @@ -1,17 +1,16 @@ # shellcheck shell=bash # .bashrc -export SH=bash if [ -f "$HOME/.modules" ]; then source $HOME/.modules fi -# User specific aliases and functions -source $HOME/.aliases - # Hook virtual environment modifers source $HOME/.hooks +# User specific aliases and functions +source $HOME/.aliases + source $HOME/.envvar # Make the prompt pretty, just in case we're stuck in bash land diff --git a/executable_dot_zshrc.tmpl b/executable_dot_zshrc.tmpl index 210e161..4529d6f 100644 --- a/executable_dot_zshrc.tmpl +++ b/executable_dot_zshrc.tmpl @@ -1,5 +1,4 @@ -export SH=zsh -{{ if or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin") }} +{{- if eq .chezmoi.os "linux" }} {{- if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora") @@ -52,9 +51,6 @@ antigen theme https://gist.github.com/efde5e8d507bd3e1e046198b69d579f8.git gianu HYPHEN_INSENSITIVE="true" COMPLETION_WAITING_DOTS="true" -alias zshconfig="$EDITOR ~/.zshrc" -source $HOME/.aliases - source $HOME/.hooks # Tell Antigen that you're done @@ -68,8 +64,10 @@ bashcompinit source $HOME/.envvar +alias zshconfig="$EDITOR ~/.zshrc" +source $HOME/.aliases -{{ if or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin") }} +{{- if eq .chezmoi.os "linux" }} {{ if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora")