This commit is contained in:
2026-09-22 16:33:38 +01:00
parent 00a8d97482
commit ad724c179a
3 changed files with 70 additions and 67 deletions
+2 -2
View File
@@ -42,8 +42,8 @@
# modules.easyeffects # modules.easyeffects
# modules.lavd # modules.lavd
<modules/ai/secrets> <modules/ai/secrets>
# modules.ai modules.ai
modules.pi-coding # inactive: swapped to opencode # modules.pi-coding # inactive: swapped to opencode
# modules.omp # modules.omp
modules.podman modules.podman
modules.wivrn modules.wivrn
+1 -1
View File
@@ -17,7 +17,7 @@
]; ];
settings = { settings = {
"defaultProvider" = "opencode-go"; "defaultProvider" = "opencode-go";
"defaultModel" = "mimo-v2.5"; "defaultModel" = "mimo-v2.6-flash";
"defaultThinkingLevel" = "medium"; "defaultThinkingLevel" = "medium";
"litellm" = { "litellm" = {
"providers" = { "providers" = {
+67 -64
View File
@@ -29,31 +29,31 @@
rev = "0d040ed81f7953118b81cd12681fcdfcac069803"; rev = "0d040ed81f7953118b81cd12681fcdfcac069803";
hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA"; hash = "sha256-UF9zeO5Uujdt2MEwy2d2Lhk6JRnEN4vrEvYslv0/zaA";
}; };
nvimSkipModules = [ "tiny-code-action.previewers.snacks" ]; nvimSkipModules = [ "tiny-code-action.previewers.snacks" ];
}; };
cmp-lsp-rs = pkgs.vimUtils.buildVimPlugin { cmp-lsp-rs = pkgs.vimUtils.buildVimPlugin {
name = "nvim-cmp-lsp-rs"; name = "nvim-cmp-lsp-rs";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "zjp-CN"; owner = "zjp-CN";
repo = "nvim-cmp-lsp-rs"; repo = "nvim-cmp-lsp-rs";
rev = "329075b806deb719d3ce4f55a7e443541ce5289d"; rev = "329075b806deb719d3ce4f55a7e443541ce5289d";
hash = "sha256-rBABhsShCrx7Gofm1mC6DQAL0KeNtQidW9eMr9kfwGI="; hash = "sha256-rBABhsShCrx7Gofm1mC6DQAL0KeNtQidW9eMr9kfwGI=";
}; };
# nvim-cmp on rtp during the require check (cmp_lsp_rs requires cmp.types.lsp at load time) # nvim-cmp on rtp during the require check (cmp_lsp_rs requires cmp.types.lsp at load time)
dependencies = [ pkgs.vimPlugins.nvim-cmp ]; dependencies = [ pkgs.vimPlugins.nvim-cmp ];
}; };
treesitter-rhai-grammar = pkgs.tree-sitter.buildGrammar { treesitter-rhai-grammar = pkgs.tree-sitter.buildGrammar {
language = "rhai"; language = "rhai";
version = "0.0.0+rev=4ac7384"; version = "0.0.0+rev=4ac7384";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "elkowar"; owner = "elkowar";
repo = "tree-sitter-rhai"; repo = "tree-sitter-rhai";
rev = "4ac7384d487ffcb54e746ef1569585a749370c5b"; rev = "4ac7384d487ffcb54e746ef1569585a749370c5b";
hash = "sha256-XGGcEGHke/O00STKqwSk9jGj91Xm2LE2KxwwX5+bBg0="; hash = "sha256-XGGcEGHke/O00STKqwSk9jGj91Xm2LE2KxwwX5+bBg0=";
}; };
meta.homepage = "https://github.com/elkowar/tree-sitter-rhai"; meta.homepage = "https://github.com/elkowar/tree-sitter-rhai";
}; };
in in
{ {
imports = [ imports = [
inputs.nixvim.homeModules.nixvim inputs.nixvim.homeModules.nixvim
@@ -142,14 +142,14 @@
}; };
}; };
}; };
lsp = { lsp = {
enable = true; enable = true;
onAttach = '' onAttach = ''
if client.name == "rust-analyzer" then if client.name == "rust-analyzer" then
client.server_capabilities.semanticTokensProvider = nil client.server_capabilities.semanticTokensProvider = nil
end end
''; '';
servers = { servers = {
# qmlls = { # qmlls = {
# enable = true; # enable = true;
# config = { # config = {
@@ -179,6 +179,7 @@
enable = true; enable = true;
package = pkgs.vscode-langservers-extracted; package = pkgs.vscode-langservers-extracted;
}; };
lua_ls.enable = true;
svelte.enable = true; svelte.enable = true;
}; };
}; };
@@ -282,16 +283,16 @@
"<Tab>" = "<Tab>" =
"cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif require('luasnip').expand_or_jumpable() then require('luasnip').expand_or_jump() else fallback() end end, {'i', 's'})"; "cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() elseif require('luasnip').expand_or_jumpable() then require('luasnip').expand_or_jump() else fallback() end end, {'i', 's'})";
}; };
sorting = { sorting = {
comparators = [ comparators = [
"require('cmp.config.compare').exact" "require('cmp.config.compare').exact"
"require('cmp.config.compare').score" "require('cmp.config.compare').score"
"require('cmp_lsp_rs').comparators.inscope_inherent_import" "require('cmp_lsp_rs').comparators.inscope_inherent_import"
"require('cmp_lsp_rs').comparators.sort_by_label_but_underscore_last" "require('cmp_lsp_rs').comparators.sort_by_label_but_underscore_last"
]; ];
}; };
window = { window = {
completion = { completion = {
border = "rounded"; border = "rounded";
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None"; winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None";
}; };
@@ -309,27 +310,29 @@
wakatime.enable = true; wakatime.enable = true;
treesitter = { treesitter = {
enable = true; enable = true;
grammarPackages = (with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [ grammarPackages =
bash (with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
css bash
html css
javascript html
json javascript
lua json
make lua
markdown make
rust markdown
nix rust
regex nix
toml regex
tsx toml
typescript tsx
vim typescript
vimdoc vim
xml vimdoc
yaml xml
svelte yaml
]) ++ [ treesitter-rhai-grammar ]; svelte
])
++ [ treesitter-rhai-grammar ];
settings = { settings = {
highlight.enable = true; highlight.enable = true;
indent.enable = false; indent.enable = false;