From eef3a2a4d5cbed54f238e5256276f5beb854070f Mon Sep 17 00:00:00 2001 From: dawn <90008@klbr.net> Date: Tue, 28 Jul 2026 18:23:24 +0300 Subject: [PATCH] awa --- _sources/generated.json | 6 ++-- _sources/generated.nix | 6 ++-- deploy.nu | 2 +- pkgs-set/pkgs/cliproxy-gemini-3.6-flash.patch | 30 +++++++++++++++++++ pkgs-set/pkgs/cliproxyapi.nix | 6 ++-- pkgs-set/pkgs/tangled-knot-migrate.nix | 6 ++++ pkgs-set/pkgs/tangled-knot-rs.nix | 6 ++++ 7 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 pkgs-set/pkgs/cliproxy-gemini-3.6-flash.patch create mode 100644 pkgs-set/pkgs/tangled-knot-migrate.nix create mode 100644 pkgs-set/pkgs/tangled-knot-rs.nix diff --git a/_sources/generated.json b/_sources/generated.json index 6f60e72..ab2133c 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -480,13 +480,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "b9500f271a335e2af2a88fa27b569315bd8bee0c", - "sha256": "sha256-P9axLdVOmQGAfpB+hj26Uh+Gi3vITd8/v2HZyZH5aro=", + "rev": "e23d5abed070ed0923b961a8cbe750b28220209d", + "sha256": "sha256-1zEIzYQHj/YKkiyW3tiUECs8dETPoFIyQTcWadlZwWM=", "sparseCheckout": [], "type": "git", "url": "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is" }, - "version": "b9500f271a335e2af2a88fa27b569315bd8bee0c" + "version": "e23d5abed070ed0923b961a8cbe750b28220209d" }, "tangled-sqlite-lib": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index d795e2d..4ea5361 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -312,15 +312,15 @@ }; tangled = { pname = "tangled"; - version = "b9500f271a335e2af2a88fa27b569315bd8bee0c"; + version = "e23d5abed070ed0923b961a8cbe750b28220209d"; src = fetchgit { url = "https://tangled.org/did:plc:j5hmlfdrwkvtxm7cjmu7j2is"; - rev = "b9500f271a335e2af2a88fa27b569315bd8bee0c"; + rev = "e23d5abed070ed0923b961a8cbe750b28220209d"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-P9axLdVOmQGAfpB+hj26Uh+Gi3vITd8/v2HZyZH5aro="; + sha256 = "sha256-1zEIzYQHj/YKkiyW3tiUECs8dETPoFIyQTcWadlZwWM="; }; date = "2026-07-27"; }; diff --git a/deploy.nu b/deploy.nu index 2dc3f2c..fe69931 100755 --- a/deploy.nu +++ b/deploy.nu @@ -105,7 +105,7 @@ def deploy [hostname: string, boot: bool] { let activate_cmd = { let action = if $boot { "boot" } else { "switch" } let cmd = match $hostcfg.type { - "nixos" => $"sudo '($result_link)/bin/switch-to-configuration' '($action)'", + "nixos" => $"sudo nix-env -p /nix/var/nix/profiles/system --set '($result_link)' && sudo '($result_link)/bin/switch-to-configuration' '($action)'", "home" => $"($result_link)/activate", } ssh $target $cmd diff --git a/pkgs-set/pkgs/cliproxy-gemini-3.6-flash.patch b/pkgs-set/pkgs/cliproxy-gemini-3.6-flash.patch new file mode 100644 index 0000000..8b556c8 --- /dev/null +++ b/pkgs-set/pkgs/cliproxy-gemini-3.6-flash.patch @@ -0,0 +1,30 @@ +--- a/internal/registry/models/models.json ++++ b/internal/registry/models/models.json +@@ -2405,6 +2405,27 @@ + "high" + ] + } ++ }, ++ { ++ "id": "gemini-3.6-flash", ++ "object": "model", ++ "owned_by": "antigravity", ++ "type": "antigravity", ++ "display_name": "Gemini 3.6 Flash", ++ "name": "gemini-3.6-flash", ++ "description": "Gemini 3.6 Flash", ++ "context_length": 1048576, ++ "max_completion_tokens": 65535, ++ "thinking": { ++ "min": 1, ++ "max": 65535, ++ "dynamic_allowed": true, ++ "levels": [ ++ "low", ++ "medium", ++ "high" ++ ] ++ } + } + ], + "xai": [ diff --git a/pkgs-set/pkgs/cliproxyapi.nix b/pkgs-set/pkgs/cliproxyapi.nix index 71a2ce5..3b79cf1 100644 --- a/pkgs-set/pkgs/cliproxyapi.nix +++ b/pkgs-set/pkgs/cliproxyapi.nix @@ -8,7 +8,7 @@ buildGoModule { pname = "cliproxyapi"; - version = "7.2.97-pr4525-opus5-codex-namespace"; + version = "7.2.97-pr4525-opus5-gemini36-codex-namespace"; src = fetchFromGitHub { owner = "router-for-me"; @@ -19,8 +19,8 @@ buildGoModule { vendorHash = "sha256-OKZQ+Lyt3nwUhJMNE3zmwXN9vEl9Hx4W/CrzAhHfBTg="; subPackages = [ "cmd/server" ]; - patches = [ ./cliproxy-pr-4525.patch ./cliproxy-opus-5.patch ./cliproxy-codex-namespace.patch ]; - ldflags = [ "-s" "-w" "-X main.Version=7.2.97-pr4525-opus5-codex-namespace" ]; + patches = [ ./cliproxy-pr-4525.patch ./cliproxy-opus-5.patch ./cliproxy-gemini-3.6-flash.patch ./cliproxy-codex-namespace.patch ]; + ldflags = [ "-s" "-w" "-X main.Version=7.2.97-pr4525-opus5-gemini36-codex-namespace" ]; # nativeBuildInputs = [autoPatchelfHook]; diff --git a/pkgs-set/pkgs/tangled-knot-migrate.nix b/pkgs-set/pkgs/tangled-knot-migrate.nix new file mode 100644 index 0000000..aeaeabf --- /dev/null +++ b/pkgs-set/pkgs/tangled-knot-migrate.nix @@ -0,0 +1,6 @@ +{ inputs, callPackage, ... }: + +callPackage "${inputs.tangled}/nix/pkgs/knot-crate.nix" { + src = inputs.tangled; + crate = "knot-migrate"; +} diff --git a/pkgs-set/pkgs/tangled-knot-rs.nix b/pkgs-set/pkgs/tangled-knot-rs.nix new file mode 100644 index 0000000..ca78fc6 --- /dev/null +++ b/pkgs-set/pkgs/tangled-knot-rs.nix @@ -0,0 +1,6 @@ +{ inputs, callPackage, ... }: + +callPackage "${inputs.tangled}/nix/pkgs/knot-crate.nix" { + src = inputs.tangled; + crate = "knot-server"; +} -- 2.51.2