summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomuus <tomasz1.mrozinski@proton.me>2026-01-23 18:27:53 +0100
committerTomuus <tomasz1.mrozinski@proton.me>2026-01-23 18:27:53 +0100
commitcbdc8597196cbcf181a16d558e390a537bb4c749 (patch)
tree7c2bab55b63f34763ca8b339d29101a402abfa39
parent4b9cd0288b9da2a34f33b192a99d5eee3d8bd82c (diff)
Asahi kernel update
Well, I did it a week ago but forgot to commit There's a flake updating comming alongside it Well if I have to recompile the kernel i might as well update everything It also finaly fixed all hdmi issues and gave me 120hz support
-rw-r--r--hosts/Makbuk/apple-silicon-support/modules/default.nix13
-rw-r--r--hosts/Makbuk/apple-silicon-support/packages/linux-asahi/default.nix8
-rw-r--r--hosts/Makbuk/apple-silicon-support/packages/uboot-asahi/default.nix6
-rw-r--r--hosts/Makbuk/configuration.nix2
4 files changed, 16 insertions, 13 deletions
diff --git a/hosts/Makbuk/apple-silicon-support/modules/default.nix b/hosts/Makbuk/apple-silicon-support/modules/default.nix
index 3ed3fd6..91e5084 100644
--- a/hosts/Makbuk/apple-silicon-support/modules/default.nix
+++ b/hosts/Makbuk/apple-silicon-support/modules/default.nix
@@ -31,11 +31,14 @@
# 900 is higher priority than mkDefault but lower than just setting
hardware.graphics.package = lib.mkOverride 900 (
- lib.warnIf (lib.versionAtLeast pkgs.mesa.version "25.3") ''
- Mesa 25.3 is known to cause crashes in Firefox on Asahi GPUs.
- Please pin nixpkgs c5ae371f1a6a7fd27823 or earlier if affected.
- See https://github.com/nix-community/nixos-apple-silicon/issues/380
- for more info.'' pkgs.mesa
+ lib.warnIf
+ (lib.versionAtLeast pkgs.mesa.version "25.3" && lib.versionOlder pkgs.mesa.version "25.3.2")
+ ''
+ Mesa 25.3.0 and 25.3.1 are known to cause crashes in Firefox on Asahi
+ GPUs. Please update to Mesa >= 25.3.2 by updating Nixpkgs. See
+ https://github.com/nix-community/nixos-apple-silicon/issues/380 for
+ more info.''
+ pkgs.mesa
);
};
diff --git a/hosts/Makbuk/apple-silicon-support/packages/linux-asahi/default.nix b/hosts/Makbuk/apple-silicon-support/packages/linux-asahi/default.nix
index 978aa83..15b39d3 100644
--- a/hosts/Makbuk/apple-silicon-support/packages/linux-asahi/default.nix
+++ b/hosts/Makbuk/apple-silicon-support/packages/linux-asahi/default.nix
@@ -18,15 +18,15 @@ let
inherit stdenv lib;
pname = "linux-asahi";
- version = "6.17.7";
+ version = "6.18.4";
modDirVersion = version;
- extraMeta.branch = "6.17";
+ extraMeta.branch = "6.18";
src = fetchFromGitHub {
owner = "AsahiLinux";
repo = "linux";
- tag = "asahi-6.17.7-2";
- hash = "sha256-wyuHcp9rEpOtNb8aRPkfX57XdcmpitklM4oew/YMRio=";
+ tag = "asahi-6.18.4-1";
+ hash = "sha256-qWY74VJ5Kn2V/MdFlkgwQ5ILtTV5W8ibOw9zkBeu50E=";
};
kernelPatches = [
diff --git a/hosts/Makbuk/apple-silicon-support/packages/uboot-asahi/default.nix b/hosts/Makbuk/apple-silicon-support/packages/uboot-asahi/default.nix
index 8d6dd08..2e254dc 100644
--- a/hosts/Makbuk/apple-silicon-support/packages/uboot-asahi/default.nix
+++ b/hosts/Makbuk/apple-silicon-support/packages/uboot-asahi/default.nix
@@ -10,10 +10,10 @@
# tracking: https://pagure.io/fedora-asahi/uboot-tools/commits/main
owner = "AsahiLinux";
repo = "u-boot";
- rev = "asahi-v2025.07-1";
- hash = "sha256-WGpMd3ub+m0xWevPreYrLWpoQSz9sr1YmeOiU7kgPGs=";
+ rev = "asahi-v2025.10-1";
+ hash = "sha256-mQCSh7zUvs3zhcAbdH/PNh1fGqpoj7mjUjLWfuPrBl4=";
};
- version = "2025.07-1-asahi";
+ version = "2025.10-1-asahi";
defconfig = "apple_m1_defconfig";
extraMeta.platforms = [ "aarch64-linux" ];
diff --git a/hosts/Makbuk/configuration.nix b/hosts/Makbuk/configuration.nix
index baee812..8b39693 100644
--- a/hosts/Makbuk/configuration.nix
+++ b/hosts/Makbuk/configuration.nix
@@ -34,6 +34,6 @@
virtualisation.docker.enable = true;
nixpkgs.config.allowUnsupportedSystem = true;
- boot.kernelParams = [ "hid_apple.fnmode=2" "apple_dcp.show_notch=1" "hid_apple.swap_opt_cmd=2" ];
+ boot.kernelParams = [ "hid_apple.fnmode=2" "appledrm.show_notch=1" "hid_apple.swap_opt_cmd=2" ];
hardware.asahi.peripheralFirmwareDirectory = ./firmware;
}