fix: asahi notch

This commit is contained in:
2026-01-17 12:14:03 -05:00
parent 107397ce78
commit 68fada8d38
3 changed files with 30 additions and 17 deletions

4
flake.lock generated
View File

@@ -10,13 +10,13 @@
"locked": { "locked": {
"lastModified": 1768564560, "lastModified": 1768564560,
"narHash": "sha256-YyIzhZoFVE4C5P9e0wZGjx4P9IT/OTUMFF3r6iKd3UY=", "narHash": "sha256-YyIzhZoFVE4C5P9e0wZGjx4P9IT/OTUMFF3r6iKd3UY=",
"owner": "tpwrules", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "83a2bb509972148aa6d3f75c65103b6bfb7898af", "rev": "83a2bb509972148aa6d3f75c65103b6bfb7898af",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tpwrules", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"type": "github" "type": "github"
} }

View File

@@ -14,7 +14,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
apple-silicon = { apple-silicon = {
url = "github:tpwrules/nixos-apple-silicon"; url = "github:nix-community/nixos-apple-silicon";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixos-generators = { nixos-generators = {

View File

@@ -1,4 +1,8 @@
{ config, lib, namespace, ... }: { config
, lib
, namespace
, ...
}:
let let
inherit (lib) mkIf mkDefault; inherit (lib) mkIf mkDefault;
inherit (lib.${namespace}) mkBoolOpt; inherit (lib.${namespace}) mkBoolOpt;
@@ -27,17 +31,19 @@ in
services.xe-guest-utilities.enable = mkIf cfg.xenGuest true; services.xe-guest-utilities.enable = mkIf cfg.xenGuest true;
boot = { boot = {
kernelParams = lib.optionals cfg.silentBoot [ kernelParams =
"quiet" lib.optionals cfg.silentBoot [
"loglevel=3" "quiet"
"udev.log_level=3" "loglevel=3"
"rd.udev.log_level=3" "udev.log_level=3"
"systemd.show_status=auto" "rd.udev.log_level=3"
"rd.systemd.show_status=auto" "systemd.show_status=auto"
"vt.global_cursor_default=0" "rd.systemd.show_status=auto"
] ++ lib.optionals cfg.showNotch [ "vt.global_cursor_default=0"
"apple_dcp.show_notch=1" ]
]; ++ lib.optionals cfg.showNotch [
"appledrm.show_notch=1"
];
loader = { loader = {
efi = { efi = {
@@ -60,10 +66,17 @@ in
}; };
initrd = mkIf cfg.xenGuest { initrd = mkIf cfg.xenGuest {
kernelModules = [ "xen_netfront" "xen_blkfront" ]; kernelModules = [
"xen_netfront"
"xen_blkfront"
];
supportedFilesystems = [ "xenfs" ]; supportedFilesystems = [ "xenfs" ];
}; };
kernelModules = mkIf cfg.xenGuest [ "xen_netfront" "xen_blkfront" "xenfs" ]; kernelModules = mkIf cfg.xenGuest [
"xen_netfront"
"xen_blkfront"
"xenfs"
];
}; };
}; };
} }