From 27e6bec1372d3f601f1287b7781ecfce2d180643 Mon Sep 17 00:00:00 2001 From: DarkWiiPlayer Date: Thu, 18 Feb 2021 09:13:53 +0100 Subject: [PATCH] Restructure bashrc to general shell configs --- bashrc | 93 ----------------------------------- shell/alias | 28 +++++++++++ bin/gitprompt => shell/prompt | 46 ++++++++++++----- shell/tweaks | 22 +++++++++ 4 files changed, 85 insertions(+), 104 deletions(-) create mode 100644 shell/alias rename bin/gitprompt => shell/prompt (79%) mode change 100755 => 100644 create mode 100644 shell/tweaks diff --git a/bashrc b/bashrc index ab0de77..6d02bf0 100644 --- a/bashrc +++ b/bashrc @@ -1,74 +1,8 @@ -# vim: set noexpandtab :miv # -alias gcd="source git-cd" -alias g="source cd-improved" -alias gg="cd $HOME; g ." -alias hello='echo "Hello :)"' -alias w='watch -t -d -n 1' -alias setclip='xclip -selection c' -alias getclip='xclip -selection clipboard -o' -alias r='ranger' -alias rr='(ranger)' -alias ro='(f=$(tempfile); $(which ranger) --choosefiles $f; rifle $(cat $f); rm $f)' -alias rf='(f=$(tempfile); $(which ranger) --choosefiles $f; cat $f; rm $f)' -# alias cmatrix='cmatrix -b -C `r.choose green red blue white yellow cyan magenta black`' -alias oneko='oneko -speed 20 -fg "#2f2f2f" -cursor 2 -name neko' -alias sakura='oneko -bg "#ffddee" -sakura -name sakura' -alias tmux='tmux -2' -alias pi='ssh pi -t ''tmux a -t home \|\| tmux new-session -s home''' -alias server='ssh server -t ''tmux a -t home \|\| tmux new-session -s home''' -alias ltc='getclip | luac -l -' -alias sign='gpg --armor --no-version --detach-sign --local-user darkwiiplayer' -alias workspace='cd ~/workspace' -alias shit='git' -alias ranger='source ranger' -alias ta='tmux a -t' -alias co='checkout' -alias qed='[ $RANDOM -ge $((32767 / 100 * 10)) ] && echo Quod Erat Demonstrandum || echo Quo Errat Demonstrator' -alias u='unicode' -alias hlcat='highlight -O xterm256' -alias please='sudo' -alias ofw='on_file_write' export HISTIGNORE='ls:clear:history:vimswitch*' -if which nvim > /dev/null -then - alias vim=nvim - alias oldvim=$(which vim) -fi - -stty -ixon - # Enable Vi editing mode set -o vi -rlevel() { - if [ -n "$RANGER_LEVEL" ] - then if [ "$RANGER_LEVEL" -gt 1 ] && [ ! -z "$3" ] - then - /bin/echo -ne "$1$3$RANGER_LEVEL " - else - /bin/echo -ne "$1 " - fi - fi - if [ -n "$VIM_LEVEL" ] - then if [ "$VIM_LEVEL" -gt 1 ] && [ ! -z "$3" ] - then - /bin/echo -ne "$2$3$VIM_LEVEL " - else - /bin/echo -ne "$2 " - fi - fi -} - -numjobs() { - jobs=$(jobs | wc -l) - if [ $jobs -gt 1 ] && [ ! -z "$2" ] - then echo "$1$2$jobs " - elif [ $jobs -gt 0 ] - then echo "$1 " - fi -} - export PS1full='\[\033[00;34m\]┌─╼ \[\033[00;30m\]$(numjobs ⚒ " ×")\033[00;36m$(rlevel 🥆 📓 ·)\[\033[01;35m\]\u\[\033[00;34m\]@\[\033[01;35m\]\h \[\033[00;33m\]\$ \[\033[01;35m\]\w \[\033[01;34m\]`find -mindepth 1 -maxdepth 1 -type d | wc -l`\[\033[00;34m\]d \[\033[01;32m\]`find -maxdepth 1 -type f | wc -l`\[\033[00;32m\]f\[\033[00;34m\] $(gitprompt) \[\033[00;34m\]└╼ \[\033[00m\]' @@ -85,19 +19,6 @@ export PS1git='\[\033[00;30m\]$(numjobs ⚒)\[\033[00;30m\]$(gitprompt || dirs + export PS1gitlong='\[\033[00;30m\]$(numjobs ⚒ ·)\[\033[00;30m\]$(gitprompt || dirs +0) \[\033[00;30m\]$(git log --oneline --no-decorate -1 2>/dev/null) \[\033[00;36m\]$(rlevel 🥆 📓 ·)\[\033[00;36m\]$(gitpath)\[\033[00;31m\]» \[\033[00m\]' -vimswitch() { - if [ -z "$EXPANDTAB" ] - then - export EXPANDTAB=yes - export TABSTOP=2 - echo -e "Vim switched to \033[01;32mSpaces\033[00m mode" - else - unset EXPANDTAB - unset TABSTOP - echo -e "Vim switched to \033[01;35mTabs\033[00m mode" - fi -} - prompt() { name=PS1$1 if [ -z $1 ] || [ -z "${!name}" ]; then @@ -108,17 +29,3 @@ prompt() { } prompt $PS1set - -cd() { - if [ -f .bashcdout ] - then - source .bashcdout - fi - builtin cd "$@" || return - if [ -f .bashcd ] - then - source .bashcd - fi -} - -export GPG_TTY="$(tty)" # This is necessary for the gpg-agent, apparently diff --git a/shell/alias b/shell/alias new file mode 100644 index 0000000..9458d10 --- /dev/null +++ b/shell/alias @@ -0,0 +1,28 @@ +alias gcd="source git-cd" +alias g="source cd-improved" +alias gg="cd $HOME; g ." +alias hello='echo "Hello :)"' +alias w='watch -t -d -n 1' +alias setclip='xclip -selection c' +alias getclip='xclip -selection clipboard -o' +alias r='ranger' +alias rr='(ranger)' +alias ro='(f=$(tempfile); $(which ranger) --choosefiles $f; rifle $(cat $f); rm $f)' +alias rf='(f=$(tempfile); $(which ranger) --choosefiles $f; cat $f; rm $f)' +alias oneko='oneko -speed 20 -fg "#2f2f2f" -cursor 2 -name neko' +alias sakura='oneko -bg "#ffddee" -sakura -name sakura' +alias tmux='tmux -2' +alias pi='ssh pi -t ''tmux a -t home \|\| tmux new-session -s home''' +alias server='ssh server -t ''tmux a -t home \|\| tmux new-session -s home''' +alias ltc='getclip | luac -l -' +alias sign='gpg --armor --no-version --detach-sign --local-user darkwiiplayer' +alias workspace='cd ~/workspace' +alias shit='git' +alias ranger='source ranger' +alias ta='tmux a -t' +alias co='checkout' +alias qed='[ $RANDOM -ge $((32767 / 100 * 10)) ] && echo Quod Erat Demonstrandum || echo Quo Errat Demonstrator' +alias u='unicode' +alias hlcat='highlight -O xterm256' +alias please='sudo' +alias ofw='on_file_write' diff --git a/bin/gitprompt b/shell/prompt old mode 100755 new mode 100644 similarity index 79% rename from bin/gitprompt rename to shell/prompt index b5dceb0..596cae1 --- a/bin/gitprompt +++ b/shell/prompt @@ -1,10 +1,36 @@ -#!/bin/sh +rlevel() { + if [ -n "$RANGER_LEVEL" ] + then if [ "$RANGER_LEVEL" -gt 1 ] && [ ! -z "$3" ] + then + /bin/echo -ne "$1$3$RANGER_LEVEL " + else + /bin/echo -ne "$1 " + fi + fi + if [ -n "$VIM_LEVEL" ] + then if [ "$VIM_LEVEL" -gt 1 ] && [ ! -z "$3" ] + then + /bin/echo -ne "$2$3$VIM_LEVEL " + else + /bin/echo -ne "$2 " + fi + fi +} + +numjobs() { + jobs=$(jobs | wc -l) + if [ $jobs -gt 1 ] && [ ! -z "$2" ] + then echo "$1$2$jobs " + elif [ $jobs -gt 0 ] + then echo "$1 " + fi +} git__fetch() { - if [ -f "$1/.git" ] - then dir="$(cat $top/.git | sed -e 's/^gitdir: //')" - else dir="$1/.git" - fi + if [ -f "$1/.git" ] + then dir="$(cat $top/.git | sed -e 's/^gitdir: //')" + else dir="$1/.git" + fi if [ -n "$BASH_AUTOFETCH_TIMEOUT" ]; then timeout=$BASH_AUTOFETCH_TIMEOUT else @@ -26,7 +52,7 @@ git__fetch() { echo $run } -git__prompt () { +gitprompt () { top=$(git rev-parse --show-toplevel 2>/dev/null) if [ -n "$top" ] then @@ -76,7 +102,7 @@ git__prompt () { else /bin/echo -ne "$yellow" fi - /bin/echo -ne "$branch\033[00;36m" + /bin/echo -ne "$branch\033[00;36m" # SYNC if [ -z "$ahead" ] && [ -z "$behind" ] @@ -115,9 +141,7 @@ git__prompt () { then /bin/echo -ne " ${yellow}+$untracked" fi - else - exit 1 + else + exit 1 fi } - -git__prompt diff --git a/shell/tweaks b/shell/tweaks new file mode 100644 index 0000000..6ae5059 --- /dev/null +++ b/shell/tweaks @@ -0,0 +1,22 @@ +#!/bin/sh + +stty -ixon + +if which nvim > /dev/null +then + alias vim=nvim + alias oldvim=$(which vim) +fi + +vimswitch() { + if [ -z "$EXPANDTAB" ] + then + export EXPANDTAB=yes + export TABSTOP=2 + echo -e "Vim switched to \033[01;32mSpaces\033[00m mode" + else + unset EXPANDTAB + unset TABSTOP + echo -e "Vim switched to \033[01;35mTabs\033[00m mode" + fi +}