Merge branch 'master' of ssh://git.joshuabell.xyz:3032/ringofstorms/dotfiles

hosts/h001/flake.lock

@@ -505,11 +505,11 @@
     },
     "litellm-nixpkgs": {
       "locked": {
-        "lastModified": 1760524057,
+        "lastModified": 1761373498,
-        "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=",
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -1564,17 +1564,17 @@
     },
     "open-webui-nixpkgs": {
       "locked": {
-        "lastModified": 1759036355,
+        "lastModified": 1761373498,
-        "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=",
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
-        "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127",
         "type": "github"
       }
     },

hosts/h001/flake.nix

@@ -2,7 +2,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
     # nixpkgs-unstable.url = "github:wrvsrx/nixpkgs/fix-open-webui";
-    open-webui-nixpkgs.url = "github:nixos/nixpkgs/e9f00bd893984bc8ce46c895c3bf7cac95331127";
+    open-webui-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     litellm-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     trilium-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     oauth2-proxy-nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

hosts/h001/mods/litellm.nix

@@ -43,16 +43,33 @@ in
           drop_params = true;
         };
         model_list = [
-          # 宙 Proxy
-          # { # NOTE model discovery not working yet? https://canary.discord.com/channels/1123360753068540065/1409974123987210350/1427864010241609752
-          #   model_name = "litellm_proxy/*";
-          #   litellm_params = {
-          #     model = "litellm_proxy/*";
-          #     api_base = "http://100.64.0.8:9010/air_key";
-          #     api_key = "os.environ/LITELLM_PROXY_API_KEY";
-          #   };
-          # }
         ]
+        # Copilot
+        ++ (builtins.map
+          (m: {
+            model_name = "copilot-${m}";
+            litellm_params = {
+              model = "github_copilot/${m}";
+              extra_headers = {
+                editor-version = "vscode/${pkgs.vscode.version}";
+                editor-plugin-version = "copilot/${pkgs.vscode-extensions.github.copilot.version}";
+                Copilot-Integration-Id = "vscode-chat";
+                Copilot-Vision-Request = "true";
+                user-agent = "GithubCopilot/${pkgs.vscode-extensions.github.copilot.version}";
+              };
+            };
+
+          })
+          # List from https://github.com/settings/copilot/features enabled models
+          [
+            "claude-sonnet-3.5"
+            "claude-sonnet-4"
+            "claude-sonnet-4.5"
+            "gemini-2.5-pro"
+            "openai-gpt-5"
+            "openai-gpt-5-mini"
+          ]
+        )
         # Azure
         ++ (builtins.map
           (m: {
@@ -74,36 +91,13 @@ in
             # "gpt-5-codex-2025-09-15"
           ]
         )
-        # Copilot
-        ++ (builtins.map
-          (m: {
-            model_name = "copilot-${m}";
-            litellm_params = {
-              model = "github_copilot/${m}";
-              extra_headers = {
-                editor-version = "vscode/${pkgs.vscode.version}";
-                editor-plugin-version = "copilot/${pkgs.vscode-extensions.github.copilot.version}";
-                Copilot-Integration-Id = "vscode-chat";
-                Copilot-Vision-Request = "true";
-                user-agent = "GithubCopilot/${pkgs.vscode-extensions.github.copilot.version}";
-              };
-            };
-
-          })
-          # List from https://github.com/settings/copilot/features enabled models
-          [
-            "claude-sonnet-4.5"
-            "claude-sonnet-4"
-            "gemini-2.5-pro"
-          ]
-        )
         # 宙 Proxy
         ++ (builtins.map
           (m: {
             model_name = "air-${m}";
             litellm_params = {
               model = "litellm_proxy/${m}";
-              api_base = "http://100.64.0.8:9010/air_key";
+              api_base = "http://100.64.0.8:9010/air_prd";
               api_key = "os.environ/LITELLM_PROXY_API_KEY";
             };
           })