Merge branch 'master' of git.blakenorth.net/home/git/dotfiles

This commit is contained in:
PowerUser64 2021-11-14 20:25:21 -08:00
commit d656786a14
2 changed files with 10 additions and 10 deletions

View file

@ -19,12 +19,13 @@
cam = commit --amend cam = commit --amend
ch = checkout ch = checkout
d = diff d = diff
lg = tree
pl = pull pl = pull
ps = push ps = push
rem = remote
s = status s = status
st = status st = status
sub = submodule sub = submodule
t = tree
tree = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all tree = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
# vim:noet # vim:noet

17
.zshrc
View file

@ -121,7 +121,7 @@
nvc='(cd ~/.config/nvim/lua/blake && nvim ../../init.lua)' \ nvc='(cd ~/.config/nvim/lua/blake && nvim ../../init.lua)' \
zshrc='$EDITOR ~/.zshrc' \ zshrc='$EDITOR ~/.zshrc' \
fstab='sudoedit /etc/fstab' \ fstab='sudoedit /etc/fstab' \
hste='$EDITOR $HISTFILE' \ hst='$EDITOR $HISTFILE' \
# Git cLONE # Git cLONE
alias glone="git clone" alias glone="git clone"
@ -168,20 +168,19 @@
[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" [ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
# # TODO: remove all aliases that refrence programs which do not exist >>> # # TODO: remove all aliases that refrence programs which do not exist >>>
# alias fdsa=not_an_alias
# validate_alias() { # validate_alias() {
# # check if the alias points to an alias # echo "validating alias $1"
# if alias "$(alias lsd | grep -Po "(?<=').*(?=')")"; then # if alias "$1";then
# : # validate_alias ${1}
# else # else
# # see if the thing the alias points to is an executable
# test -x "$(command -V "$1" | grep -Po "(?<=$1 is )/.*$")"
# fi
# } # }
# for ALIAS in $(alias | cut -d = -f 1);do # for ALIAS in $(alias | cut -d = -f 1);do
# validate_alias "$ALIAS" && # ! validate_alias "$ALIAS" &&
# unalias "$ALIAS" && # unalias "$ALIAS" &&
# echo "alias $ALIAS was removed" # echo "alias $ALIAS was removed"
# done # <<< # done # <<<
} }
# <<< # <<<
### Functions >>> ### Functions >>>
@ -424,7 +423,7 @@
# Git cLONE cD # Git cLONE cD
gloned() { gloned() {
git clone "$1" git clone "$1" || return $?
if ! cd "$(echo "$1" | sed 's/\.git//g' | rev | cut -d '/' -f 1 | rev)";then if ! cd "$(echo "$1" | sed 's/\.git//g' | rev | cut -d '/' -f 1 | rev)";then
echo 'Error: Could not `cd` into the repo' echo 'Error: Could not `cd` into the repo'
return 1 return 1