Merge https://github.com/tpwrules/nixos-apple-silicon

2 files changed, 48 insertions, 6 deletions

diff --git a/modules/nixos-apple-silicon/docs/release-notes.md b/modules/nixos-apple-silicon/docs/release-notes.md
index 64de3137ba33..d7bd23b821d7 100644
--- a/modules/nixos-apple-silicon/docs/release-notes.md
+++ b/modules/nixos-apple-silicon/docs/release-notes.md
@@ -2,6 +2,35 @@
 
 This file contains important information for each release.
 
+## 2023-12-19
+
+This release updates nixpkgs, m1n1, U-Boot, the kernel, and Mesa.
+
+With the official announcement of the Fedora Asahi Remix, nixos-apple-silicon is
+now tracking package versions and capabilities as they appear in Fedora, in
+order to offer the upstream intended user experience.
+
+Updating nixpkgs brings us past the 23.11 release and on the path to 24.05.
+Other updates bring HDMI support for supported machines and firmware versions.
+Don't expect this to work if you installed before August 2023; workarounds will
+be made available shortly, and a long-term solution will hopefully be
+implemented by Asahi and incorporated here as well.
+
+Speaker support will be added in the next release once safe implementation and
+testing is completed. Thanks for the patience and understanding.
+
+## 2023-11-19
+
+This release updates nixpkgs.
+
+In particular, nixpkgs is updated to fix issues with compilation of wolfssl,
+and some regressions in systemd-boot.
+
+This release also adds patches to the kernel to support compilation with Rust
+1.73.0. Thanks again to yu-re-ka for this contribution.
+
+Speaker support will be added in an upcoming release.
+
 ## 2023-10-21
 
 This release updates nixpkgs, m1n1, U-Boot, and the kernel.
diff --git a/modules/nixos-apple-silicon/docs/uefi-standalone.md b/modules/nixos-apple-silicon/docs/uefi-standalone.md
index 58e9fcc53d95..1209027cced7 100644
--- a/modules/nixos-apple-silicon/docs/uefi-standalone.md
+++ b/modules/nixos-apple-silicon/docs/uefi-standalone.md
@@ -1,11 +1,11 @@
-# UEFI Boot Standalone NixOS (2023-10-21)
+# UEFI Boot Standalone NixOS (2023-12-19)
 
 This guide will build and was tested with the following software:
-* Asahi Linux kernel version 6.5.0-asahi15
-* Asahi Linux's Mesa version 23.3.0_asahi-20230904-1
-* m1n1 version v1.4.2
-* Asahi Linux's U-Boot version 2023.07.02.asahi3-1
-* Nixpkgs, as of 2023-10-19
+* Asahi Linux kernel version 6.6.0-asahi14
+* Asahi Linux's Mesa version 24.0.0_asahi-20231213-1
+* m1n1 version v1.4.11
+* Asahi Linux's U-Boot version 2023.07.02.asahi4-1
+* Nixpkgs, as of 2023-12-17
 * macOS stub 12.3
 
 NOTE: The latest version of this guide will always be [at its home](https://github.com/tpwrules/nixos-apple-silicon/blob/main/docs/uefi-standalone.md). For more general information about Linux on Apple Silicon Macs, refer to the [Asahi Linux project](https://asahilinux.org/) and [alpha installer release](https://asahilinux.org/2022/03/asahi-linux-alpha-release/).
@@ -246,12 +246,17 @@ Currently, the only supported way to update the peripheral firmware files is to
   # hardware.asahi.extractPeripheralFirmware = false;
 ```
 
+<details>
+  <summary>If you have apps incompatible with 16K page sizes and you need 4K page size instead...</summary>
+
+**Note:** The 4K patches are currently not updated to latest kernel version. See [this issue](https://github.com/tpwrules/nixos-apple-silicon/issues/43).
 You can choose to build the Asahi kernel with a 4K page size by enabling the appropriate option. This results in a reduction in raw compilation speed of 10-25%, but improves software compatibility in some cases (such as with Chromium/Electron and x86 emulation).
 ```
   # Build the kernel with 4K pages to improve software compatibility at
   # the cost of performance in some cases.
   hardware.asahi.use4KPages = true;
 ```
+</details>
 
 If you want to install a desktop environment, you will have to uncomment the option to enable X11 and NetworkManager, then add an option to include your favorite desktop environment. You may also wish to include graphical packages such as `firefox` in `environment.systemPackages`. For example, to install Xfce:
 ```
@@ -268,6 +273,14 @@ Some keyboard layouts are not detected correctly. On some devices, the \` key is
  '';
  ```
 
+`iwd` is recommended for WiFi on most systems:
+```
+networking.wireless.iwd = {
+  enable = true;
+  settings.General.EnableNetworkConfiguration = true;
+};
+```
+
 #### NixOS Installation
 
 Once you are happy with your initial configuration, you may install the system. This will have to download a large amount of data.