Compare commits
2 Commits
e8fca12861
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 428c22c74d | |||
| efa9a422ad |
+9
-16
@@ -36,11 +36,6 @@ 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
|
||||||
@@ -95,7 +90,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
|
||||||
@@ -105,14 +100,11 @@ export PS4="${blue}#${no_color} "
|
|||||||
|
|
||||||
#{- HISTORY -}#
|
#{- HISTORY -}#
|
||||||
|
|
||||||
if blesh-attached; then
|
prompt_command_prepend "history -r"
|
||||||
bleopt history_share=1
|
prompt_command_prepend "history -c"
|
||||||
else
|
prompt_command_prepend "history -w"
|
||||||
prompt_command_prepend "history -r"
|
prompt_command_prepend "history -n"
|
||||||
prompt_command_prepend "history -c"
|
# 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 -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"
|
||||||
@@ -141,6 +133,7 @@ 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
|
||||||
@@ -166,8 +159,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,29 +74,3 @@ 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: 6db58b3379...c59c0d1a57
Submodule vim/.vim/bundle/commentary updated: c4b8f52cbb...64a654ef4a
+1
-1
Submodule vim/.vim/bundle/eunuch updated: 8fb3904be2...e86bb794a1
Submodule vim/.vim/bundle/filetype-nix updated: e25cd0f2e5...7235c7ce2c
+1
-1
Submodule vim/.vim/bundle/fugitive updated: dac8e5c2d8...3b753cf8c6
+1
-1
Submodule vim/.vim/bundle/sleuth updated: 1cc4557420...be69bff867
+1
-1
Submodule vim/.vim/bundle/slime updated: 87988b173b...2cfdc3b24e
+1
-1
Submodule vim/.vim/bundle/vim-helm updated: ae1ebc160d...2c8525fd98
Reference in New Issue
Block a user