diff --git a/.bashrc b/.bashrc index 0c4ee34..b6137c5 100644 --- a/.bashrc +++ b/.bashrc @@ -25,6 +25,10 @@ export PATH="$ANDROID_SDK_ROOT/platform-tools/:$PATH" export JAVA_HOME=/usr/lib/jvm/java-8-openjdk +if grep "arch-laptop" /etc/hostname > /dev/null ; then + export IS_LAPTOP=1 +fi + # include bash aliases if [ -f ~/.bash_aliases ] then @@ -37,36 +41,9 @@ then source ~/.custom_bash_scripts fi -# nnn -# for nnn file manager -n () -{ - # Block nesting of nnn in subshells - if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then - echo "nnn is already running" - return - fi - - # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set) - # To cd on quit only on ^G, remove the "export" as in: - # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" - # NOTE: NNN_TMPFILE is fixed, should not be modified - export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" - - # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn - # stty start undef - # stty stop undef - # stty lwrap undef - # stty lnext undef - - nnn -A -x "$@" - - if [ -f "$NNN_TMPFILE" ]; then - . "$NNN_TMPFILE" - rm -f "$NNN_TMPFILE" > /dev/null - fi -} +# nnn bookmarks if [ -f ~/.nnn_bookmarks ] then source ~/.nnn_bookmarks fi + diff --git a/.custom_bash_scripts b/.custom_bash_scripts index aa5c042..6db63b3 100644 --- a/.custom_bash_scripts +++ b/.custom_bash_scripts @@ -1,5 +1,35 @@ #!/bin/bash +# nnn +# for nnn file manager +n () +{ + # Block nesting of nnn in subshells + if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then + echo "nnn is already running" + return + fi + + # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set) + # To cd on quit only on ^G, remove the "export" as in: + # NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" + # NOTE: NNN_TMPFILE is fixed, should not be modified + export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd" + + # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn + # stty start undef + # stty stop undef + # stty lwrap undef + # stty lnext undef + + nnn -A -x "$@" + + if [ -f "$NNN_TMPFILE" ]; then + . "$NNN_TMPFILE" + rm -f "$NNN_TMPFILE" > /dev/null + fi +} + # cd into config dir cfdir() {