Merge pull request #15 from sidmoreoss/develop

Changed install directory
This commit is contained in:
jotyGill
2021-09-16 06:14:12 +00:00
committed by GitHub
2 changed files with 208 additions and 43 deletions

167
.zshrc
View File

@@ -3,7 +3,7 @@ export TERM="xterm-256color"
# export PATH=$HOME/bin:/usr/local/bin:$PATH # export PATH=$HOME/bin:/usr/local/bin:$PATH
# Path to your oh-my-zsh installation. # Path to your oh-my-zsh installation.
export ZSH=$HOME/.oh-my-zsh export ZSH=$HOME/.config/oh-my-zsh
# Set name of the theme to load. Optionally, if you set this to "random" # Set name of the theme to load. Optionally, if you set this to "random"
# it'll load a random theme each time that oh-my-zsh is loaded. # it'll load a random theme each time that oh-my-zsh is loaded.
@@ -146,7 +146,172 @@ autoload -U compinit && compinit # zsh-completions
# CUSTOM ALIASES # CUSTOM ALIASES
# Easier navigation: .., ..., ...., ....., ~ and -
alias ..="cd .."
alias ...="cd ../.."
alias ....="cd ../../.."
alias .....="cd ../../../.."
# Shortcuts
alias dl="cd ~/Downloads"
alias g="git"
# Get macOS Software Updates, and update installed Ruby gems, Homebrew, npm, and their installed packages
alias update='sudo softwareupdate -i -a; brew update; brew upgrade; brew cleanup; npm install npm -g; npm update -g; sudo gem update --system; sudo gem update; sudo gem cleanup'
# IP addresses
alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
alias localip="ipconfig getifaddr en0"
alias ips="ifconfig -a | grep -o 'inet6\? \(addr:\)\?\s\?\(\(\([0-9]\+\.\)\{3\}[0-9]\+\)\|[a-fA-F0-9:]\+\)' | awk '{ sub(/inet6? (addr:)? ?/, \"\"); print }'"
# Show active network interfaces
alias ifactive="ifconfig | pcregrep -M -o '^[^\t:]+:([^\n]|\n\t)*status: active'"
# Flush Directory Service cache
alias flush="dscacheutil -flushcache && killall -HUP mDNSResponder"
# Clean up LaunchServices to remove duplicates in the “Open With” menu
alias lscleanup="/System/Library/Frameworks/CoreServices.framework/Frameworks/LaunchServices.framework/Support/lsregister -kill -r -domain local -domain system -domain user && killall Finder"
# Canonical hex dump; some systems have this symlinked
command -v hd > /dev/null || alias hd="hexdump -C"
# macOS has no `md5sum`, so use `md5` as a fallback
command -v md5sum > /dev/null || alias md5sum="md5"
# macOS has no `sha1sum`, so use `shasum` as a fallback
command -v sha1sum > /dev/null || alias sha1sum="shasum"
# JavaScriptCore REPL
jscbin="/System/Library/Frameworks/JavaScriptCore.framework/Versions/A/Resources/jsc";
[ -e "${jscbin}" ] && alias jsc="${jscbin}";
unset jscbin;
# Trim new lines and copy to clipboard
alias c="tr -d '\n' | pbcopy"
# Recursively delete `.DS_Store` files
alias cleanup="find . -type f -name '*.DS_Store' -ls -delete"
# Empty the Trash on all mounted volumes and the main HDD.
# Also, clear Apples System Logs to improve shell startup speed.
# Finally, clear download history from quarantine. https://mths.be/bum
alias emptytrash="sudo rm -rfv /Volumes/*/.Trashes; sudo rm -rfv ~/.Trash; sudo rm -rfv /private/var/log/asl/*.asl; sqlite3 ~/Library/Preferences/com.apple.LaunchServices.QuarantineEventsV* 'delete from LSQuarantineEvent'"
# Show/hide hidden files in Finder
alias show="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
alias hide="defaults write com.apple.finder AppleShowAllFiles -bool false && killall Finder"
# Hide/show all desktop icons (useful when presenting)
alias hidedesktop="defaults write com.apple.finder CreateDesktop -bool false && killall Finder"
alias showdesktop="defaults write com.apple.finder CreateDesktop -bool true && killall Finder"
# URL-encode strings
alias urlencode='python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1]);"'
# Merge PDF files, preserving hyperlinks
# Usage: `mergepdf input{1,2,3}.pdf`
alias mergepdf='gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=_merged.pdf'
# Disable Spotlight
alias spotoff="sudo mdutil -a -i off"
# Enable Spotlight
alias spoton="sudo mdutil -a -i on"
# PlistBuddy alias, because sometimes `defaults` just doesnt cut it
alias plistbuddy="/usr/libexec/PlistBuddy"
# Airport CLI alias
alias airport='/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport'
# Intuitive map function
# For example, to list all directories that contain a certain file:
# find . -name .gitattributes | map dirname
alias map="xargs -n1"
# One of @janmoesens ProTip™s
for method in GET HEAD POST PUT DELETE TRACE OPTIONS; do
alias "${method}"="lwp-request -m '${method}'"
done
# Stuff I never really use but cannot delete either because of http://xkcd.com/530/
alias stfu="osascript -e 'set volume output muted true'"
alias pumpitup="osascript -e 'set volume output volume 100'"
# Kill all the tabs in Chrome to free up memory
# [C] explained: http://www.commandlinefu.com/commands/view/402/exclude-grep-from-your-grepped-output-of-ps-alias-included-in-description
alias chromekill="ps ux | grep '[C]hrome Helper --type=renderer' | grep -v extension-process | tr -s ' ' | cut -d ' ' -f2 | xargs kill"
# Lock the screen (when going AFK)
alias afk="/System/Library/CoreServices/Menu\ Extras/User.menu/Contents/Resources/CGSession -suspend"
# Reload the shell (i.e. invoke as a login shell)
alias reload="exec ${SHELL} -l"
# Print each PATH entry on a separate line
alias path='echo -e ${PATH//:/\\n}'
alias vim="nvim"
alias vi="nvim"
alias project="cd /run/media/Learn/Code/Projects"
alias mongodb="sudo systemctl start mongodb"
alias mongodb-stop="sudo systemctl stop mongodb"
alias Media="cd /run/media/Media"
alias Learn="cd /run/media/Learn"
extract ()
{
filetoextract=$1
if [ -f "${filetoextract}" ] ; then
case "${filetoextract}" in
*.tar.bz2) tar xjf "${filetoextract}" ;;
*.tar.gz) tar xzf "${filetoextract}" ;;
*.bz2) bunzip2 "${filetoextract}" ;;
*.rar) unrar x "${filetoextract}" ;;
*.gz) gunzip "${filetoextract}" ;;
*.tar) tar xf "${filetoextract}" ;;
*.tbz2) tar xjf "${filetoextract}" ;;
*.tgz) tar xzf "${filetoextract}" ;;
*.zip) unzip "${filetoextract}" ;;
*.Z) uncompress "${filetoextract}";;
*.7z) 7z x "${filetoextract}" ;;
*.deb) ar x "${filetoextract}" ;;
*.tar.xz) tar xf "${filetoextract}" ;;
*.tar.zst) unzstd "${filetoextract}" ;;
*) echo "'"${filetoextract}"' cannot be extracted via ex()" ;;
esac
else
echo "'"${filetoextract}"' does not exist in $PWD"
fi
}
alias ua-drop-caches='sudo paccache -rk3; yay -Sc --aur --noconfirm'
alias speedUpdate='export TMPFILE="$(mktemp)"; \
sudo true; \
rate-arch-mirrors --max-delay=21600 | tee -a $TMPFILE \
&& sudo mv /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist-backup \
&& sudo mv $TMPFILE /etc/pacman.d/mirrorlist \
&& ua-drop-caches \
&& yay -Syyu --noconfirm'
alias pacup='sudo pacman -Syu'
alias pacsearch='pacman -Ss '
alias pacinstall='sudo pacman -S '
alias pacremove='sudo pacman -Rns '
# Performance
alias cpuavail='cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_available_governors'
alias cpushow='cat /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor'
alias cpuhigh='echo performance | sudo tee /sys/devices/system/cpu/cpu*/cpufreq/scaling_governor'
# QuickZsh
SAVEHIST=50000 #save upto 50,000 lines in history. oh-my-zsh default is 10,000 SAVEHIST=50000 #save upto 50,000 lines in history. oh-my-zsh default is 10,000
#setopt hist_ignore_all_dups # dont record duplicated entries in history during a single session #setopt hist_ignore_all_dups # dont record duplicated entries in history during a single session

View File

@@ -17,39 +17,39 @@ fi
echo -e "Installing oh-my-zsh\n" echo -e "Installing oh-my-zsh\n"
if [ -d ~/.oh-my-zsh ]; then if [ -d ~/.config/oh-my-zsh ]; then
echo -e "oh-my-zsh is already installed\n" echo -e "oh-my-zsh is already installed\n"
else else
git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh git clone --depth=1 git://github.com/robbyrussell/oh-my-zsh.git ~/.config/oh-my-zsh
fi fi
cp -f .zshrc ~/ cp -f .zshrc ~/
mkdir -p ~/.quickzsh # external plugins, things, will be instlled in here mkdir -p ~/.config/quickzsh # external plugins, things, will be instlled in here
if [ -d ~/.oh-my-zsh/plugins/zsh-autosuggestions ]; then if [ -d ~/.config/oh-my-zsh/plugins/zsh-autosuggestions ]; then
cd ~/.oh-my-zsh/plugins/zsh-autosuggestions && git pull cd ~/.config/oh-my-zsh/plugins/zsh-autosuggestions && git pull
else else
git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.oh-my-zsh/plugins/zsh-autosuggestions git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions ~/.config/oh-my-zsh/plugins/zsh-autosuggestions
fi fi
if [ -d ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting ]; then if [ -d ~/.config/oh-my-zsh/custom/plugins/zsh-syntax-highlighting ]; then
cd ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull cd ~/.config/oh-my-zsh/custom/plugins/zsh-syntax-highlighting && git pull
else else
git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting git clone --depth=1 https://github.com/zsh-users/zsh-syntax-highlighting.git ~/.config/oh-my-zsh/custom/plugins/zsh-syntax-highlighting
fi fi
if [ -d ~/.oh-my-zsh/custom/plugins/zsh-completions ]; then if [ -d ~/.config/oh-my-zsh/custom/plugins/zsh-completions ]; then
cd ~/.oh-my-zsh/custom/plugins/zsh-completions && git pull cd ~/.config/oh-my-zsh/custom/plugins/zsh-completions && git pull
else else
git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions git clone --depth=1 https://github.com/zsh-users/zsh-completions ~/.config/oh-my-zsh/custom/plugins/zsh-completions
fi fi
if [ -d ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search ]; then if [ -d ~/.config/oh-my-zsh/custom/plugins/zsh-history-substring-search ]; then
cd ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull cd ~/.config/oh-my-zsh/custom/plugins/zsh-history-substring-search && git pull
else else
git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.oh-my-zsh/custom/plugins/zsh-history-substring-search git clone --depth=1 https://github.com/zsh-users/zsh-history-substring-search ~/.config/oh-my-zsh/custom/plugins/zsh-history-substring-search
fi fi
@@ -63,54 +63,54 @@ wget -q --show-progress -N https://github.com/ryanoasis/nerd-fonts/raw/master/pa
fc-cache -fv ~/.fonts fc-cache -fv ~/.fonts
if [ -d ~/.oh-my-zsh/custom/themes/powerlevel10k ]; then if [ -d ~/.config/oh-my-zsh/custom/themes/powerlevel10k ]; then
cd ~/.oh-my-zsh/custom/themes/powerlevel10k && git pull cd ~/.config/oh-my-zsh/custom/themes/powerlevel10k && git pull
else else
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.oh-my-zsh/custom/themes/powerlevel10k git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ~/.config/oh-my-zsh/custom/themes/powerlevel10k
fi fi
if [ -d ~/.quickzsh/fzf ]; then if [ -d ~/.~/.config/quickzsh/fzf ]; then
cd ~/.quickzsh/fzf && git pull cd ~/.config/quickzsh/fzf && git pull
~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 ~/.config/quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64
else else
git clone --depth 1 https://github.com/junegunn/fzf.git ~/.quickzsh/fzf git clone --depth 1 https://github.com/junegunn/fzf.git ~/.config/quickzsh/fzf
~/.quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64 ~/.config/quickzsh/fzf/install --all --key-bindings --completion --no-update-rc --64
fi fi
if [ -d ~/.oh-my-zsh/custom/plugins/k ]; then if [ -d ~/.config/oh-my-zsh/custom/plugins/k ]; then
cd ~/.oh-my-zsh/custom/plugins/k && git pull cd ~/.config/oh-my-zsh/custom/plugins/k && git pull
else else
git clone --depth 1 https://github.com/supercrabtree/k ~/.oh-my-zsh/custom/plugins/k git clone --depth 1 https://github.com/supercrabtree/k ~/.config/oh-my-zsh/custom/plugins/k
fi fi
if [ -d ~/.quickzsh/marker ]; then if [ -d ~/.config/quickzsh/marker ]; then
cd ~/.quickzsh/marker && git pull cd ~/.config/quickzsh/marker && git pull
else else
git clone --depth 1 https://github.com/pindexis/marker ~/.quickzsh/marker git clone --depth 1 https://github.com/pindexis/marker ~/.config/quickzsh/marker
fi fi
if ~/.quickzsh/marker/install.py; then if ~/.config/quickzsh/marker/install.py; then
echo -e "Installed Marker\n" echo -e "Installed Marker\n"
else else
echo -e "Marker Installation Had Issues\n" echo -e "Marker Installation Had Issues\n"
fi fi
# if git clone --depth 1 https://github.com/todotxt/todo.txt-cli.git ~/.quickzsh/todo; then : # if git clone --depth 1 https://github.com/todotxt/todo.txt-cli.git ~/.config/quickzsh/todo; then :
# else # else
# cd ~/.quickzsh/todo && git fetch --all && git reset --hard origin/master # cd ~/.config/quickzsh/todo && git fetch --all && git reset --hard origin/master
# fi # fi
# mkdir ~/.quickzsh/todo/bin ; cp -f ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # cp todo.sh to ./bin so only it is included in $PATH # mkdir ~/.config/quickzsh/todo/bin ; cp -f ~/.config/quickzsh/todo/todo.sh ~/.config/quickzsh/todo/bin/todo.sh # cp todo.sh to ./bin so only it is included in $PATH
# #touch ~/.todo/config # needs it, otherwise spits error , yeah a bug in todo # #touch ~/.todo/config # needs it, otherwise spits error , yeah a bug in todo
# ln -s ~/.quickzsh/todo ~/.todo # ln -s ~/.config/quickzsh/todo ~/.todo
if [ ! -L ~/.quickzsh/todo/bin/todo.sh ]; then if [ ! -L ~/.config/quickzsh/todo/bin/todo.sh ]; then
echo -e "Installing todo.sh in ~/.quickzsh/todo\n" echo -e "Installing todo.sh in ~/.config/quickzsh/todo\n"
mkdir -p ~/.quickzsh/todo/bin mkdir -p ~/.config/quickzsh/todo/bin
wget -q --show-progress "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.quickzsh/ wget -q --show-progress "https://github.com/todotxt/todo.txt-cli/releases/download/v2.11.0/todo.txt_cli-2.11.0.tar.gz" -P ~/.config/quickzsh/
tar xvf ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.quickzsh/todo --strip 1 && rm ~/.quickzsh/todo.txt_cli-2.11.0.tar.gz tar xvf ~/.config/quickzsh/todo.txt_cli-2.11.0.tar.gz -C ~/.config/quickzsh/todo --strip 1 && rm ~/.config/quickzsh/todo.txt_cli-2.11.0.tar.gz
ln -s ~/.quickzsh/todo/todo.sh ~/.quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH ln -s ~/.config/quickzsh/todo/todo.sh ~/.config/quickzsh/todo/bin/todo.sh # so only .../bin is included in $PATH
ln -s ~/.quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config ln -s ~/.config/quickzsh/todo/todo.cfg ~/.todo.cfg # it expects it there or ~/todo.cfg or ~/.todo/config
else else
echo -e "todo.sh is already instlled in ~/.quickzsh/todo/bin/\n" echo -e "todo.sh is already instlled in ~/.config/quickzsh/todo/bin/\n"
fi fi
if [[ $1 == "--cp-hist" ]] || [[ $1 == "-c" ]]; then if [[ $1 == "--cp-hist" ]] || [[ $1 == "-c" ]]; then