diff --git a/flake.lock b/flake.lock index 293958c..68a98dc 100755 --- a/flake.lock +++ b/flake.lock @@ -10,13 +10,13 @@ "locked": { "lastModified": 1768564560, "narHash": "sha256-YyIzhZoFVE4C5P9e0wZGjx4P9IT/OTUMFF3r6iKd3UY=", - "owner": "tpwrules", + "owner": "nix-community", "repo": "nixos-apple-silicon", "rev": "83a2bb509972148aa6d3f75c65103b6bfb7898af", "type": "github" }, "original": { - "owner": "tpwrules", + "owner": "nix-community", "repo": "nixos-apple-silicon", "type": "github" } diff --git a/flake.nix b/flake.nix index 2fefba7..4b296a7 100755 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon = { - url = "github:tpwrules/nixos-apple-silicon"; + url = "github:nix-community/nixos-apple-silicon"; inputs.nixpkgs.follows = "nixpkgs"; }; nixos-generators = { diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix index 3a1b464..4fcc325 100644 --- a/modules/nixos/system/boot/default.nix +++ b/modules/nixos/system/boot/default.nix @@ -1,4 +1,8 @@ -{ config, lib, namespace, ... }: +{ config +, lib +, namespace +, ... +}: let inherit (lib) mkIf mkDefault; inherit (lib.${namespace}) mkBoolOpt; @@ -27,17 +31,19 @@ in services.xe-guest-utilities.enable = mkIf cfg.xenGuest true; boot = { - kernelParams = lib.optionals cfg.silentBoot [ - "quiet" - "loglevel=3" - "udev.log_level=3" - "rd.udev.log_level=3" - "systemd.show_status=auto" - "rd.systemd.show_status=auto" - "vt.global_cursor_default=0" - ] ++ lib.optionals cfg.showNotch [ - "apple_dcp.show_notch=1" - ]; + kernelParams = + lib.optionals cfg.silentBoot [ + "quiet" + "loglevel=3" + "udev.log_level=3" + "rd.udev.log_level=3" + "systemd.show_status=auto" + "rd.systemd.show_status=auto" + "vt.global_cursor_default=0" + ] + ++ lib.optionals cfg.showNotch [ + "appledrm.show_notch=1" + ]; loader = { efi = { @@ -60,10 +66,17 @@ in }; initrd = mkIf cfg.xenGuest { - kernelModules = [ "xen_netfront" "xen_blkfront" ]; + kernelModules = [ + "xen_netfront" + "xen_blkfront" + ]; supportedFilesystems = [ "xenfs" ]; }; - kernelModules = mkIf cfg.xenGuest [ "xen_netfront" "xen_blkfront" "xenfs" ]; + kernelModules = mkIf cfg.xenGuest [ + "xen_netfront" + "xen_blkfront" + "xenfs" + ]; }; }; }