Compare commits

..

10 Commits

4 changed files with 30 additions and 14 deletions

View File

@@ -74,7 +74,7 @@
# #
# export AQUAAI_OLLAMA_URL='192.168.1.156:11434' # export AQUAAI_OLLAMA_URL='192.168.1.156:11434'
# #
ollama_url=${AQUAAI_OLLAMA_URL:='https://ai.aquamorph.com'} ollama_url=${AQUAAI_OLLAMA_URL:='https://ai.aquamorph.com/api'}
# #
# Set the default model. # Set the default model.
# #
@@ -178,6 +178,9 @@ function set_better_conversions() {
system_prompt+=" For personal matters ${AGENT_NAME} is encouraging" system_prompt+=" For personal matters ${AGENT_NAME} is encouraging"
system_prompt+=' but brutally honest.' system_prompt+=' but brutally honest.'
system_prompt+=' Never sycophantic.' system_prompt+=' Never sycophantic.'
system_prompt+=' Do not use em dashes. If an em dash would normally appear,'
system_prompt+=' use a comma for continuing thoughts or a period if it'
system_prompt+=' should be a separate sentence.'
} }
# Set the formatting for all reponses. # Set the formatting for all reponses.
@@ -369,9 +372,9 @@ function check_requirements() {
function get_models() { function get_models() {
local model_path='' local model_path=''
if [ "${openai_api}" == true ]; then if [ "${openai_api}" == true ]; then
model_path='/api/models' model_path='/models'
else else
model_path='/api/tags' model_path='/tags'
fi fi
curl "${CURL_FLAGS[@]}" "${OLLAMA_URL}${model_path}" curl "${CURL_FLAGS[@]}" "${OLLAMA_URL}${model_path}"
} }
@@ -801,7 +804,7 @@ function chat() {
local filter='' local filter=''
if [ "${openai_api}" == true ]; then if [ "${openai_api}" == true ]; then
flags+=(-H "Content-Type: application/json") flags+=(-H "Content-Type: application/json")
chat_path='/api/chat/completions' chat_path='/chat/completions'
filter='.choices[].delta.content // empty' filter='.choices[].delta.content // empty'
else else
chat_path='/api/chat' chat_path='/api/chat'

View File

@@ -1,3 +1,3 @@
computer={{ .chezmoi.hostname }} computer={{ .chezmoi.hostname }}
activation_bytes={{ pass "self-host/token/aquaai" }} activation_bytes={{ pass "self-host/token/audible-activation-bytes" }}
AQUAAI_KEY={{ pass "self-host/token/audible-activation-bytes" }} AQUAAI_KEY={{ pass "self-host/token/aquaai" }}

View File

@@ -19,18 +19,28 @@ SAVEHIST=99999999
source "$HOME/.config/settings.conf" source "$HOME/.config/settings.conf"
# Text Editor # Text Editor
alias emacs='emacs -nw' export EDITOR='emacs -nw'
alias e='emacs -nw' alias emacs="${EDITOR}"
alias e="${EDITOR}"
export TERM=xterm
# Search # Search
alias g='grep -Irn' alias g='grep -Irn'
# Dotfiles
alias dot='cd ~/.local/share/chezmoi'
export DOT_PROGRAM='chezmoi'
alias dota="${DOT_PROGRAM} add"
alias dotd="${DOT_PROGRAM} diff"
alias dote="${DOT_PROGRAM} edit --apply"
alias dotu="${DOT_PROGRAM} update"
# Other # Other
alias i='sudo dnf install' alias i='sudo dnf install'
alias d='sudo dnf' alias d='sudo dnf'
alias u='sh ~/bin/update.sh' alias u='sh ~/bin/update.sh'
alias dot='cd ~/dotfiles'
alias h='cd ~/git/cacolglazier.com/ && hugo server' alias h='cd ~/git/cacolglazier.com/ && hugo server'
# Git # Git
alias c='git commit -m' alias c='git commit -m'
alias a='git add' alias a='git add'
@@ -51,14 +61,11 @@ alias qc="${AQUAAI_PATH} --cli"
alias qg="${AQUAAI_PATH} --git" alias qg="${AQUAAI_PATH} --git"
alias qr="${AQUAAI_PATH} --code-review" alias qr="${AQUAAI_PATH} --code-review"
alias qa="${AQUAAI_PATH} --home-assistant" alias qa="${AQUAAI_PATH} --home-assistant"
export AQUAAI_DEFAULT_MODEL='hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q4_K_M' export AQUAAI_DEFAULT_MODEL='hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q3_K_M'
export AQUAAI_CODING_MODEL='hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q4_K_M' export AQUAAI_CODING_MODEL='hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q3_K_M'
export AQUAAI_RICH_FORMAT_MODE=false export AQUAAI_RICH_FORMAT_MODE=false
export AQUAAI_KEY export AQUAAI_KEY
export TERM=xterm
export EDITOR='emacs -nw'
# Daisy build toolkit # Daisy build toolkit
GCC_PATH=~/dev/gcc-arm-none-eabi-10-2020-q4-major/bin GCC_PATH=~/dev/gcc-arm-none-eabi-10-2020-q4-major/bin
export PATH=$GCC_PATH:$PATH export PATH=$GCC_PATH:$PATH

6
requirements.txt Normal file
View File

@@ -0,0 +1,6 @@
configparser
todoist-python
tbapy
holidays
i3ipc
pyautogui