Fixed source ordering in load.sh & .zshrc
This commit is contained in:
@ -1,10 +1,12 @@
|
||||
source /etc/toolkit/sh/load.sh
|
||||
|
||||
TOOLKIT=/etc/toolkit
|
||||
ZSH=$TOOLKIT/sh/ohmyzsh
|
||||
ZSH_THEME="bira"
|
||||
ZSH_CUSTOM_USER_SCRIPTS=$HOME/.zsh-scripts
|
||||
ZSH_CACHE_DIR=$HOME/.zsh-cache
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
source $TOOLKIT/sh/load.sh
|
||||
|
||||
ENABLE_CORRECTION="true"
|
||||
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
@ -18,5 +20,3 @@ create_dir_if_not_exists $ZSH_CUSTOM_USER_SCRIPTS
|
||||
create_dir_if_not_exists $ZSH_CACHE_DIR
|
||||
|
||||
load_scripts_in_dir $ZSH_CUSTOM_USER_SCRIPTS
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
@ -1,5 +1,5 @@
|
||||
ALIASES=${TOOLKIT}/sh/custom/aliases.sh
|
||||
VARS=${TOOLKIT}/sh/custom/vars.sh
|
||||
ALIASES=${TOOLKIT}/sh/custom_scripts/aliases.sh
|
||||
VARS=${TOOLKIT}/sh/custom_scripts/vars.sh
|
||||
|
||||
alias grep='grep --color=auto'
|
||||
alias fgrep='fgrep --color=auto'
|
||||
@ -24,6 +24,11 @@ alias c='clear'
|
||||
alias journal='journalctl -xe'
|
||||
alias journal-err='journalctl -p 3 -b'
|
||||
|
||||
alias fstab='sudo vim /etc/fstab'
|
||||
|
||||
alias rcron='sudo crontab -e'
|
||||
alias cron='crontab -e'
|
||||
|
||||
alias upd-arch='paru -S archlinux-keyring && paru'
|
||||
alias upd-ubt='sudo apt update -y && sudo apt upgrade -y'
|
||||
|
||||
@ -32,7 +37,7 @@ if [[ "$OS" == "Arch Linux" ]]; then
|
||||
elif [[ $OS == "Ubuntu" ]]; then
|
||||
alias upd='upd-ubt'
|
||||
else
|
||||
alias upd='echo Failed to detect distribution'
|
||||
alias upd='echo Failed to detect distribution. The script needs to be able to determine the distribution to know which package manager to use'
|
||||
fi
|
||||
|
||||
alias reload='source ~/.zshrc'
|
||||
|
Reference in New Issue
Block a user