diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl index 45b6949..ec25204 100644 --- a/dot_aliases.tmpl +++ b/dot_aliases.tmpl @@ -12,6 +12,11 @@ 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 a025c71..71a5e17 100644 --- a/dot_hooks.tmpl +++ b/dot_hooks.tmpl @@ -1,6 +1,7 @@ +# shellcheck shell=sh # >>> conda initialize >>> # !! Contents within this block are managed by 'conda init' !! -__conda_setup="$($HOME/miniconda3/bin/conda shell.$(basename $(readlink -f /proc/$$/exe)) 'hook' 2> /dev/null)" +__conda_setup="$($HOME/miniconda3/bin/conda shell.$SH 'hook' 2> /dev/null)" if [ $? -eq 0 ]; then eval "$__conda_setup" else @@ -18,7 +19,7 @@ fi # <<< conda initialize <<< {{- if lookPath "direnv" }} -eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))" +eval "$(direnv hook $SH)" {{- end }} if [ -f $HOME/.ion/bin/ion ]; then @@ -27,8 +28,8 @@ if [ -f $HOME/.ion/bin/ion ]; then fi # Import GNU parallel -if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then - source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe))) +if [ $(command -v env_parallel.$SH) ]; then + source $(which env_parallel.$SH) fi {{- if eq .machinetype "workstation" }} diff --git a/dot_profile b/dot_profile.tmpl similarity index 52% rename from dot_profile rename to dot_profile.tmpl index 01f5e0d..035d52a 100644 --- a/dot_profile +++ b/dot_profile.tmpl @@ -7,18 +7,10 @@ export PATH="$HOME/.julia/bin:$PATH" export PATH="$HOME/.julia/juliaup/bin:$PATH" export PATH="$HOME/.juliaup/bin:$PATH" -# 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 eq .chezmoi.os "darwin" }} +# Homebrew setup +eval "$(/opt/homebrew/bin/brew shellenv)" +{{ end }} 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 34b39c0..619df33 100644 --- a/executable_dot_bashrc.tmpl +++ b/executable_dot_bashrc.tmpl @@ -1,16 +1,17 @@ # shellcheck shell=bash # .bashrc +export SH=bash if [ -f "$HOME/.modules" ]; then source $HOME/.modules fi -# Hook virtual environment modifers -source $HOME/.hooks - # User specific aliases and functions source $HOME/.aliases +# Hook virtual environment modifers +source $HOME/.hooks + 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 4529d6f..210e161 100644 --- a/executable_dot_zshrc.tmpl +++ b/executable_dot_zshrc.tmpl @@ -1,4 +1,5 @@ -{{- if eq .chezmoi.os "linux" }} +export SH=zsh +{{ if or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin") }} {{- if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora") @@ -51,6 +52,9 @@ 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 @@ -64,10 +68,8 @@ bashcompinit source $HOME/.envvar -alias zshconfig="$EDITOR ~/.zshrc" -source $HOME/.aliases -{{- if eq .chezmoi.os "linux" }} +{{ if or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin") }} {{ if or (eq .machinetype "workstation") (eq .chezmoi.osRelease.id "fedora")