From d0d43838bf97c117d3e4c7ecb76070dc85944262 Mon Sep 17 00:00:00 2001 From: Nicole Dresselhaus Date: Wed, 12 Nov 2025 18:35:24 +0100 Subject: [PATCH] small fixes --- .bashrc.append | 67 ++++++++++++++++++++++++++++++++++++++++---------- ask_llm.bash | 4 +-- 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/.bashrc.append b/.bashrc.append index 5dc91db..243298d 100644 --- a/.bashrc.append +++ b/.bashrc.append @@ -1,20 +1,61 @@ +SESSION_TYPE=local + +if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then + SESSION_TYPE=remote/ssh +# many other tests omitted +else + case $(ps -o comm= -p "$PPID") in + sshd | */sshd) SESSION_TYPE=remote/ssh ;; + esac +fi + +if [ "$SESSION_TYPE" != "remote/ssh" ]; then + alias vim=nvim + export EDITOR=nvim +fi + +export PATH=$PATH:$HOME/.local/bin + +[ -f "$HOME/.fzf.bash" ] && source "$HOME/.fzf.bash" + +[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env" # ghcup-env -# direnv _direnv_hook() { - local previous_exit_status=$?; - trap -- '' SIGINT; - eval "$("/usr/bin/direnv" export bash)"; - trap - SIGINT; - return $previous_exit_status; -}; -if ! [[ "${PROMPT_COMMAND:-}" =~ _direnv_hook ]]; then + local previous_exit_status=$? + trap -- '' SIGINT + eval "$("/usr/bin/direnv" export bash)" + trap - SIGINT + return $previous_exit_status +} +if ! [[ "${PROMPT_COMMAND:-}" =~ _direnv_hook ]] && [ -f "/usr/bin/direnv" ]; then PROMPT_COMMAND="_direnv_hook${PROMPT_COMMAND:+;$PROMPT_COMMAND}" fi -# starship -function set_win_title(){ - echo -ne "\033]0; $(basename "$PWD") \007" +function set_win_title() { + echo -ne "\033]0; $(basename "$PWD") \007" } -starship_precmd_user_func="set_win_title" +export starship_precmd_user_func="set_win_title" -eval "$(starship init bash)" +[ -s "$(which starship)" ] && eval "$(starship init bash)" + +export ERG_PATH="$HOME/.nix-profile/lib/erg/" + +export PYENV_ROOT="$HOME/.pyenv" +[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" +[ -s "$(which pyenv)" ] && eval "$(pyenv init -)" +[ -s "$(which pyenv)" ] && eval "$(pyenv virtualenv-init -)" + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +# Added by LM Studio CLI (lms) +export PATH="$PATH:$HOME/.lmstudio/bin" + +# pnpm +export PNPM_HOME="$HOME/.pnpm" +case ":$PATH:" in +*":$PNPM_HOME:"*) ;; +*) export PATH="$PNPM_HOME:$PATH" ;; +esac +# pnpm end diff --git a/ask_llm.bash b/ask_llm.bash index b56e1c3..978c246 100755 --- a/ask_llm.bash +++ b/ask_llm.bash @@ -101,11 +101,11 @@ msg "- prompt: ${prompt}" msg "- arguments: ${args[*]-}" if [[ -z "${image-}" ]]; then - echo '{ "model": "gemma3:12b", "prompt": "'"${prompt}"'" }' >"$payload" + echo '{ "model": "gemma3:27b", "prompt": "'"${prompt}"'" }' >"$payload" else abspath=$(get_abs_filename "${image}") imgbase64=$(base64 -w 0 "${abspath}") - echo '{ "model": "gemma3:12b", "prompt": "'"${prompt}"'", "images": ["'"${imgbase64}"'"] }' >"$payload" + echo '{ "model": "gemma3:27b", "prompt": "'"${prompt}"'", "images": ["'"${imgbase64}"'"] }' >"$payload" fi while IFS= read -r line; do