1
0
Fork 0
mirror of https://github.com/MillironX/dotfiles.git synced 2024-11-23 13:59:55 +00:00

Compare commits

..

5 commits

5 changed files with 24 additions and 23 deletions

View file

@ -12,6 +12,11 @@ alias ls=lsd
alias code=codium alias code=codium
{{- end }} {{- end }}
# Platform-specific aliases
{{- if eq .chezmoi.os "darwin" }}
alias nproc='sysctl -n hw.logicalcpu'
{{- end }}
# Universal aliases # Universal aliases
alias config='git --git-dir=$HOME/.cfg/ --work-tree=$HOME' alias config='git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
alias please='sudo $(fc -ln -1)' alias please='sudo $(fc -ln -1)'

View file

@ -1,6 +1,7 @@
# shellcheck shell=sh
# >>> conda initialize >>> # >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !! # !! 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 if [ $? -eq 0 ]; then
eval "$__conda_setup" eval "$__conda_setup"
else else
@ -18,7 +19,7 @@ fi
# <<< conda initialize <<< # <<< conda initialize <<<
{{- if lookPath "direnv" }} {{- if lookPath "direnv" }}
eval "$(direnv hook $(basename $(readlink -f /proc/$$/exe)))" eval "$(direnv hook $SH)"
{{- end }} {{- end }}
if [ -f $HOME/.ion/bin/ion ]; then if [ -f $HOME/.ion/bin/ion ]; then
@ -27,8 +28,8 @@ if [ -f $HOME/.ion/bin/ion ]; then
fi fi
# Import GNU parallel # Import GNU parallel
if [ $(command -v env_parallel.$(basename $(readlink -f /proc/$$/exe))) ]; then if [ $(command -v env_parallel.$SH) ]; then
source $(which env_parallel.$(basename $(readlink -f /proc/$$/exe))) source $(which env_parallel.$SH)
fi fi
{{- if eq .machinetype "workstation" }} {{- if eq .machinetype "workstation" }}

View file

@ -7,18 +7,10 @@ export PATH="$HOME/.julia/bin:$PATH"
export PATH="$HOME/.julia/juliaup/bin:$PATH" export PATH="$HOME/.julia/juliaup/bin:$PATH"
export PATH="$HOME/.juliaup/bin:$PATH" export PATH="$HOME/.juliaup/bin:$PATH"
# Linuxbrew setup {{ if eq .chezmoi.os "darwin" }}
if [ -d $HOME/../linuxbrew/.linuxbrew ]; then # Homebrew setup
BREWPATH=$HOME/../linuxbrew/.linuxbrew eval "$(/opt/homebrew/bin/brew shellenv)"
elif [ -d $HOME/.linuxbrew ]; then {{ end }}
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 if [ -e "$HOME/.nix-profile/etc/profile.d/nix.sh" ]; then
. "$HOME/.nix-profile/etc/profile.d/nix.sh" . "$HOME/.nix-profile/etc/profile.d/nix.sh"

View file

@ -1,16 +1,17 @@
# shellcheck shell=bash # shellcheck shell=bash
# .bashrc # .bashrc
export SH=bash
if [ -f "$HOME/.modules" ]; then if [ -f "$HOME/.modules" ]; then
source $HOME/.modules source $HOME/.modules
fi fi
# Hook virtual environment modifers
source $HOME/.hooks
# User specific aliases and functions # User specific aliases and functions
source $HOME/.aliases source $HOME/.aliases
# Hook virtual environment modifers
source $HOME/.hooks
source $HOME/.envvar source $HOME/.envvar
# Make the prompt pretty, just in case we're stuck in bash land # Make the prompt pretty, just in case we're stuck in bash land

View file

@ -1,4 +1,5 @@
{{- if eq .chezmoi.os "linux" }} export SH=zsh
{{ if or (eq .chezmoi.os "linux") (eq .chezmoi.os "darwin") }}
{{- if or {{- if or
(eq .machinetype "workstation") (eq .machinetype "workstation")
(eq .chezmoi.osRelease.id "fedora") (eq .chezmoi.osRelease.id "fedora")
@ -51,6 +52,9 @@ antigen theme https://gist.github.com/efde5e8d507bd3e1e046198b69d579f8.git gianu
HYPHEN_INSENSITIVE="true" HYPHEN_INSENSITIVE="true"
COMPLETION_WAITING_DOTS="true" COMPLETION_WAITING_DOTS="true"
alias zshconfig="$EDITOR ~/.zshrc"
source $HOME/.aliases
source $HOME/.hooks source $HOME/.hooks
# Tell Antigen that you're done # Tell Antigen that you're done
@ -64,10 +68,8 @@ bashcompinit
source $HOME/.envvar 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 {{ if or
(eq .machinetype "workstation") (eq .machinetype "workstation")
(eq .chezmoi.osRelease.id "fedora") (eq .chezmoi.osRelease.id "fedora")