chore: remaining cleanup changes

This commit is contained in:
2026-04-16 08:20:00 +02:00
parent 853c644446
commit 8feaaa2845
11 changed files with 25 additions and 25 deletions

View File

@@ -1,3 +1,3 @@
{ {
"timestamp": "2026-04-15T09:30:34.459Z" "timestamp": "2026-04-16T05:17:32.737Z"
} }

View File

@@ -1,3 +1,3 @@
{ {
"timestamp": "2026-04-15T09:30:35.667Z" "timestamp": "2026-04-16T05:17:34.002Z"
} }

View File

@@ -1,3 +1,3 @@
{ {
"timestamp": "2026-04-15T09:28:51.987Z" "timestamp": "2026-04-16T05:07:03.715Z"
} }

View File

@@ -1,3 +1,3 @@
{ {
"timestamp": "2026-04-15T09:28:16.965Z" "timestamp": "2026-04-16T05:05:46.953Z"
} }

View File

@@ -0,0 +1,6 @@
{
"nixd": {
"choice": "no",
"timestamp": 1776314948230
}
}

View File

@@ -2,5 +2,5 @@
"files": {}, "files": {},
"turnCycles": 0, "turnCycles": 0,
"maxCycles": 3, "maxCycles": 3,
"lastUpdated": "2026-04-15T09:30:35.668Z" "lastUpdated": "2026-04-16T05:17:34.002Z"
} }

View File

@@ -76,7 +76,10 @@ in {
mcpServers = mkOption { mcpServers = mkOption {
type = types.attrsOf types.anything; type = types.attrsOf types.anything;
default = if mcpCfg != null then mcpCfg.servers else {}; default =
if mcpCfg != null
then mcpCfg.servers
else {};
defaultText = literalExpression "config.programs.mcp.servers"; defaultText = literalExpression "config.programs.mcp.servers";
description = '' description = ''
MCP server configurations for Claude Code. MCP server configurations for Claude Code.

View File

@@ -1,7 +1,6 @@
{inputs, ...}: { {inputs, ...}: {
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: prev: additions = final: prev: (import ../pkgs {pkgs = final;});
(import ../pkgs {pkgs = final;});
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# You can change versions, add patches, set compilation flags, anything really. # You can change versions, add patches, set compilation flags, anything really.

View File

@@ -31,7 +31,7 @@
# Upstream is missing outputHashes for git dependencies # Upstream is missing outputHashes for git dependencies
# Also fix stale npm deps hash in upstream node_modules FOD # Also fix stale npm deps hash in upstream node_modules FOD
fixedNodeModules = opencode.node_modules.overrideAttrs { fixedNodeModules = opencode.node_modules.overrideAttrs {
outputHash = "sha256-LRhPPrOKCGUSCEWTpAxPdWKTKVNkg82WrvD25cP3jts="; outputHash = "sha256-285KZ7rZLRoc6XqCZRHc25NE+mmpGh/BVeMpv8aPQtQ=";
}; };
opencode-desktop = rustPlatform.buildRustPackage (finalAttrs: { opencode-desktop = rustPlatform.buildRustPackage (finalAttrs: {

View File

@@ -12,17 +12,14 @@ let
} }
); );
in in
assert result.success == false; assert result.success == false; {result = "pass";};
{result = "pass";};
# Test 2: loadCanonical extracts loadAgents from input # Test 2: loadCanonical extracts loadAgents from input
testLoadCanonical = let testLoadCanonical = let
fakeInput = {lib.loadAgents = {test = {description = "test";};};}; fakeInput = {lib.loadAgents = {test = {description = "test";};};};
result = agentsLib.loadCanonical {agentsInput = fakeInput;}; result = agentsLib.loadCanonical {agentsInput = fakeInput;};
in in
assert result == {test = {description = "test";};}; assert result == {test = {description = "test";};}; {result = "pass";};
{result = "pass";};
in { in {
unknown-tool-throws = testUnknownTool; unknown-tool-throws = testUnknownTool;
load-canonical = testLoadCanonical; load-canonical = testLoadCanonical;

View File

@@ -11,11 +11,11 @@ let
rulesDir = ".coding-rules"; rulesDir = ".coding-rules";
}; };
in in
assert rules.instructions == [ assert rules.instructions
== [
".coding-rules/concerns/naming.md" ".coding-rules/concerns/naming.md"
".coding-rules/languages/python.md" ".coding-rules/languages/python.md"
]; ]; {result = "pass";};
{result = "pass";};
# Test 2: default rulesDir is .opencode-rules # Test 2: default rulesDir is .opencode-rules
testDefaultRulesDir = let testDefaultRulesDir = let
@@ -24,13 +24,10 @@ let
}; };
hasCorrectPrefix = builtins.all (s: builtins.substring 0 15 s == ".opencode-rules") rules.instructions; hasCorrectPrefix = builtins.all (s: builtins.substring 0 15 s == ".opencode-rules") rules.instructions;
in in
assert hasCorrectPrefix == true; assert hasCorrectPrefix == true; {result = "pass";};
{result = "pass";};
# Test 3: backward-compat alias exists # Test 3: backward-compat alias exists
testBackwardCompat = testBackwardCompat = assert codingRulesLib.mkOpencodeRules == codingRulesLib.mkCodingRules; {result = "pass";};
assert codingRulesLib.mkOpencodeRules == codingRulesLib.mkCodingRules;
{result = "pass";};
# Test 4: shellHook contains both the symlink command and the config generation # Test 4: shellHook contains both the symlink command and the config generation
testShellHook = let testShellHook = let
@@ -42,9 +39,7 @@ let
hasConfigGen = builtins.match ".*coding-rules.json.*" hook != null; hasConfigGen = builtins.match ".*coding-rules.json.*" hook != null;
in in
assert hasSymlink; assert hasSymlink;
assert hasConfigGen; assert hasConfigGen; {result = "pass";};
{result = "pass";};
in { in {
instructions-correct = testInstructions; instructions-correct = testInstructions;
default-rules-dir = testDefaultRulesDir; default-rules-dir = testDefaultRulesDir;