diff --git a/git/gitconfig b/git/gitconfig index 18705da..8fe190e 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -101,7 +101,3 @@ pruneTags = true [help] autocorrect = prompt -[init] - defaultBranch = main -[advice] - skippedCherryPicks = false diff --git a/shell/aliases.sh b/shell/aliases.sh index 5d353fc..1534ac7 100755 --- a/shell/aliases.sh +++ b/shell/aliases.sh @@ -36,14 +36,32 @@ alias fu='sudo "$BASH" -c "$(history -p !!)"' # open any file wihtout the knowledge of what type it is alias of="xdg-open" -# sudo aliases +# only list the IO of with iotop +# io +io(){ + local sudo_needed + [ -n "$(type sudo 2>/dev/null)" ] && [ "$USER" != 'root' ] \ + && sudo_needed="sudo" + + ${sudo_needed} iotop -p"$(pidof "$1" | sed 's/ / -p/g')" +} + if [ -n "$(type sudo 2>/dev/null)" ] && [ "$USER" != 'root' ]; then #create sudo aliases WITHOUT leading s for sudo in fwupdmgr mount umount iftop iotop fsadm lvchange lvconvert lvcreate lvdisplay lvextend lvm lvmchange lvmconf lvmconfig lvmdiskscan lvmdump lvmetad lvmsadc lvmsar lvreduce lvremove lvrename lvresize lvs lvscan pvchange pvck pvcreate pvdisplay pvmove pvremove pvresize pvs pvscan vgcfgbackup vgcfgrestore vgchange vgck vgconvert vgcreate vgdisplay vgexport vgextend vgimport vgimportclone vgmerge vgmknodes vgreduce vgremove vgrename vgs vgscan vgsplit; do - type "${sudo}" > /dev/null 2>&1 && alias "${sudo}"="sudo ${sudo}"; + type $sudo > /dev/null 2>&1 && alias $sudo="sudo $sudo"; done unset sudo + + type pacman >/dev/null 2>&1 && pacman(){ + local sudo_needed + # Check if pacman has -S, -R or -U option + # which should indicate in most times if we need sudo + echo "$*" | grep -- "-[SRU]" >/dev/null 2>&1 \ + && sudo_needed="sudo" + ${sudo_needed} /usr/bin/pacman "$@" + } fi alias pwedit="sudo vim -p /etc/{passwd,group,shadow,gshadow}" @@ -77,13 +95,14 @@ alias pacman-update='sudo pacman -Syu' alias aur-update='yay -Syua' # NIX: +alias nix-list-results='ls -l /nix/var/nix/gcroots/auto/' nixpkgs-build() { - if [ "$#" -lt 1 ]; then + if [[ $# -lt 1 ]]; then echo "Usage: nixpkgs-build [parameters...]" return 1 fi - pkg=$1 + local pkg="$1" shift if command -v nom >/dev/null 2>&1; then @@ -110,8 +129,8 @@ alias ttime_black="sh -c \"sleep 300 && notify-send -u critical 'The tea is read for INTERFACE in /sys/class/net/*; do [ -e "$INTERFACE" ] || break # incase it is empty INTERFACE=$(basename "$INTERFACE") - alias "ping-all-$INTERFACE"="ping -6 ff02::1%$INTERFACE" - alias "ping-routes-$INTERFACE"="ping -6 ff02::2%$INTERFACE" + alias ping-all-$INTERFACE="ping -6 ff02::1%$INTERFACE" + alias ping-routes-$INTERFACE="ping -6 ff02::2%$INTERFACE" done alias sort-by-size="du -hsc * | sort -hk1" diff --git a/shell/cd.sh b/shell/cd.sh index d476c26..6079d82 100755 --- a/shell/cd.sh +++ b/shell/cd.sh @@ -2,13 +2,13 @@ #correct some fast tipped cds c() { - if [ "${1}" = "d.." ]; then - cd .. || return - pwd + if [ "$1" = "d.." ]; then + cd ..; + pwd; fi - if [ -d "${1}" ]; then - cd "${1}" || return - pwd + if [ -d "$1" ]; then + cd "$1" || exit; + pwd; fi - return 0 + return 0; } diff --git a/shell/paths.sh b/shell/paths.sh index fffe0f2..cd86352 100755 --- a/shell/paths.sh +++ b/shell/paths.sh @@ -1,15 +1,21 @@ #!/bin/sh -set_path(){ - if [ -d "${1}" ]; then - export PATH="${1}:${PATH}" - fi +# Append our default paths +appendpath () { + case ":$PATH:" in + *:"$1":*) + ;; + *) + if [ -d "$1" ]; then + export PATH="${PATH:+$PATH:}$1" + fi + esac } -set_path ~/.local/bin -set_path ~/.bin +appendpath ~/.local/bin +appendpath ~/.bin -export GOPATH="${HOME}/.go" -export GOBIN="${HOME}/.gobin" -set_path "${GOPATH}/bin" -set_path "${GOBIN}" +export GOPATH=$HOME/.go +export GOBIN=$HOME/.gobin +appendpath "$GOPATH"/bin +appendpath "$GOBIN"