-
Notifications
You must be signed in to change notification settings - Fork 0
fix: update local model to qwen/qwen3.5-9b and extract obsidian inline script #1415
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/aichat/config.yaml" = { | ||
| source = ./config.yaml; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."amp/settings.json" = { | ||
| source = ./settings.json; | ||
| }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/crush/crush.json" = { | ||
| source = ./crush.json; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/direnv/direnvrc" = { | ||
| source = ./direnvrc; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."eww/eww.yuck" = { | ||
| source = ./eww.yuck; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".factory/config.json" = { | ||
| source = ./config.json; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."gomi/config.yaml" = { | ||
| source = ./config.yaml; | ||
| }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".hammerspoon/init.lua" = { | ||
| source = ./init.lua; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| programs.hyprpanel = { | ||
| enable = true; | ||
| systemd.enable = false; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."hyprshell/config.toml" = { | ||
| source = ./config.toml; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."jj/config.toml" = { | ||
| source = ./config.toml; | ||
| }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/karabiner/karabiner.json" = { | ||
| source = ./karabiner.json; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."nwg-dock-hyprland/style.css" = { | ||
| source = ./style.css; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."nwg-drawer/drawer.css" = { | ||
| source = ./drawer.css; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/opencode/opencode.jsonc" = { | ||
| source = ./opencode.jsonc; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".pi/agent/models.json" = { | ||
| source = ./models.json; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".config/starship.toml" = { | ||
| source = ./starship.toml; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."walker/config.toml" = { | ||
| source = ./config.toml; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."worktrunk/config.toml" = { | ||
| source = ./config.toml; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| xdg.configFile."zellij/config.kdl" = { | ||
| source = ./config.kdl; | ||
| }; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| #!/usr/bin/env bash | ||
| exec @xvfbRun@/bin/xvfb-run -a @obsidian@/bin/obsidian "$@" |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| function _coxel_function --description "Run Codex with a free-form prompt using the local Gemma model" | ||
| # Run Codex with a free-form prompt (spaces allowed) using the local Gemma model | ||
| function _coxel_function --description "Run Codex with a free-form prompt using the local Qwen model" | ||
| # Run Codex with a free-form prompt (spaces allowed) using the local Qwen model | ||
| # Usage: cxel [<prompt words...>] | ||
|
|
||
| if test (count $argv) -gt 0; and contains -- "$argv[1]" --resume -r --continue -c | ||
| codex resume $argv[2] | ||
| else if test (count $argv) -eq 0 | ||
| codex --oss --local-provider lmstudio --model 'lmstudio-community/gemma-4-e4b-it' --full-auto -c model_reasoning_effort=minimal | ||
| codex --oss --local-provider lmstudio --model 'qwen/qwen3.5-9b' --full-auto -c model_reasoning_effort=minimal | ||
| else | ||
| set -l prompt (string join " " -- $argv) | ||
| codex exec --oss --local-provider lmstudio --model 'lmstudio-community/gemma-4-e4b-it' --full-auto -c model_reasoning_effort=minimal -- "$prompt" | ||
| codex exec --oss --local-provider lmstudio --model 'qwen/qwen3.5-9b' --full-auto -c model_reasoning_effort=minimal -- "$prompt" | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| function _coxel_function --description "Run Codex with a free-form prompt using the local Gemma model" | ||
| # Run Codex with a free-form prompt (spaces allowed) using the local Gemma model | ||
| function _coxel_function --description "Run Codex with a free-form prompt using the local Qwen model" | ||
| # Run Codex with a free-form prompt (spaces allowed) using the local Qwen model | ||
| # Usage: cxel [<prompt words...>] | ||
|
|
||
| if test (count $argv) -gt 0; and contains -- "$argv[1]" --resume -r --continue -c | ||
| codex resume $argv[2] | ||
| else if test (count $argv) -eq 0 | ||
| codex --oss --local-provider lmstudio --model '__GEMMA__' --full-auto -c model_reasoning_effort=minimal | ||
| codex --oss --local-provider lmstudio --model '__QWEN_LOCAL__' --full-auto -c model_reasoning_effort=minimal | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. P2: The Prompt for AI agents |
||
| else | ||
| set -l prompt (string join " " -- $argv) | ||
| codex exec --oss --local-provider lmstudio --model '__GEMMA__' --full-auto -c model_reasoning_effort=minimal -- "$prompt" | ||
| codex exec --oss --local-provider lmstudio --model '__QWEN_LOCAL__' --full-auto -c model_reasoning_effort=minimal -- "$prompt" | ||
| end | ||
|
Comment on lines
7
to
12
|
||
| end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| function _ocxel_function --description "Run OpenCode with a free-form prompt using the local Gemma model" | ||
| # Run OpenCode with a free-form prompt (spaces allowed) using the local Gemma model | ||
| function _ocxel_function --description "Run OpenCode with a free-form prompt using the local Qwen model" | ||
| # Run OpenCode with a free-form prompt (spaces allowed) using the local Qwen model | ||
| # Usage: ocxel [<prompt words...>] | ||
|
|
||
| if test (count $argv) -gt 0; and contains -- "$argv[1]" --resume -r --continue -c | ||
| if test (count $argv) -gt 1 | ||
| opencode -m 'lmstudio/lmstudio-community/gemma-4-e4b-it' --session "$argv[2]" | ||
| opencode -m 'lmstudio/qwen/qwen3.5-9b' --session "$argv[2]" | ||
| else | ||
| opencode -m 'lmstudio/lmstudio-community/gemma-4-e4b-it' --continue | ||
| opencode -m 'lmstudio/qwen/qwen3.5-9b' --continue | ||
| end | ||
| else if test (count $argv) -eq 0 | ||
| opencode -m 'lmstudio/lmstudio-community/gemma-4-e4b-it' | ||
| opencode -m 'lmstudio/qwen/qwen3.5-9b' | ||
| else | ||
| set -l prompt (string join " " -- $argv) | ||
| opencode run "$prompt" -m 'lmstudio/lmstudio-community/gemma-4-e4b-it' | ||
| opencode run "$prompt" -m 'lmstudio/qwen/qwen3.5-9b' | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| function _ocxel_function --description "Run OpenCode with a free-form prompt using the local Gemma model" | ||
| # Run OpenCode with a free-form prompt (spaces allowed) using the local Gemma model | ||
| function _ocxel_function --description "Run OpenCode with a free-form prompt using the local Qwen model" | ||
| # Run OpenCode with a free-form prompt (spaces allowed) using the local Qwen model | ||
| # Usage: ocxel [<prompt words...>] | ||
|
|
||
| if test (count $argv) -gt 0; and contains -- "$argv[1]" --resume -r --continue -c | ||
| if test (count $argv) -gt 1 | ||
| opencode -m 'lmstudio/__GEMMA__' --session "$argv[2]" | ||
| opencode -m 'lmstudio/__QWEN_LOCAL__' --session "$argv[2]" | ||
| else | ||
| opencode -m 'lmstudio/__GEMMA__' --continue | ||
| opencode -m 'lmstudio/__QWEN_LOCAL__' --continue | ||
| end | ||
| else if test (count $argv) -eq 0 | ||
| opencode -m 'lmstudio/__GEMMA__' | ||
| opencode -m 'lmstudio/__QWEN_LOCAL__' | ||
| else | ||
| set -l prompt (string join " " -- $argv) | ||
| opencode run "$prompt" -m 'lmstudio/__GEMMA__' | ||
| opencode run "$prompt" -m 'lmstudio/__QWEN_LOCAL__' | ||
| end | ||
| end |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,11 +3,11 @@ function _pixel_function --description "Run Pi with a free-form prompt using the | |
| # Usage: pixel [<prompt words...>] | ||
|
|
||
| if test (count $argv) -gt 0; and contains -- "$argv[1]" --resume -r --continue -c | ||
| pi --model 'lmstudio/qwen3.5-0.8b-optiq' --resume $argv[2] | ||
| pi --model 'lmstudio/qwen/qwen3.5-9b' --resume $argv[2] | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The pull request description states that Gemma model references are being replaced in all codex, opencode, and pi fish functions, including both |
||
| else if test (count $argv) -eq 0 | ||
| pi --model 'lmstudio/qwen3.5-0.8b-optiq' | ||
| pi --model 'lmstudio/qwen/qwen3.5-9b' | ||
| else | ||
| set -l prompt (string join " " -- $argv) | ||
| pi --model 'lmstudio/qwen3.5-0.8b-optiq' "$prompt" | ||
| pi --model 'lmstudio/qwen/qwen3.5-9b' "$prompt" | ||
| end | ||
| end | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,4 @@ | ||
| _: | ||
| { | ||
| _: { | ||
| home.file.".ssh/rc" = { | ||
| source = ./rc; | ||
| force = true; | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #!/usr/bin/env bash | ||
| # shellcheck disable=SC2329 | ||
|
|
||
| Describe 'home-manager/modules/obsidian/obsidian-headless.sh' | ||
| SCRIPT="$PWD/home-manager/modules/obsidian/obsidian-headless.sh" | ||
|
|
||
| Describe 'script properties' | ||
| It 'uses bash shebang' | ||
| When run bash -c "head -1 '$SCRIPT'" | ||
| The output should include '#!/usr/bin/env bash' | ||
| End | ||
|
|
||
| It 'passes bash syntax check after replacing placeholders' | ||
| When run bash -c "sed -e 's|@xvfbRun@|/usr|g' -e 's|@obsidian@|/usr|g' '$SCRIPT' | bash -n" | ||
| The status should be success | ||
| End | ||
| End | ||
|
|
||
| Describe 'placeholder references' | ||
| It 'references xvfb-run via placeholder' | ||
| When run bash -c "grep '@xvfbRun@' '$SCRIPT'" | ||
| The output should include '@xvfbRun@' | ||
| End | ||
|
|
||
| It 'references obsidian via placeholder' | ||
| When run bash -c "grep '@obsidian@' '$SCRIPT'" | ||
| The output should include '@obsidian@' | ||
| End | ||
|
|
||
| It 'uses exec to replace the process' | ||
| When run bash -c "grep '^exec ' '$SCRIPT'" | ||
| The output should include 'exec' | ||
| End | ||
|
|
||
| It 'passes all arguments through' | ||
| When run bash -c "grep '[\$]@' '$SCRIPT'" | ||
| The output should include '$@' | ||
| End | ||
|
|
||
| It 'uses xvfb-run with auto-servernum flag' | ||
| When run bash -c "grep '\\-a' '$SCRIPT'" | ||
| The output should include '-a' | ||
| End | ||
| End | ||
|
|
||
| End |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The template now uses the
__QWEN_LOCAL__placeholder, which likely maps to theqwen-localkey inmodels.json. However, the currentmodels.json(visible in the repository context) still definesqwen-localasqwen3.5-0.8b-optiq.To ensure that generated functions correctly use the new model and match the hardcoded
.fishfiles updated in this PR,models.jsonshould be updated to point toqwen/qwen3.5-9b.