From e87a34e3f622c0144f6472ac33a13670b5c8e531 Mon Sep 17 00:00:00 2001 From: Erin <79354991+oati@users.noreply.github.com> Date: Mon, 23 Jan 2023 19:37:18 -0600 Subject: [PATCH] reorganize nixos module use `apple-silicon-support/modules` and `apple-silicon-support/packages` --- apple-silicon-support/default.nix | 7 +++++++ .../modules}/boot-m1n1/default.nix | 0 .../modules}/default.nix | 0 .../modules}/kernel/default.nix | 0 .../modules}/kernel/edge.nix | 0 .../modules}/mesa/default.nix | 0 .../modules}/peripheral-firmware/default.nix | 0 .../packages}/asahi-fwextract/add_entry_point.patch | 0 .../packages}/asahi-fwextract/default.nix | 0 .../packages}/linux-asahi/config | 0 .../packages}/linux-asahi/default-pagesize-16k.patch | 0 .../packages}/linux-asahi/default.nix | 0 .../packages}/linux-asahi/sven-iommu-4k.patch | 0 .../packages}/m1n1/default.nix | 0 .../packages}/mesa-asahi-edge/default.nix | 0 {packages => apple-silicon-support/packages}/overlay.nix | 0 .../packages}/uboot-asahi/default.nix | 0 flake.nix | 4 ++-- iso-configuration/default.nix | 6 +++--- 19 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 apple-silicon-support/default.nix rename {nixos-module => apple-silicon-support/modules}/boot-m1n1/default.nix (100%) rename {nixos-module => apple-silicon-support/modules}/default.nix (100%) rename {nixos-module => apple-silicon-support/modules}/kernel/default.nix (100%) rename {nixos-module => apple-silicon-support/modules}/kernel/edge.nix (100%) rename {nixos-module => apple-silicon-support/modules}/mesa/default.nix (100%) rename {nixos-module => apple-silicon-support/modules}/peripheral-firmware/default.nix (100%) rename {packages => apple-silicon-support/packages}/asahi-fwextract/add_entry_point.patch (100%) rename {packages => apple-silicon-support/packages}/asahi-fwextract/default.nix (100%) rename {packages => apple-silicon-support/packages}/linux-asahi/config (100%) rename {packages => apple-silicon-support/packages}/linux-asahi/default-pagesize-16k.patch (100%) rename {packages => apple-silicon-support/packages}/linux-asahi/default.nix (100%) rename {packages => apple-silicon-support/packages}/linux-asahi/sven-iommu-4k.patch (100%) rename {packages => apple-silicon-support/packages}/m1n1/default.nix (100%) rename {packages => apple-silicon-support/packages}/mesa-asahi-edge/default.nix (100%) rename {packages => apple-silicon-support/packages}/overlay.nix (100%) rename {packages => apple-silicon-support/packages}/uboot-asahi/default.nix (100%) diff --git a/apple-silicon-support/default.nix b/apple-silicon-support/default.nix new file mode 100644 index 00000000..71a5dd0f --- /dev/null +++ b/apple-silicon-support/default.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + imports = [ + ./modules/default.nix + ]; +} diff --git a/nixos-module/boot-m1n1/default.nix b/apple-silicon-support/modules/boot-m1n1/default.nix similarity index 100% rename from nixos-module/boot-m1n1/default.nix rename to apple-silicon-support/modules/boot-m1n1/default.nix diff --git a/nixos-module/default.nix b/apple-silicon-support/modules/default.nix similarity index 100% rename from nixos-module/default.nix rename to apple-silicon-support/modules/default.nix diff --git a/nixos-module/kernel/default.nix b/apple-silicon-support/modules/kernel/default.nix similarity index 100% rename from nixos-module/kernel/default.nix rename to apple-silicon-support/modules/kernel/default.nix diff --git a/nixos-module/kernel/edge.nix b/apple-silicon-support/modules/kernel/edge.nix similarity index 100% rename from nixos-module/kernel/edge.nix rename to apple-silicon-support/modules/kernel/edge.nix diff --git a/nixos-module/mesa/default.nix b/apple-silicon-support/modules/mesa/default.nix similarity index 100% rename from nixos-module/mesa/default.nix rename to apple-silicon-support/modules/mesa/default.nix diff --git a/nixos-module/peripheral-firmware/default.nix b/apple-silicon-support/modules/peripheral-firmware/default.nix similarity index 100% rename from nixos-module/peripheral-firmware/default.nix rename to apple-silicon-support/modules/peripheral-firmware/default.nix diff --git a/packages/asahi-fwextract/add_entry_point.patch b/apple-silicon-support/packages/asahi-fwextract/add_entry_point.patch similarity index 100% rename from packages/asahi-fwextract/add_entry_point.patch rename to apple-silicon-support/packages/asahi-fwextract/add_entry_point.patch diff --git a/packages/asahi-fwextract/default.nix b/apple-silicon-support/packages/asahi-fwextract/default.nix similarity index 100% rename from packages/asahi-fwextract/default.nix rename to apple-silicon-support/packages/asahi-fwextract/default.nix diff --git a/packages/linux-asahi/config b/apple-silicon-support/packages/linux-asahi/config similarity index 100% rename from packages/linux-asahi/config rename to apple-silicon-support/packages/linux-asahi/config diff --git a/packages/linux-asahi/default-pagesize-16k.patch b/apple-silicon-support/packages/linux-asahi/default-pagesize-16k.patch similarity index 100% rename from packages/linux-asahi/default-pagesize-16k.patch rename to apple-silicon-support/packages/linux-asahi/default-pagesize-16k.patch diff --git a/packages/linux-asahi/default.nix b/apple-silicon-support/packages/linux-asahi/default.nix similarity index 100% rename from packages/linux-asahi/default.nix rename to apple-silicon-support/packages/linux-asahi/default.nix diff --git a/packages/linux-asahi/sven-iommu-4k.patch b/apple-silicon-support/packages/linux-asahi/sven-iommu-4k.patch similarity index 100% rename from packages/linux-asahi/sven-iommu-4k.patch rename to apple-silicon-support/packages/linux-asahi/sven-iommu-4k.patch diff --git a/packages/m1n1/default.nix b/apple-silicon-support/packages/m1n1/default.nix similarity index 100% rename from packages/m1n1/default.nix rename to apple-silicon-support/packages/m1n1/default.nix diff --git a/packages/mesa-asahi-edge/default.nix b/apple-silicon-support/packages/mesa-asahi-edge/default.nix similarity index 100% rename from packages/mesa-asahi-edge/default.nix rename to apple-silicon-support/packages/mesa-asahi-edge/default.nix diff --git a/packages/overlay.nix b/apple-silicon-support/packages/overlay.nix similarity index 100% rename from packages/overlay.nix rename to apple-silicon-support/packages/overlay.nix diff --git a/packages/uboot-asahi/default.nix b/apple-silicon-support/packages/uboot-asahi/default.nix similarity index 100% rename from packages/uboot-asahi/default.nix rename to apple-silicon-support/packages/uboot-asahi/default.nix diff --git a/flake.nix b/flake.nix index 509c31db..e3d2854f 100644 --- a/flake.nix +++ b/flake.nix @@ -23,12 +23,12 @@ in { overlays = rec { - asahi-overlay = import packages/overlay.nix; + asahi-overlay = import ./apple-silicon-support/packages/overlay.nix; default = asahi-overlay; }; nixosModules = rec { - m1-support = ./nixos-module; + m1-support = ./apple-silicon-support; default = m1-support; }; diff --git a/iso-configuration/default.nix b/iso-configuration/default.nix index cd99a406..958fe0b0 100644 --- a/iso-configuration/default.nix +++ b/iso-configuration/default.nix @@ -3,7 +3,7 @@ { imports = [ ./installer-configuration.nix - ../nixos-module + ../apple-silicon-support ]; # include those modules so the user can rebuild the install iso. that's not @@ -11,7 +11,7 @@ # directory for their own config. installer.cloneConfigIncludes = [ "./installer-configuration.nix" - "./m1-support/nixos-module" + "./apple-silicon-support" ]; # copy the m1-support and installer configs into the iso @@ -19,7 +19,7 @@ if ! [ -e /etc/nixos/m1-support ]; then mkdir -p /etc/nixos/m1-support cp ${./installer-configuration.nix} /etc/nixos/installer-configuration.nix - cp -r ${../packages} ${../nixos-module} -t /etc/nixos/m1-support + cp -rT ${../apple-silicon-support} /etc/nixos/apple-silicon-support fi ''; }