Exporting laptop ENV var & moved n() function ot .custom_bash_scripts

This commit is contained in:
Sheldon Lee 2021-09-14 17:22:55 +08:00
parent 844dfa789a
commit 856aa61e83
2 changed files with 36 additions and 29 deletions

35
.bashrc
View File

@ -25,6 +25,10 @@ export PATH="$ANDROID_SDK_ROOT/platform-tools/:$PATH"
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk 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 # include bash aliases
if [ -f ~/.bash_aliases ] if [ -f ~/.bash_aliases ]
then then
@ -37,36 +41,9 @@ then
source ~/.custom_bash_scripts source ~/.custom_bash_scripts
fi fi
# nnn # nnn bookmarks
# 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
}
if [ -f ~/.nnn_bookmarks ] if [ -f ~/.nnn_bookmarks ]
then then
source ~/.nnn_bookmarks source ~/.nnn_bookmarks
fi fi

View File

@ -1,5 +1,35 @@
#!/bin/bash #!/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 # cd into config dir
cfdir() cfdir()
{ {