diff --git a/flake.lock b/flake.lock index 555c925f..633d9c4d 100644 --- a/flake.lock +++ b/flake.lock @@ -793,6 +793,22 @@ "type": "github" } }, + "nixpkgs-2505": { + "locked": { + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-darwin": { "locked": { "lastModified": 1764081664, @@ -1120,6 +1136,7 @@ "nixos-generators": "nixos-generators", "nixpak": "nixpak", "nixpkgs": "nixpkgs_6", + "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nixpkgs-mesa": "nixpkgs-mesa", diff --git a/flake.nix b/flake.nix index 6528feec..7a87e475 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,7 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; # revert mesa to 25.2.6 nixpkgs-mesa.url = "github:nixos/nixpkgs/2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781"; + nixpkgs-2505.url = "github:nixos/nixpkgs/nixos-25.05"; # nixpkgs with some custom patches nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; diff --git a/home/base/tui/container.nix b/home/base/tui/container.nix index 52c9ab30..67ae0f3c 100644 --- a/home/base/tui/container.nix +++ b/home/base/tui/container.nix @@ -1,6 +1,6 @@ { pkgs, - pkgs-stable, + pkgs-2505, nur-ryan4yin, ... }: @@ -25,7 +25,7 @@ istioctl clusterctl # for kubernetes cluster-api kubevirt # virtctl - pkgs-stable.kubernetes-helm + pkgs-2505.kubernetes-helm fluxcd argocd diff --git a/home/base/tui/shell/default.nix b/home/base/tui/shell/default.nix index 73497656..27485885 100644 --- a/home/base/tui/shell/default.nix +++ b/home/base/tui/shell/default.nix @@ -17,8 +17,8 @@ # https://platform.moonshot.cn/docs/guide/agent-support # $env.ANTHROPIC_BASE_URL = "https://api.moonshot.cn/anthropic/" # $env.ANTHROPIC_AUTH_TOKEN = $env.MOONSHOT_API_KEY - # $env.ANTHROPIC_MODEL = "kimi-k2-0905-preview" - # $env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "kimi-k2-turbo-preview" + # $env.ANTHROPIC_MODEL = "kimi-k2-thinking" + # $env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "kimi-k2-thinking-turbo" # using claude-code with glm llm # https://docs.bigmodel.cn/cn/coding-plan/tool/claude diff --git a/outputs/default.nix b/outputs/default.nix index 7f8695a6..ab25c9d9 100644 --- a/outputs/default.nix +++ b/outputs/default.nix @@ -23,7 +23,11 @@ let # # To use chrome, we need to allow the installation of non-free software # config.allowUnfree = true; # }; - + pkgs-2505 = import inputs.nixpkgs-2505 { + inherit system; + # To use chrome, we need to allow the installation of non-free software + config.allowUnfree = true; + }; pkgs-stable = import inputs.nixpkgs-stable { inherit system; # To use chrome, we need to allow the installation of non-free software