diff --git a/aichat/.config/aichat/models-override.yaml b/aichat/.config/aichat/models-override.yaml index 5980c57..70c9d76 100644 --- a/aichat/.config/aichat/models-override.yaml +++ b/aichat/.config/aichat/models-override.yaml @@ -2,6 +2,22 @@ version: 0.30.0 list: - provider: openai models: + - name: gpt-5.1 + type: chat + max_input_tokens: 400000 + input_price: 1.25 + output_price: 10.0 + max_output_tokens: 128000 + supports_vision: true + supports_function_calling: true + - name: gpt-5.1-chat-latest + type: chat + max_input_tokens: 400000 + input_price: 1.25 + output_price: 10.0 + max_output_tokens: 128000 + supports_vision: true + supports_function_calling: true - name: gpt-5 type: chat max_input_tokens: 400000 @@ -34,14 +50,6 @@ list: max_output_tokens: 128000 supports_vision: true supports_function_calling: true - - name: gpt-5-codex - type: chat - max_input_tokens: 400000 - input_price: 1.25 - output_price: 10.0 - max_output_tokens: 128000 - supports_vision: true - supports_function_calling: true - name: gpt-4.1 type: chat max_input_tokens: 1047576 @@ -275,6 +283,32 @@ list: require_max_tokens: true supports_vision: true supports_function_calling: true + - name: claude-haiku-4-5-20251001 + type: chat + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + max_output_tokens: 8192 + require_max_tokens: true + supports_vision: true + supports_function_calling: true + - name: claude-haiku-4-5-20251001:thinking + type: chat + real_name: claude-haiku-4-5-20251001 + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + patch: + body: + temperature: null + top_p: null + thinking: + type: enabled + budget_tokens: 16000 + max_output_tokens: 24000 + require_max_tokens: true + supports_vision: true + supports_function_calling: true - name: claude-opus-4-1-20250805 type: chat max_input_tokens: 200000 @@ -693,6 +727,31 @@ list: max_output_tokens: 24000 require_max_tokens: true supports_vision: true + - name: claude-haiku-4-5@20251001 + type: chat + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + max_output_tokens: 8192 + require_max_tokens: true + supports_vision: true + supports_function_calling: true + - name: claude-haiku-4-5@20251001:thinking + type: chat + real_name: claude-haiku-4-5@20251001 + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + patch: + body: + temperature: null + top_p: null + thinking: + type: enabled + budget_tokens: 16000 + max_output_tokens: 24000 + require_max_tokens: true + supports_vision: true - name: claude-opus-4-1@20250805 type: chat max_input_tokens: 200000 @@ -857,6 +916,33 @@ list: max_output_tokens: 24000 require_max_tokens: true supports_vision: true + - name: us.anthropic.claude-haiku-4-5-20251001-v1:0 + type: chat + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + max_output_tokens: 8192 + require_max_tokens: true + supports_vision: true + supports_function_calling: true + - name: us.anthropic.claude-haiku-4-5-20251001-v1:0:thinking + type: chat + real_name: us.anthropic.claude-haiku-4-5-20251001-v1:0 + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + patch: + body: + inferenceConfig: + temperature: null + topP: null + additionalModelRequestFields: + thinking: + type: enabled + budget_tokens: 16000 + max_output_tokens: 24000 + require_max_tokens: true + supports_vision: true - name: us.anthropic.claude-opus-4-1-20250805-v1:0 type: chat max_input_tokens: 200000 @@ -1059,6 +1145,13 @@ list: output_price: 0.0 max_output_tokens: 2048 require_max_tokens: true + - name: '@cf/qwen/qwen3-30b-a3b-fp8' + type: chat + max_input_tokens: 131072 + input_price: 0.0 + output_price: 0.0 + max_output_tokens: 2048 + require_max_tokens: true - name: '@cf/qwen/qwen2.5-coder-32b-instruct' type: chat max_input_tokens: 131072 @@ -1099,9 +1192,14 @@ list: input_price: 0.42 output_price: 1.26 supports_vision: true - - name: ernie-x1-turbo-32k + - name: ernie-5.0-thinking-preview type: chat - max_input_tokens: 32768 + max_input_tokens: 131072 + input_price: 1.4 + output_price: 5.6 + - name: ernie-x1.1-preview + type: chat + max_input_tokens: 65536 input_price: 0.14 output_price: 0.56 - name: bge-large-zh @@ -1122,82 +1220,32 @@ list: input_price: 0.07 - provider: qianwen models: - - name: qwen-max-latest - type: chat - max_input_tokens: 32678 - input_price: 1.6 - output_price: 6.4 - max_output_tokens: 8192 - supports_function_calling: true - - name: qwen-plus-latest - type: chat - max_input_tokens: 131072 - input_price: 0.112 - output_price: 0.28 - max_output_tokens: 8192 - supports_function_calling: true - - name: qwen-turbo-latest - type: chat - max_input_tokens: 1000000 - input_price: 0.042 - output_price: 0.084 - max_output_tokens: 8192 - supports_function_calling: true - - name: qwen-long - type: chat - max_input_tokens: 1000000 - input_price: 0.07 - output_price: 0.28 - - name: qwen-omni-turbo-latest - type: chat - max_input_tokens: 32768 - max_output_tokens: 2048 - supports_vision: true - - name: qwen-coder-plus-latest - type: chat - max_input_tokens: 131072 - input_price: 0.49 - output_price: 0.98 - max_output_tokens: 8192 - - name: qwen-coder-turbo-latest - type: chat - max_input_tokens: 131072 - input_price: 0.28 - output_price: 0.84 - max_output_tokens: 8192 - - name: qwen-vl-max-latest - type: chat - max_input_tokens: 30720 - input_price: 0.42 - output_price: 1.26 - max_output_tokens: 2048 - supports_vision: true - - name: qwen-vl-plus-latest - type: chat - max_input_tokens: 30000 - input_price: 0.21 - output_price: 0.63 - max_output_tokens: 2048 - supports_vision: true - name: qwen3-max type: chat max_input_tokens: 262144 - input_price: 2.1 - output_price: 8.4 + supports_function_calling: true + - name: qwen-plus + type: chat + max_input_tokens: 131072 + supports_function_calling: true + - name: qwen-flash + type: chat + max_input_tokens: 1000000 supports_function_calling: true - name: qwen3-vl-plus type: chat max_input_tokens: 262144 - input_price: 0.42 - output_price: 4.2 supports_vision: true - - name: qwen3-max-preview + - name: qwen3-vl-flash type: chat max_input_tokens: 262144 - input_price: 1.4 - output_price: 5.6 - max_output_tokens: 32768 - supports_function_calling: true + supports_vision: true + - name: qwen-coder-plus + type: chat + max_input_tokens: 1000000 + - name: qwen-coder-flash + type: chat + max_input_tokens: 1000000 - name: qwen3-next-80b-a3b-instruct type: chat max_input_tokens: 131072 @@ -1231,6 +1279,18 @@ list: max_input_tokens: 131072 input_price: 0.105 output_price: 1.05 + - name: qwen3-vl-32b-instruct + type: chat + max_input_tokens: 131072 + input_price: 0.28 + output_price: 1.12 + supports_vision: true + - name: qwen3-vl-8b-instruct + type: chat + max_input_tokens: 131072 + input_price: 0.07 + output_price: 0.28 + supports_vision: true - name: qwen3-coder-480b-a35b-instruct type: chat max_input_tokens: 262144 @@ -1241,37 +1301,11 @@ list: max_input_tokens: 262144 input_price: 0.315 output_price: 1.26 - - name: qwen2.5-72b-instruct - type: chat - max_input_tokens: 129024 - input_price: 0.56 - output_price: 1.68 - max_output_tokens: 8192 - supports_function_calling: true - - name: qwen2.5-vl-72b-instruct - type: chat - max_input_tokens: 129024 - input_price: 2.24 - output_price: 6.72 - max_output_tokens: 8192 - supports_vision: true - - name: qwen2.5-coder-32b-instruct - type: chat - max_input_tokens: 129024 - input_price: 0.49 - output_price: 0.98 - max_output_tokens: 8192 - supports_function_calling: true - - name: deepseek-v3.1 + - name: deepseek-v3.2-exp type: chat max_input_tokens: 131072 input_price: 0.28 - output_price: 1.12 - - name: deepseek-r1-0528 - type: chat - max_input_tokens: 65536 - input_price: 0.28 - output_price: 1.12 + output_price: 0.42 - name: text-embedding-v4 type: embedding input_price: 0.1 @@ -1321,11 +1355,11 @@ list: max_batch_size: 100 - provider: moonshot models: - - name: kimi-latest + - name: kimi-k2-turbo-preview type: chat - max_input_tokens: 131072 - input_price: 1.4 - output_price: 4.2 + max_input_tokens: 262144 + input_price: 1.12 + output_price: 8.12 supports_vision: true supports_function_calling: true - name: kimi-k2-0905-preview @@ -1335,18 +1369,17 @@ list: output_price: 2.24 supports_vision: true supports_function_calling: true - - name: kimi-k2-turbo-preview + - name: kimi-k2-thinking-turbo type: chat - max_input_tokens: 131072 + max_input_tokens: 262144 input_price: 1.12 - output_price: 4.48 + output_price: 8.12 supports_vision: true - supports_function_calling: true - - name: kimi-thinking-preview + - name: kimi-k2-thinking type: chat - max_input_tokens: 131072 - input_price: 28.0 - output_price: 28.0 + max_input_tokens: 262144 + input_price: 0.56 + output_price: 2.24 supports_vision: true - provider: deepseek models: @@ -1365,7 +1398,7 @@ list: max_output_tokens: 32768 - provider: zhipuai models: - - name: glm-4.5 + - name: glm-4.6 type: chat max_input_tokens: 202752 input_price: 0.28 @@ -1436,19 +1469,30 @@ list: input_price: 0.112 - provider: minimax models: - - name: minimax-text-01 + - name: minimax-m2 type: chat - max_input_tokens: 1000192 - input_price: 0.14 - output_price: 1.12 - supports_vision: true - - name: minimax-m1 - type: chat - max_input_tokens: 131072 - input_price: 0.112 - output_price: 1.12 + max_input_tokens: 204800 + input_price: 0.294 + output_price: 1.176 + supports_function_calling: true - provider: openrouter models: + - name: openai/gpt-5.1 + type: chat + max_input_tokens: 400000 + input_price: 1.25 + output_price: 10.0 + max_output_tokens: 128000 + supports_vision: true + supports_function_calling: true + - name: openai/gpt-5.1-chat + type: chat + max_input_tokens: 400000 + input_price: 1.25 + output_price: 10.0 + max_output_tokens: 128000 + supports_vision: true + supports_function_calling: true - name: openai/gpt-5 type: chat max_input_tokens: 400000 @@ -1481,14 +1525,6 @@ list: max_output_tokens: 128000 supports_vision: true supports_function_calling: true - - name: openai/gpt-5-codex - type: chat - max_input_tokens: 400000 - input_price: 1.25 - output_price: 10.0 - max_output_tokens: 128000 - supports_vision: true - supports_function_calling: true - name: openai/gpt-4.1 type: chat max_input_tokens: 1047576 @@ -1665,6 +1701,15 @@ list: require_max_tokens: true supports_vision: true supports_function_calling: true + - name: anthropic/claude-haiku-4.5 + type: chat + max_input_tokens: 200000 + input_price: 1.0 + output_price: 5.0 + max_output_tokens: 8192 + require_max_tokens: true + supports_vision: true + supports_function_calling: true - name: anthropic/claude-opus-4.1 type: chat max_input_tokens: 200000 @@ -1822,12 +1867,11 @@ list: patch: body: include_reasoning: true - - name: qwen/qwen-max + - name: qwen/qwen3-max type: chat - max_input_tokens: 32768 - input_price: 1.6 - output_price: 6.4 - max_output_tokens: 8192 + max_input_tokens: 262144 + input_price: 1.2 + output_price: 6.0 supports_function_calling: true - name: qwen/qwen-plus type: chat @@ -1836,25 +1880,6 @@ list: output_price: 1.2 max_output_tokens: 8192 supports_function_calling: true - - name: qwen/qwen-turbo - type: chat - max_input_tokens: 1000000 - input_price: 0.05 - output_price: 0.2 - max_output_tokens: 8192 - supports_function_calling: true - - name: qwen/qwen-vl-plus - type: chat - max_input_tokens: 7500 - input_price: 0.21 - output_price: 0.63 - supports_vision: true - - name: qwen/qwen3-max - type: chat - max_input_tokens: 262144 - input_price: 1.2 - output_price: 6.0 - supports_function_calling: true - name: qwen/qwen3-next-80b-a3b-instruct type: chat max_input_tokens: 262144 @@ -1866,7 +1891,7 @@ list: max_input_tokens: 262144 input_price: 0.1 output_price: 0.8 - - name: qwen/qwen3-235b-a22b-2507 + - name: qwen/qwen5-235b-a22b-2507 type: chat max_input_tokens: 262144 input_price: 0.12 @@ -1887,6 +1912,18 @@ list: max_input_tokens: 262144 input_price: 0.071 output_price: 0.285 + - name: qwen/qwen3-vl-32b-instruct + type: chat + max_input_tokens: 262144 + input_price: 0.35 + output_price: 1.1 + supports_vision: true + - name: qwen/qwen3-vl-8b-instruct + type: chat + max_input_tokens: 262144 + input_price: 0.08 + output_price: 0.5 + supports_vision: true - name: qwen/qwen3-coder-plus type: chat max_input_tokens: 128000 @@ -1899,35 +1936,30 @@ list: input_price: 0.3 output_price: 1.5 supports_function_calling: true + - name: qwen/qwen3-coder + type: chat + max_input_tokens: 262144 + input_price: 0.22 + output_price: 0.95 + supports_function_calling: true - name: qwen/qwen3-coder-30b-a3b-instruct type: chat max_input_tokens: 262144 input_price: 0.052 output_price: 0.207 supports_function_calling: true - - name: qwen/qwen-2.5-72b-instruct - type: chat - max_input_tokens: 131072 - input_price: 0.35 - output_price: 0.4 - supports_function_calling: true - - name: qwen/qwen2.5-vl-72b-instruct - type: chat - max_input_tokens: 32000 - input_price: 0.7 - output_price: 0.7 - supports_vision: true - - name: qwen/qwen-2.5-coder-32b-instruct - type: chat - max_input_tokens: 32768 - input_price: 0.18 - output_price: 0.18 - name: moonshotai/kimi-k2-0905 type: chat max_input_tokens: 262144 input_price: 0.296 output_price: 1.185 supports_function_calling: true + - name: moonshotai/kimi-k2-thinking + type: chat + max_input_tokens: 262144 + input_price: 0.45 + output_price: 2.35 + supports_function_calling: true - name: moonshotai/kimi-dev-72b type: chat max_input_tokens: 131072 @@ -1952,6 +1984,12 @@ list: input_price: 0.2 output_price: 1.5 supports_function_calling: true + - name: amazon/nova-premier-v1 + type: chat + max_input_tokens: 1000000 + input_price: 2.5 + output_price: 12.5 + supports_vision: true - name: amazon/nova-pro-v1 type: chat max_input_tokens: 300000 @@ -2006,34 +2044,17 @@ list: patch: body: include_reasoning: true - - name: minimax/minimax-01 + - name: minimax/minimax-m2 type: chat - max_input_tokens: 1000192 - input_price: 0.2 - output_price: 1.1 + max_input_tokens: 196608 + input_price: 0.15 + output_price: 0.45 - name: z-ai/glm-4.6 type: chat max_input_tokens: 202752 input_price: 0.5 output_price: 1.75 supports_function_calling: true - - name: z-ai/glm-4.5 - type: chat - max_input_tokens: 131072 - input_price: 0.2 - output_price: 0.2 - supports_function_calling: true - - name: z-ai/glm-4.5-air - type: chat - max_input_tokens: 131072 - input_price: 0.2 - output_price: 1.1 - - name: z-ai/glm-4.5v - type: chat - max_input_tokens: 65536 - input_price: 0.5 - output_price: 1.7 - supports_vision: true - provider: github models: - name: gpt-5 @@ -2256,11 +2277,6 @@ list: input_price: 0.08 output_price: 0.3 supports_vision: true - - name: meta-llama/Llama-3.3-70B-Instruct - type: chat - max_input_tokens: 131072 - input_price: 0.23 - output_price: 0.4 - name: Qwen/Qwen3-Next-80B-A3B-Instruct type: chat max_input_tokens: 262144 @@ -2295,32 +2311,17 @@ list: input_price: 0.07 output_price: 0.27 supports_function_calling: true - - name: Qwen/Qwen3-235B-A22B - type: chat - max_input_tokens: 40960 - input_price: 0.15 - output_price: 0.6 - name: Qwen/Qwen3-30B-A3B type: chat max_input_tokens: 40960 input_price: 0.1 output_price: 0.3 - - name: Qwen/Qwen3-32B + - name: Qwen/Qwen3-VL-8B-Instruct type: chat - max_input_tokens: 40960 - input_price: 0.1 - output_price: 0.3 - - name: Qwen/Qwen2.5-72B-Instruct - type: chat - max_input_tokens: 32768 - input_price: 0.23 - output_price: 0.4 - supports_function_calling: true - - name: Qwen/Qwen2.5-Coder-32B-Instruct - type: chat - max_input_tokens: 32768 - input_price: 0.07 - output_price: 0.16 + max_input_tokens: 262144 + input_price: 0.18 + output_price: 0.69 + supports_vision: true - name: deepseek-ai/DeepSeek-V3.2-Exp type: chat max_input_tokens: 163840 @@ -2351,41 +2352,24 @@ list: max_input_tokens: 32768 input_price: 0.06 output_price: 0.12 - - name: mistralai/Devstral-Small-2507 - type: chat - max_input_tokens: 131072 - input_price: 0.07 - output_price: 0.28 - name: moonshotai/Kimi-K2-Instruct-0905 type: chat max_input_tokens: 262144 input_price: 0.5 output_price: 2.0 supports_function_calling: true + - name: moonshotai/Kimi-K2-Thinking + type: chat + max_input_tokens: 262144 + input_price: 0.55 + output_price: 2.5 + supports_function_calling: true - name: zai-org/GLM-4.6 type: chat max_input_tokens: 202752 input_price: 0.6 output_price: 1.9 supports_function_calling: true - - name: zai-org/GLM-4.5 - type: chat - max_input_tokens: 131072 - input_price: 0.55 - output_price: 2.0 - supports_function_calling: true - - name: zai-org/GLM-4.5-Air - type: chat - max_input_tokens: 131072 - input_price: 0.2 - output_price: 1.1 - supports_function_calling: true - - name: zai-org/GLM-4.5V - type: chat - max_input_tokens: 65536 - input_price: 0.5 - output_price: 1.7 - supports_vision: true - name: BAAI/bge-large-en-v1.5 type: embedding input_price: 0.01 diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index f048583..d4815f4 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -6,10 +6,9 @@ set autoindent set backspace=indent,eol,start -set t_Co=16 - -"set background=dark +set background=dark colorscheme theunixzoo +"colorscheme solarized8 "source /home/jswank/.config/nvim/colors-now diff --git a/ssh/.ssh/known_hosts b/ssh/.ssh/known_hosts deleted file mode 100644 index 330020e..0000000 --- a/ssh/.ssh/known_hosts +++ /dev/null @@ -1,3 +0,0 @@ -192.168.101.110 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJb5kemGOPwXoNr09PqIEZbHjZprJUrEtHOKk4jvxAlH -192.168.101.110 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3MkIlJXiY/CF1Q9l+C1b5jKj05cIzr7AMTHXLnkvrGZD/n2XwkYKTVIwgiGm4de2MKs1tcFJU4l5y6ARWu2Iit7UHC7Zk9aAydg59przJV/aj9pkLfOYKvWu6f7VGWEMTzy+FZ+7C+ulzIhhV6fN6sDO6Ywa5Pkl/LyXlSWHlfWO7xVYFQwRaACdhdnjl+tygXWISHErtCUXX8qR+c7+yyb/tNKF67yhDX+U55PkMDoHqtQDVAYotUukvHZ4SbE//rTt/xRQAb/GnRV2f4p+Zl65UGBNr7Wh8oRWAdRx/CjU8ujgEZgs99lKLkAUdNz/52eAvoIxccoOdIkbk0snv -192.168.101.110 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHZCtwh3lEIVtg/rm4p2Lws2zjXbvB8K8hk4ymagckaRdYq/16TqB8A2ki28fkGh7+DmitaCEC+iW/4lcQtEvsQ= diff --git a/ssh/.ssh/known_hosts.old b/ssh/.ssh/known_hosts.old deleted file mode 100644 index d322cc9..0000000 --- a/ssh/.ssh/known_hosts.old +++ /dev/null @@ -1 +0,0 @@ -192.168.101.110 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJb5kemGOPwXoNr09PqIEZbHjZprJUrEtHOKk4jvxAlH diff --git a/zsh/.zshenv b/zsh/.zshenv index cb9706b..17c85ae 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -22,3 +22,6 @@ export TMPDIR=/var/tmp export BROWSER=open_browser.sh export TF_PLUGIN_CACHE_DIR=~/cfa-work/.tf_cache + +# With ghostty + tmux + nvim, having this autoset to 'truecolor' has a weird effect +unset COLORTERM