diff --git a/flake.lock b/flake.lock index f6722026..17a1f64f 100644 --- a/flake.lock +++ b/flake.lock @@ -600,20 +600,21 @@ "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751622568, - "narHash": "sha256-EE3NBsej517VRa1x+ylAghrvngftxf1KgfHlE9OYyXE=", + "lastModified": 1755124568, + "narHash": "sha256-8fXTYruAwE6OiIz/99P5qknQYag7ZX985pNT+jhIIrU=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "eba4b40c816e5aff8951ae231ac237e8aab8ec1d", + "rev": "2f873fc3ef373e59cd3a7dad4087685fc8ce02ca", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-2025-08-10", "repo": "nixos-apple-silicon", - "rev": "eba4b40c816e5aff8951ae231ac237e8aab8ec1d", "type": "github" } }, @@ -1039,6 +1040,27 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nixos-apple-silicon", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754847726, + "narHash": "sha256-2vX8QjO5lRsDbNYvN9hVHXLU6oMl+V/PsmIiJREG4rE=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "7d81f6fb2e19bf84f1c65135d1060d829fae2408", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "wallpapers": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 07c6711a..1f087fd8 100644 --- a/flake.nix +++ b/flake.nix @@ -139,7 +139,7 @@ nixos-apple-silicon = { # 2025-07-04 - url = "github:nix-community/nixos-apple-silicon/eba4b40c816e5aff8951ae231ac237e8aab8ec1d"; + url = "github:nix-community/nixos-apple-silicon/release-2025-08-10"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/12kingdoms-shoukei/apple-silicon.nix b/hosts/12kingdoms-shoukei/apple-silicon.nix index 2ecbedc9..0aec11d6 100644 --- a/hosts/12kingdoms-shoukei/apple-silicon.nix +++ b/hosts/12kingdoms-shoukei/apple-silicon.nix @@ -21,12 +21,7 @@ enable = true; peripheralFirmwareDirectory = "${my-asahi-firmware}/macbook-pro-m2-a2338"; - # build the Asahi Linux Kernel with Rust support - withRust = true; - # use apple-silicon's GPU instead of CPU - useExperimentalGPUDriver = true; - # How to install the Asahi Mesa driver - experimentalGPUInstallMode = "driver"; # driver / replace(for non-flakes) / overlay + # since mesa 25.1(already in nixpkgs), support for asahi is enabled by default. }; # After adding this snippet, you need to restart the system for the touchbar to work.