Compare commits
3 Commits
master
..
d03d525e1f
| Author | SHA1 | Date | |
|---|---|---|---|
| d03d525e1f | |||
| c23aaa4113 | |||
| e8fca12861 |
+16
-9
@@ -36,6 +36,11 @@ if [ -f "$HOME/.private_functions" ] && [ -r "$HOME/.private_functions" ]; then
|
|||||||
. "$HOME/.private_functions"
|
. "$HOME/.private_functions"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if blesh-available; then
|
||||||
|
# blesh-activate
|
||||||
|
:
|
||||||
|
fi
|
||||||
|
|
||||||
#{- PROMPT -}#
|
#{- PROMPT -}#
|
||||||
|
|
||||||
if which tput &> /dev/null && tput bold &> /dev/null; then
|
if which tput &> /dev/null && tput bold &> /dev/null; then
|
||||||
@@ -90,7 +95,7 @@ if which direnv &> /dev/null; then
|
|||||||
PS1=${ORIG_PS1}
|
PS1=${ORIG_PS1}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
prompt_command_prepend update_prompt
|
prompt_command_prepend "update_prompt"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Continuation Prompt: "> " in cyan
|
# Continuation Prompt: "> " in cyan
|
||||||
@@ -100,11 +105,14 @@ export PS4="${blue}#${no_color} "
|
|||||||
|
|
||||||
#{- HISTORY -}#
|
#{- HISTORY -}#
|
||||||
|
|
||||||
prompt_command_prepend "history -r"
|
if blesh-attached; then
|
||||||
prompt_command_prepend "history -c"
|
bleopt history_share=1
|
||||||
prompt_command_prepend "history -w"
|
else
|
||||||
prompt_command_prepend "history -n"
|
prompt_command_prepend "history -r"
|
||||||
# PROMPT_COMMAND="echo hist1; history; history -n; echo hist2; history; history -w; echo hist3; history; history -c; echo hist4; history; history -r; echo hist5; history; $PROMPT_COMMAND"
|
prompt_command_prepend "history -c"
|
||||||
|
prompt_command_prepend "history -w"
|
||||||
|
prompt_command_prepend "history -n"
|
||||||
|
fi
|
||||||
export HISTFILE="$HOME/.history/bash"
|
export HISTFILE="$HOME/.history/bash"
|
||||||
export HISTTIMEFORMAT="%F %T "
|
export HISTTIMEFORMAT="%F %T "
|
||||||
export HISTCONTROL="erasedups:ignoreboth"
|
export HISTCONTROL="erasedups:ignoreboth"
|
||||||
@@ -133,7 +141,6 @@ log_bash_persistent_history()
|
|||||||
|
|
||||||
prompt_command_prepend "log_bash_persistent_history"
|
prompt_command_prepend "log_bash_persistent_history"
|
||||||
|
|
||||||
|
|
||||||
# Source bash completion, this file will then lazy load all other completions
|
# Source bash completion, this file will then lazy load all other completions
|
||||||
source_completions() {
|
source_completions() {
|
||||||
if [ -r "/usr/share/bash-completion/bash_completion" ]; then
|
if [ -r "/usr/share/bash-completion/bash_completion" ]; then
|
||||||
@@ -159,8 +166,8 @@ preserve_xtrace_reset() {
|
|||||||
fi
|
fi
|
||||||
} 2>/dev/null
|
} 2>/dev/null
|
||||||
|
|
||||||
prompt_command_prepend preserve_xtrace
|
prompt_command_prepend "preserve_xtrace"
|
||||||
prompt_command_append preserve_xtrace_reset
|
prompt_command_append "preserve_xtrace_reset"
|
||||||
|
|
||||||
if $(which direnv &> /dev/null); then
|
if $(which direnv &> /dev/null); then
|
||||||
# Only if direnv isn't already defined in our prompt_command
|
# Only if direnv isn't already defined in our prompt_command
|
||||||
|
|||||||
@@ -74,3 +74,29 @@ prompt_command_prepend() {
|
|||||||
arg=${1}
|
arg=${1}
|
||||||
PROMPT_COMMAND="${arg}"${PROMPT_COMMAND:+"; $PROMPT_COMMAND"}
|
PROMPT_COMMAND="${arg}"${PROMPT_COMMAND:+"; $PROMPT_COMMAND"}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
blesh-activate()
|
||||||
|
{
|
||||||
|
BLESH_PATH=$HOME/.nix-profile/share/blesh/ble.sh
|
||||||
|
if [ -r $BLESH_PATH ]; then
|
||||||
|
[[ $- == *i* ]] && . $HOME/.nix-profile/share/blesh/ble.sh
|
||||||
|
[[ ! ${BLE_VERSION-} ]] || ble-attach
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
blesh-available() {
|
||||||
|
BLESH_PATH=$HOME/.nix-profile/share/blesh/ble.sh
|
||||||
|
if [ -r $BLESH_PATH ]; then
|
||||||
|
return 0
|
||||||
|
else
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
blesh-attached () {
|
||||||
|
if [ -z ${BLE_VERSION:+x} ]; then
|
||||||
|
return 1
|
||||||
|
else
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|||||||
+1
-1
Submodule vim/.vim/bundle/ale updated: c59c0d1a57...1c91102112
Submodule vim/.vim/bundle/commentary updated: 64a654ef4a...c4b8f52cbb
+1
-1
Submodule vim/.vim/bundle/eunuch updated: e86bb794a1...8fb3904be2
Submodule vim/.vim/bundle/filetype-nix updated: 7235c7ce2c...e25cd0f2e5
+1
-1
Submodule vim/.vim/bundle/fugitive updated: 3b753cf8c6...dac8e5c2d8
+1
-1
Submodule vim/.vim/bundle/sleuth updated: be69bff867...1cc4557420
+1
-1
Submodule vim/.vim/bundle/slime updated: 2cfdc3b24e...87988b173b
Submodule vim/.vim/nvim-bundle/LuaSnip updated: 8ae1dedd98...642b0c595e
Submodule vim/.vim/nvim-bundle/indent-blankline updated: 3d08501cae...d28a3f7072
Submodule vim/.vim/nvim-bundle/nvim-lspconfig updated: e25c4cdecd...f6738ef65d
Submodule vim/.vim/nvim-bundle/plenary updated: 8aad439684...74b06c6c75
Submodule vim/.vim/nvim-bundle/telescope updated: 5a701e9990...5255aa27c4
Submodule vim/.vim/nvim-bundle/zk-nvim updated: 10089c398d...bc3b39374b
Reference in New Issue
Block a user