martin/dot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Martin Pander
2026-04-27 10:37:35 +02:00
parent 360789b171
commit affbd5ccca
6 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
flake.lock generated
View File

@@ -159,11 +159,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776169885, "lastModified": 1776877367,
"narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -190,11 +190,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1776434932, "lastModified": 1777077449,
"narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -206,11 +206,11 @@
}, },
"nixpkgs-wsl-stable": { "nixpkgs-wsl-stable": {
"locked": { "locked": {
"lastModified": 1776434932, "lastModified": 1777077449,
"narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -257,11 +257,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1776119890, "lastModified": 1776771786,
"narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=", "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd", "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
hosts/work/common.nix
View File

@@ -17,7 +17,7 @@
dot.llm = { dot.llm = {
enable = true; enable = true;
claude-code.enable = true; claude-code.enable = false;
opencode.enable = true; opencode.enable = true;
opencode.enableConfig = true; opencode.enableConfig = true;
opencode.workMode = true; opencode.workMode = true;

1
modules/home/dev.nix
View File

@@ -39,6 +39,7 @@ in
home.packages = with pkgs; [ home.packages = with pkgs; [
visidata visidata
codespelunker codespelunker
jq
]; ];
} }

8
modules/home/git.nix
View File

@@ -85,6 +85,14 @@
tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"]; tug = ["bookmark" "move" "--from" "heads(::@- & bookmarks())" "--to" "@-"];
lg = ["log"]; lg = ["log"];
des = ["describe"]; des = ["describe"];
sq = ["squash"];
};
ui = {
default-command = "log";
pager = "less -FRX";
diff-formatter = ":git";
merge-editor = "vimdiff";
}; };
}; };
}; };

29
modules/home/opencode.nix
View File

@@ -41,8 +41,8 @@ in
apiKey = config.sops.placeholder.langdock_api_key; apiKey = config.sops.placeholder.langdock_api_key;
}; };
models = { models = {
"gpt-5.2" = { name = "GPT-5.2"; }; "gpt-5.4" = { name = "GPT-5.4"; };
"gpt-5-mini" = { name = "GPT-5 mini"; }; "gpt-5.4-mini" = { name = "GPT-5.4 mini"; };
}; };
}; };
anthropic = { anthropic = {
@@ -51,23 +51,24 @@ in
apiKey = config.sops.placeholder.langdock_api_key; apiKey = config.sops.placeholder.langdock_api_key;
}; };
models = { models = {
"claude-opus-4-7-default" = { name = "Opus 4.7"; };
"claude-opus-4-6-default" = { name = "Opus 4.6"; }; "claude-opus-4-6-default" = { name = "Opus 4.6"; };
"claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; }; "claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; };
"claude-haiku-4-5-20251001" = { name = "Haiku 4.5"; }; "claude-haiku-4-5-20251001" = { name = "Haiku 4.5"; };
}; };
whitelist = [ "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"]; whitelist = ["claude-opus-4-7-default" "claude-opus-4-6-default" "claude-sonnet-4-6-default" "claude-haiku-4-5-20251001"];
};
ollama = {
npm = "@ai-sdk/openai-compatible";
name = "Ollama (Local)";
options = {
baseURL = "http://192.168.11.23:11434/v1";
};
models = {
"qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
"codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
};
}; };
# ollama = {
# npm = "@ai-sdk/openai-compatible";
# name = "Ollama (Local)";
# options = {
# baseURL = "http://192.168.11.23:11434/v1";
# };
# models = {
# "qwen3-coder:30b" = { name = "Qwen 3 Coder 30B"; };
# "codellama:34b-instruct" = { name = "CodeLlama 34B Instruct"; };
# };
# };
}; };
}; };

2
modules/nvim/lua/filetype.lua
View File

@@ -118,7 +118,7 @@ vim.api.nvim_create_autocmd('FileType', {
require("conform").setup({ require("conform").setup({
go = {"gofmt"}, go = {"gofmt"},
python = {"black"}, python = {"ruff"},
rust = {"rustfmt"}, rust = {"rustfmt"},
format_on_save = { format_on_save = {