commit 6d9f9f55d4b638d552efeebf37f8e4fa98451a64
parent 409c48249ca57ebaa79cd19fd5e4e274fe6977ec
Author: jacob@thinkpad <jacobouno@protonmail.com>
Date: Sun, 26 Apr 2020 17:35:28 -0700
add some useful aliases, add OpenBSD and Linux specific aliases, remove some aliases and functions
f=EDITOR, man expands aliases
Diffstat:
| M | aliases/.aliases | | | 112 | +++++++++++++++++++++++++++++-------------------------------------------------- |
1 file changed, 41 insertions(+), 71 deletions(-)
diff --git a/aliases/.aliases b/aliases/.aliases
@@ -1,41 +1,38 @@
-# soure private aliases
-[ -f "$HOME/.aliases-private" ] && source "$HOME/.aliases-private"
+# vim filetype=sh
+# source private aliases
+[ -f "$HOME/.aliases-private" ] && . "$HOME/.aliases-private"
+
+if [ $(uname) = "OpenBSD" ]; then
+ alias xenodm="doas xenodm"
+ alias pa="pkg_add"
+ alias pi="pkg_info"
+elif [ $(uname) = "Linux" ]; then
+ alias pacman="pacman-wrapper"
+ alias pa="pacman"
+ alias startx="startx ~/.xinitrc"
+ alias sudo="sudo -E "
+ alias sys="systemctl"
+ alias suspend="systemctl suspend"
+fi
-# default arguments
-# sys
-alias startx="startx ~/.xinitrc"
-alias sudo="sudo -E "
+
+alias man="man "
+alias doas="doas "
+alias grep="egrep"
+alias meta="exiftool"
+alias mpv="mpv --no-input-default-bindings"
+alias ncmpcpp="ncmpcpp -q"
alias pkill="pkill -x"
-alias suspend="systemctl suspend"
-alias hibernate="systemctl hibernate"
-# core
-alias grep="egrep --color"
alias sed="sed -E"
alias tmux="tmux -u"
-alias ls="ls --color=always"
-# etc
-alias mpv="mpv --no-input-default-bindings"
-alias ncmpcpp="ncmpcpp -q"
-alias glava="glava &"
-
-# rename
-alias meta="exiftool"
-alias gwg='xdotool getwindowgeometry "$(xdotool getactivewindow)"'
-
-
-# shorten
-alias sys="systemctl"
-alias ra="ranger"
-alias pa="pacman"
-alias nv="nvim"
+# 1 char
alias l="$PAGER"
-alias s="doas -u $USER -- "
+alias f="$EDITOR"
alias k="md"
alias n="nvim"
alias v="vim"
-
# git
alias gd="git diff --cached"
alias ga="git add"
@@ -44,19 +41,14 @@ alias gP="git push"
alias gp="git pull"
alias gr="git remote"
-
-# location
-alias rs="cd ~/own/projects/rust-learning/"
-alias logs="cd ~/own/text/logs/"
+# locations
alias s="cd ~/src/suckless/"
alias cn="cd $NOTES"
+# short scripts
+alias ssh-port="grep -Ei '^port' /etc/ssh/sshd_config || echo 'port 22'"
-# extention
-alias pacman="pacman-wrapper"
-# short scripts
-alias ssh-port="grep -Ei --color=never '^port' /etc/ssh/sshd_config || echo 'port 22'"
## one-line functions
# delay execution of command by input * 60 seconds (must quote command)
@@ -65,12 +57,6 @@ t() { sleep $(calc -d "$1" \* 60); $2 ;}
# start tmux automaticly on ssh
ssh() { /usr/bin/ssh -t "$@" "tmux a || tmux new" ;}
-# find REGEX within current wd
-f() {
- find . -iregex ".*$@.*"
-}
-
-
## multi-line functions
# get working directory
@@ -79,20 +65,9 @@ wd() {
pwd | sed "s/$home/~/g"
}
-# find and edit
-fe() {
-if [ -d "$1" ]; then
- printf "searching '$1' for '$2'\n"
- find "$1" -name "$2" -exec "$EDITOR" '{}' \; 2>/dev/null
-else
- printf "searching ~/ for '$1'\n"
- find ~/ -name "$1" -exec "$EDITOR" '{}' \; 2>/dev/null
-fi
-}
-
# try connecting to host
is_up() {
- if [ "$( ping -c 1 -W 1.2 "$1" | tail -n 2 | head -n 1 | cut -d ',' -f 2 | awk '{print $1}' )" -ne 0 ]; then
+ if [ "$(ping -c 1 -W 1.2 "$1" | tail -n 2 | head -n 1 | cut -d ',' -f 2 | awk '{print $1}')" -ne 0 ]; then
printf "$1 is up.\n"
else
printf "$1 is down.\n"
@@ -105,10 +80,10 @@ daily() {
# counts as the previous day until six
if ! [ "$time" -gt 0 -a "$time" -lt 600 ]; then
- date="$( date +%Y/%m/%d)"
+ date="$(date +%Y/%m/%d)"
else
date="$(date +%Y/%m)/"
- day="$( expr "$(date +%d)" - 1 )"
+ day="$(expr "$(date +%d)" - 1)"
if [ "$day" -lt 10 ]; then
date="$date/0$day"
@@ -118,9 +93,9 @@ daily() {
fi
if [ ! -e "$NOTES/daily/$date" ]; then
- printf "$( date +%d/%m/%Y)\n\n$( date '+%R' )" >> "$NOTES/daily/$date"
+ printf "$(date +%d/%m/%Y)\n\n$( date '+%R')" >> "$NOTES/daily/$date"
else
- printf "\n\n$( date '+%R' )" >> "$NOTES/daily/$date"
+ printf "\n\n$(date '+%R')" >> "$NOTES/daily/$date"
fi
note "daily/$date"
@@ -149,7 +124,6 @@ wm_class() {
}
-
## history functions
# history search
hs() {
@@ -161,20 +135,20 @@ hs() {
}
# repeat
-r() {
- if [ -z "$1" ]; then
- fc -s
- else
- $( hs "$1" 1 )
- fi
-}
+#r() {
+# if [ -z "$1" ]; then
+# fc -s
+# else
+# eval $(hs "$1" 1)
+# fi
+#}
# repeat edit
re() {
if [ -z "$1" ]; then
fc -e "$EDITOR"
else
- local index="$( fc -l 0 | grep "$1" | tail -n 1 | awk '{print $1}' )"
+ local index="$(fc -l 0 | grep "$1" | tail -n 1 | awk '{print $1}')"
fc -e "$EDITOR" $index
fi
}
@@ -183,7 +157,3 @@ re() {
gf() {
ssh git ls | grep "$@"
}
-
-
-
-# vim filetype=sh
