diff --git a/flake.lock b/flake.lock index e82efce9..3a3e659d 100644 --- a/flake.lock +++ b/flake.lock @@ -65,16 +65,16 @@ ] }, "locked": { - "lastModified": 1780143400, - "narHash": "sha256-jN9RJ4OeuLdCxZ1G0d4zqy0HuHnqODxxgN6pQoYfAH8=", + "lastModified": 1789553013, + "narHash": "sha256-W5dvgFOuVs24X3G5tUb8C2IHU7ICXNvyGPiWWFjfbuo=", "owner": "catppuccin", "repo": "nix", - "rev": "096f4670cf078d810a931fae59b57db4cc3fb4d3", + "rev": "89b3eacf59d6b5eefbc2d69c3a4eb5aaf66d63bc", "type": "github" }, "original": { "owner": "catppuccin", - "ref": "v26.05", + "ref": "main", "repo": "nix", "type": "github" } @@ -423,7 +423,9 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1782141370, @@ -931,22 +933,22 @@ "pre-commit-hooks": "pre-commit-hooks", "preservation": "preservation", "pyclipsync": "pyclipsync", + "rust-overlay": "rust-overlay", "wallpapers": "wallpapers" } }, "rust-overlay": { "inputs": { "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1782012058, - "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", + "lastModified": 1790062494, + "narHash": "sha256-Mds1vuoczq1fRm1rf+Iar8IKDBHNjOMo2JqqPWJUlng=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", + "rev": "b88764907c1b2de6c0e206d8d9d9634d91c81334", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 280b6c45..8a370778 100644 --- a/flake.nix +++ b/flake.nix @@ -85,14 +85,24 @@ }; # https://github.com/catppuccin/nix + # main carries the rust-overlay-style deprecation fix for its vscode + # package (nodejs -> nodejs-slim); v26.05 still emits the eval warning. catppuccin = { - url = "github:catppuccin/nix/v26.05"; + url = "github:catppuccin/nix/main"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { url = "github:nix-community/lanzaboote/v1.1.0"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; + }; + + # lanzaboote's pinned rust-overlay still uses the deprecated + # `stdenv.isLinux`/`stdenv.isDarwin`; follow a newer revision. + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; }; preservation = { diff --git a/home/base/core/theme.nix b/home/base/core/theme.nix index e0382caa..bc90dd8a 100644 --- a/home/base/core/theme.nix +++ b/home/base/core/theme.nix @@ -8,10 +8,8 @@ catppuccin = { # The default `enable` value for all available programs. enable = true; - # nixpkgs renamed gemini-cli to antigravity-cli (which dropped catppuccin - # theme support); the v26.05 tag still references the old option name. - # Remove this line once the catppuccin input moves past the rename. - gemini-cli.enable = false; + # Enroll every supported port (catppuccin/nix >= main behaviour). + autoEnable = true; cache.enable = true; # one of "latte", "frappe", "macchiato", "mocha" flavor = "mocha";