chore: update

montchr · Jan 21, 2025 · e716c13 · e716c13
1 parent 8812dae
commit e716c13
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 84 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -92,9 +92,8 @@
     flake-utils.url = "github:numtide/flake-utils";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
-    # XXX: <https://github.com/tpwrules/nixos-apple-silicon/issues/261#issuecomment-2579842582>
-    nixos-apple-silicon.url = "github:montchr/nixos-apple-silicon?ref=main";
-    # nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon?ref=release-2024-12-25";
+    # nixos-apple-silicon.url = "github:montchr/nixos-apple-silicon?ref=main";
+    nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon?ref=release-2025-01-20";
     asahi-tuvok-firmware.url = "git+ssh://[email protected]/~montchr/asahi-tuvok-firmware";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     # FIXME: update

diff --git a/machines/tuuvok/default.nix b/machines/tuuvok/default.nix
@@ -5,9 +5,6 @@
     ./secrets/sops.nix
 
     ./backups.nix
-
-    ./experimental-mesa.nix
-
     ./keyboard.nix
     ./work/default.nix
 

diff --git a/machines/tuuvok/experimental-mesa.nix b/machines/tuuvok/experimental-mesa.nix
diff --git a/nixos/profiles/hardware/apple/apple-silicon.nix b/nixos/profiles/hardware/apple/apple-silicon.nix
@@ -1,14 +1,7 @@
-{
-  lib,
-  flake,
-  ...
-}:
-let
-  inherit (flake.inputs) nixos-apple-silicon;
-in
+{ lib, flake, ... }:
 {
   imports = [
-    nixos-apple-silicon.nixosModules.apple-silicon-support
+    flake.inputs.nixos-apple-silicon.nixosModules.apple-silicon-support
 
     ../../boot/systemd-boot.nix
 
@@ -23,4 +16,6 @@ in
   # Mutually exclusive legacy Apple hardware.
   hardware.facetimehd.enable = lib.mkForce false;
   services.mbpfan.enable = lib.mkForce false;
+
+  hardware.asahi.useExperimentalGPUDriver = true;
 }