diff options
Diffstat (limited to '.bash')
| -rw-r--r-- | .bash/aliases.bash | 8 | ||||
| -rw-r--r-- | .bash/prompt.bash | 18 |
2 files changed, 22 insertions, 4 deletions
diff --git a/.bash/aliases.bash b/.bash/aliases.bash index bcdfae2..a12be3d 100644 --- a/.bash/aliases.bash +++ b/.bash/aliases.bash @@ -15,7 +15,7 @@ alias pip-update="sudo pip freeze --local | grep -v '^\-e' | cut -d = -f 1 | xa alias matrix='cmatrix -sbu6 -C cyan' alias tbc='tbclock -e -H2 -M7 -S3' command -v colordiff >/dev/null 2>&1&&alias diff="colordiff" -command -v colormake >/dev/null 2>&1&&alias make="colormake" +#command -v colormake >/dev/null 2>&1&&alias make="colormake" alias perllint="perl -Mstrict -Mdiagnostics -cw" alias scredit='gimp "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"' alias scrview='pqiv -i "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"' @@ -196,3 +196,9 @@ for cmmd in batcat bat; do break fi done +# Flake8. Nice linter, but... +# They kneeled to USER STUPIDITY when it comes to configuration. Wut? +# https://flake8.pycqa.org/en/latest/release-notes/4.0.0.html#backwards-incompatible-changes +# --> https://github.com/pycqa/flake8/pull/1404 +# Users were confused, so ~/.config/flake8 is not supported anymore. lelkek. +alias flake8='flake8 --config ${HOME}/.config/flake8' diff --git a/.bash/prompt.bash b/.bash/prompt.bash index 8c4dbaa..c5b8c92 100644 --- a/.bash/prompt.bash +++ b/.bash/prompt.bash @@ -47,12 +47,18 @@ case "$MYUID" in *centos*) FGC2="fgcolor 25";FGC3="fgcolor 208";; *solaris) FGC2="fgcolor 31";FGC3="fgcolor 124";; ubuntu) - if [ "$OSMAJVER" -ge 22 ];then + if [ "$OSMAJVER" -ge 24 ];then if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then - FGC2="fgcolor 89";FGC3="fgcolor 208" + FGC2="fgcolor 125";FGC3="fgcolor 202" else FGC2="fgcolor 53";FGC3="fgcolor 184" fi + elif [ "$OSMAJVER" -ge 22 ];then + if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then + FGC2="fgcolor 208";FGC3="fgcolor 89" + else + FGC2="fgcolor 184";FGC3="fgcolor 53" + fi else FGC2="fgcolor 130";FGC3="fgcolor 215" fi @@ -92,7 +98,13 @@ case "$MYUID" in *centos*) FGC1="fgcolor 25";FGC3="fgcolor 208";; *solaris) FGC1="fgcolor 31";FGC3="fgcolor 124";; ubuntu) - if [ "$OSMAJVER" -ge 22 ];then + if [ "$OSMAJVER" -ge 24 ];then + if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then + FGC1="fgcolor 125";FGC3="fgcolor 202" + else + FGC1="fgcolor 53";FGC3="fgcolor 184" + fi + elif [ "$OSMAJVER" -ge 22 ];then if printf "%b" "$TERM"|grep -P 'xterm|256' > /dev/null;then FGC1="fgcolor 89";FGC3="fgcolor 208" else |