diff --git a/copy_dotfiles.sh b/copy_dotfiles.sh index 775982b..44d066a 100755 --- a/copy_dotfiles.sh +++ b/copy_dotfiles.sh @@ -38,8 +38,9 @@ echo "---- copying dotfiles ------------------" . ./src_files/shell/profile # copy over env/profile files used by shell(s) -copy_file src_files/shell/profile $XDG_CONFIG_HOME copy_file src_files/shell/.profile $HOME +copy_file src_files/shell/profile $XDG_CONFIG_HOME +copy_file src_files/shell/rc $XDG_CONFIG_HOME copy_file src_files/.config/zsh/.zshenv $HOME # copy over configs, executables, and scripts diff --git a/src_files/.config/ksh/kshrc b/src_files/.config/ksh/kshrc new file mode 100644 index 0000000..86b78da --- /dev/null +++ b/src_files/.config/ksh/kshrc @@ -0,0 +1,2 @@ +[ -r "$XDG_CONFIG_HOME/profile" ] && . "$XDG_CONFIG_HOME/profile" +[ -r "$XDG_CONFIG_HOME/rc" ] && . "$XDG_CONFIG_HOME/rc" diff --git a/src_files/.config/zsh/.zshrc b/src_files/.config/zsh/.zshrc index affff8e..21ba80e 100644 --- a/src_files/.config/zsh/.zshrc +++ b/src_files/.config/zsh/.zshrc @@ -1,66 +1,2 @@ -# use vim-like control in shell -set -o vi - -# path updates -export PATH=$DIR_BIN:$DIR_SCRIPTS:$PATH:$XDG_DATA_HOME -export PATH=$PATH:/opt/homebrew/opt/ccache/libexec:/opt/homebrew/bin - -# set env vars specific to this box, if any -[ -r "$HOME/.local-box-vars" ] && . $HOME/.local-box-vars - -# shortcuts for common commands -alias 3e='echo;echo;echo' -alias 12e='3e;3e;3e;3e' -alias cl='clear; ' -alias cls='clear;ls' - -# shortcuts for executables -alias n='nvim' -alias nv='nvim' -alias ths='theme-set' -alias thw='theme-update-wallpaper' -alias tmi='tmux-session-init' - -# executable overrides -alias ls='ls -F' -alias ksh=oksh # NOTE: if i ever use openBSD, conditionally remove this alias - -# focus/productivity/similar -alias cal="calcurse" -alias note="cd $DIR_NOTES/inbox; $EDITOR" -alias todo="cd $DIR_NOTES/rhythm; $EDITOR todo.md" -alias budget="open $DIR_HOME_BOX/finance/budget/.current" - -# login shortcuts -alias assume="source assume" -alias login-aws='aws sso login --profile' -alias login-aws-id-list="grep sso_account_id $HOME/.aws/config" - -# git stuff -alias gfo='git fetch origin' -alias gfl='git fetch origin; git log' -alias gpo='git pull origin' -alias gppo='git push origin' -alias gst='git status' -alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -' -alias gptemp='git-push-to-temp' - -# code/test/linter run and build commands -alias bel='bundle exec standardrb' -alias bet='bundle exec rspec' -alias lintjs='npx prettier --write' -alias prl='poetry run black' -alias prt='poetry run pytest' - -# containerization -alias docker=podman - -# misc commands -alias pdt='ping -c 2 drinkingtea.net' -alias ppw='ping -c 2 pinewoods.xyz' -alias weather='curl "wttr.in/dfw?2&F"' -alias shrug='echo "¯\\_(ツ)_/¯"' - -# programming and language setup -export DEVKITARM=/opt/devkitpro/devkitARM - +[ -r "$HOME/.config/profile" ] && . "$HOME/.config/profile" +[ -r "$XDG_CONFIG_HOME/rc" ] && . "$XDG_CONFIG_HOME/rc" diff --git a/src_files/shell/rc b/src_files/shell/rc new file mode 100644 index 0000000..13f856b --- /dev/null +++ b/src_files/shell/rc @@ -0,0 +1,65 @@ +# use vim-like control in shell +set -o vi + +# path updates +export PATH=$DIR_BIN:$DIR_SCRIPTS:$PATH:$XDG_DATA_HOME +export PATH=$PATH:/opt/homebrew/opt/ccache/libexec:/opt/homebrew/bin + +# set env vars specific to this box, if any +[[ -a $HOME/.local-box-vars ]] && . $HOME/.local-box-vars + +# shortcuts for common commands +alias 3e='echo;echo;echo' +alias 12e='3e;3e;3e;3e' +alias cl='clear; ' +alias cls='clear;ls' + +# shortcuts for executables +alias n='nvim' +alias nv='nvim' +alias ths='theme-set' +alias thw='theme-update-wallpaper' +alias tmi='tmux-session-init' + +# executable overrides +alias ls='ls -F' +alias ksh=oksh # NOTE: if i ever use openBSD, conditionally remove this alias + +# focus/productivity/similar +alias cal="calcurse" +alias note="cd $DIR_NOTES/inbox; $EDITOR" +alias todo="cd $DIR_NOTES/rhythm; $EDITOR todo.md" +alias budget="open $DIR_HOME_BOX/finance/budget/.current" + +# login shortcuts +alias assume="source assume" +alias login-aws='aws sso login --profile' +alias login-aws-id-list="grep sso_account_id $HOME/.aws/config" + +# git stuff +alias gfo='git fetch origin' +alias gfl='git fetch origin; git log' +alias gpo='git pull origin' +alias gppo='git push origin' +alias gst='git status' +alias git-push-to-temp='git branch -D temp; git checkout -b temp; git push origin temp -uf; git checkout -' +alias gptemp='git-push-to-temp' + +# code/test/linter run and build commands +alias bel='bundle exec standardrb' +alias bet='bundle exec rspec' +alias lintjs='npx prettier --write' +alias prl='poetry run black' +alias prt='poetry run pytest' + +# containerization +alias docker=podman + +# misc commands +alias pdt='ping -c 2 drinkingtea.net' +alias ppw='ping -c 2 pinewoods.xyz' +alias weather='curl "wttr.in/dfw?2&F"' +alias shrug='echo "¯\\_(ツ)_/¯"' + +# programming and language setup +export DEVKITARM=/opt/devkitpro/devkitARM