summaryrefslogtreecommitdiff
path: root/config/essentials/shell
diff options
context:
space:
mode:
Diffstat (limited to 'config/essentials/shell')
-rw-r--r--config/essentials/shell/aliases.sh12
-rw-r--r--config/essentials/shell/functions.sh27
2 files changed, 33 insertions, 6 deletions
diff --git a/config/essentials/shell/aliases.sh b/config/essentials/shell/aliases.sh
index 5db3d65..fdd9d17 100644
--- a/config/essentials/shell/aliases.sh
+++ b/config/essentials/shell/aliases.sh
@@ -2,7 +2,7 @@
# s/alias \([^-]\)/alias -g \1
# The most important one
-alias vi='nvim'
+alias vi='vis'
which z > /dev/null 2>&1 &&
alias cd='z'
@@ -83,7 +83,7 @@ alias lst2='ls --tree -L2'
alias lst3='ls --tree -L3'
alias ls.='ls -dl .*'
which eza >/dev/null 2>&1 &&
- alias ls='eza --sort extension --group-directories-first --no-time --git' ||
+ alias ls='eza --sort extension --group-directories-first --git' ||
alias ls='ls --color --group-directories-first --sort=extension'
# pacman aliases
@@ -197,7 +197,7 @@ alias gdate='date +%y_%m_%d-%T'
alias tpid='tail -f /dev/null --pid'
alias pwdcp='pwd | clipp'
alias gw="grep -ri"
-alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/proj/suckless/*/ ~/proj/personal/scripts/*/ ~/.config/emacs ~/.config/nvim | supd'
+alias srcsupd='echo ~/src/{installdrier,dotfiles,password-store} ~/proj/suckless/*/ ~/.config/emacs ~/.config/nvim | supd'
# systemctl aliases
alias smc='systemctl'
@@ -341,6 +341,12 @@ alias ddeps='pactree -r -d 1'
alias update-mirrors='reflector -p https | rankmirrors -n 10 -p -w - | doas tee /etc/pacman.d/mirrorlist'
alias tmpd='cd $(mktemp -d)'
+alias tmpf='$EDITOR $(mktemp)'
alias brs='$BROWSER'
which bat > /dev/null 2>&1 &&
alias cat="bat -p"
+
+alias glf='git pull --ff'
+alias glnf='git pull --no-ff'
+alias quickvms='/media/cricket/vms/quickemu/"$(find '\''/media/cricket/vms/quickemu/'\'' -type f -iname '\''*.conf'\'' -printf '\''%f
+'\'' | sed '\''s/\.conf$//'\'' | fzf)".conf 2> /dev/null'
diff --git a/config/essentials/shell/functions.sh b/config/essentials/shell/functions.sh
index 3676f26..8e51135 100644
--- a/config/essentials/shell/functions.sh
+++ b/config/essentials/shell/functions.sh
@@ -45,12 +45,12 @@ o()
test "$1" && shift
test -f "$f" && $EDITOR $@ "$f"
}
-go()
+og()
{
_googoo_fzf_opt "$1"
cd "$(goo d "$dest" | fzf $opt)"
}
-ogo()
+oog()
{
_googoo_fzf_opt "$1"
cd "$(dirname "$(goo f "$dest" | fzf $opt)")"
@@ -109,7 +109,7 @@ clip() {
then
echo -n "$@" | wl-copy
else
- echo -n "$@" | xclip -selection clipboard -rmlastnl
+ echo -n "$@" | xsel -b
fi
}
@@ -241,6 +241,7 @@ pacsize()
mime-default ()
{
+ mime=
[ "${mime:=$1}" ] ||
mime="$(find /usr/share/applications/ -iname '*.desktop' -printf '%f\n' |
sed 's/\.desktop$//' |
@@ -357,3 +358,23 @@ ssh_port()
ssh -f -N -L 0.0.0.0:"$3":localhost:"$1" "$2"
>&2 printf "Forwarded port '%s' on '%s' to '%s'.\n" "$1" "$2" "$3"
}
+ffconcat () {
+ tmp=$(mktemp -p . ffconcat.XXXXX)
+ sed 's/.*/file &/' > "$tmp"
+ ffmpeg -y -f concat -safe 0 -i $tmp -c copy "$1"
+ rm $tmp
+}
+
+# wrap ssh and add key if exists
+ssh() {
+ if [ "$#" -gt 1 ]
+ then
+ /usr/bin/ssh $@
+ return
+ fi
+
+ grep -E "Host\s+$1" $HOME/.ssh/config > /dev/null 2>&1 &&
+ keyadd "$1" > /dev/null 2>&1
+ /usr/bin/ssh "$1"
+}
+