cobyp/linux-toolkit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed source ordering in load.sh & .zshrc

Browse Source
This commit is contained in:
Coby Powers
2022-10-20 14:03:45 -05:00
parent a41f19ab2b
commit 4a3bbdc72e
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sh/.zshrc
View File

@ -1,10 +1,12 @@
source /etc/toolkit/sh/load.sh TOOLKIT=/etc/toolkit
ZSH=$TOOLKIT/sh/ohmyzsh ZSH=$TOOLKIT/sh/ohmyzsh
ZSH_THEME="bira" ZSH_THEME="bira"
ZSH_CUSTOM_USER_SCRIPTS=$HOME/.zsh-scripts ZSH_CUSTOM_USER_SCRIPTS=$HOME/.zsh-scripts
ZSH_CACHE_DIR=$HOME/.zsh-cache ZSH_CACHE_DIR=$HOME/.zsh-cache
source $ZSH/oh-my-zsh.sh
source $TOOLKIT/sh/load.sh
ENABLE_CORRECTION="true" ENABLE_CORRECTION="true"
COMPLETION_WAITING_DOTS="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 create_dir_if_not_exists $ZSH_CACHE_DIR
load_scripts_in_dir $ZSH_CUSTOM_USER_SCRIPTS load_scripts_in_dir $ZSH_CUSTOM_USER_SCRIPTS
source $ZSH/oh-my-zsh.sh

11
sh/custom_scripts/aliases.sh
View File

@ -1,5 +1,5 @@
ALIASES=${TOOLKIT}/sh/custom/aliases.sh ALIASES=${TOOLKIT}/sh/custom_scripts/aliases.sh
VARS=${TOOLKIT}/sh/custom/vars.sh VARS=${TOOLKIT}/sh/custom_scripts/vars.sh
alias grep='grep --color=auto' alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto' alias fgrep='fgrep --color=auto'
@ -24,6 +24,11 @@ alias c='clear'
alias journal='journalctl -xe' alias journal='journalctl -xe'
alias journal-err='journalctl -p 3 -b' 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-arch='paru -S archlinux-keyring && paru'
alias upd-ubt='sudo apt update -y && sudo apt upgrade -y' alias upd-ubt='sudo apt update -y && sudo apt upgrade -y'
@ -32,7 +37,7 @@ if [[ "$OS" == "Arch Linux" ]]; then
elif [[ $OS == "Ubuntu" ]]; then elif [[ $OS == "Ubuntu" ]]; then
alias upd='upd-ubt' alias upd='upd-ubt'
else 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 fi
alias reload='source ~/.zshrc' alias reload='source ~/.zshrc'