manual merge

This commit is contained in:
Andrei Stoica 2024-01-24 14:34:32 -05:00
commit 5c88830f93
4 changed files with 9 additions and 53 deletions

View File

@ -42,3 +42,4 @@ alias venv2='python2 -m venv'
alias venv3='python3 -m venv' alias venv3='python3 -m venv'
alias dotvenv='source .venv/bin/activate' alias dotvenv='source .venv/bin/activate'
alias todo='rusty-tasks' alias todo='rusty-tasks'
alias ccat='highlight -O ansi --force'

51
.bashrc
View File

@ -141,53 +141,4 @@ TERM=xterm-256color
export VISUAL=vim export VISUAL=vim
export EDITOR="$VISUAL" export EDITOR="$VISUAL"
# >>> conda initialize >>> . "$HOME/.cargo/env"
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/home/andrei/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/home/andrei/miniconda3/etc/profile.d/conda.sh" ]; then
. "/home/andrei/miniconda3/etc/profile.d/conda.sh"
else
export PATH="/home/andrei/miniconda3/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<
# JINA_CLI_BEGIN
## autocomplete
_jina() {
COMPREPLY=()
local word="${COMP_WORDS[COMP_CWORD]}"
if [ "$COMP_CWORD" -eq 1 ]; then
COMPREPLY=( $(compgen -W "$(jina commands)" -- "$word") )
else
local words=("${COMP_WORDS[@]}")
unset words[0]
unset words[$COMP_CWORD]
local completions=$(jina completions "${words[@]}")
COMPREPLY=( $(compgen -W "$completions" -- "$word") )
fi
}
complete -F _jina jina
# session-wise fix
ulimit -n 4096
export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
# default workspace for Executors
# JINA_CLI_END

View File

@ -25,6 +25,10 @@ bind b setw synchronize-panes
# setting vi mode # setting vi mode
set-window-option -g mode-keys vi set-window-option -g mode-keys vi
# reset working dir for session
unbind h
bind h attach-session -t . -c "#{pane_current_path}"
# status bar # status bar
set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y ' set -g status-right '♥#(acpi | cut -d ',' -f 2) | %H:%m %d-%b-%y '