reorganize nixos module

use `apple-silicon-support/modules` and `apple-silicon-support/packages`
tpwrules · Jan 24, 2023 · e87a34e · e87a34e
1 parent 74112e2
commit e87a34e
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 5 deletions.
diff --git a/apple-silicon-support/default.nix b/apple-silicon-support/default.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  imports = [
+    ./modules/default.nix
+  ];
+}
diff --git a/nixos-module/boot-m1n1/default.nix → ...con-support/modules/boot-m1n1/default.nix b/nixos-module/boot-m1n1/default.nix → ...con-support/modules/boot-m1n1/default.nix
diff --git a/nixos-module/default.nix → apple-silicon-support/modules/default.nix b/nixos-module/default.nix → apple-silicon-support/modules/default.nix
diff --git a/nixos-module/kernel/default.nix → ...ilicon-support/modules/kernel/default.nix b/nixos-module/kernel/default.nix → ...ilicon-support/modules/kernel/default.nix
diff --git a/nixos-module/kernel/edge.nix → ...e-silicon-support/modules/kernel/edge.nix b/nixos-module/kernel/edge.nix → ...e-silicon-support/modules/kernel/edge.nix
diff --git a/nixos-module/mesa/default.nix → ...-silicon-support/modules/mesa/default.nix b/nixos-module/mesa/default.nix → ...-silicon-support/modules/mesa/default.nix
diff --git a/nixos-module/peripheral-firmware/default.nix → ...t/modules/peripheral-firmware/default.nix b/nixos-module/peripheral-firmware/default.nix → ...t/modules/peripheral-firmware/default.nix
diff --git a/...ges/asahi-fwextract/add_entry_point.patch → ...ges/asahi-fwextract/add_entry_point.patch b/...ges/asahi-fwextract/add_entry_point.patch → ...ges/asahi-fwextract/add_entry_point.patch
diff --git a/packages/asahi-fwextract/default.nix → ...port/packages/asahi-fwextract/default.nix b/packages/asahi-fwextract/default.nix → ...port/packages/asahi-fwextract/default.nix
diff --git a/packages/linux-asahi/config → ...licon-support/packages/linux-asahi/config b/packages/linux-asahi/config → ...licon-support/packages/linux-asahi/config
diff --git a/...es/linux-asahi/default-pagesize-16k.patch → ...es/linux-asahi/default-pagesize-16k.patch b/...es/linux-asahi/default-pagesize-16k.patch → ...es/linux-asahi/default-pagesize-16k.patch
diff --git a/packages/linux-asahi/default.nix → ...-support/packages/linux-asahi/default.nix b/packages/linux-asahi/default.nix → ...-support/packages/linux-asahi/default.nix
diff --git a/packages/linux-asahi/sven-iommu-4k.patch → .../packages/linux-asahi/sven-iommu-4k.patch b/packages/linux-asahi/sven-iommu-4k.patch → .../packages/linux-asahi/sven-iommu-4k.patch
diff --git a/packages/m1n1/default.nix → ...silicon-support/packages/m1n1/default.nix b/packages/m1n1/default.nix → ...silicon-support/packages/m1n1/default.nix
diff --git a/packages/mesa-asahi-edge/default.nix → ...port/packages/mesa-asahi-edge/default.nix b/packages/mesa-asahi-edge/default.nix → ...port/packages/mesa-asahi-edge/default.nix
diff --git a/packages/overlay.nix → apple-silicon-support/packages/overlay.nix b/packages/overlay.nix → apple-silicon-support/packages/overlay.nix
diff --git a/packages/uboot-asahi/default.nix → ...-support/packages/uboot-asahi/default.nix b/packages/uboot-asahi/default.nix → ...-support/packages/uboot-asahi/default.nix
diff --git 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
@@ -3,23 +3,23 @@
 {
   imports = [
     ./installer-configuration.nix
-    ../nixos-module
+    ../apple-silicon-support
   ];
 
   # include those modules so the user can rebuild the install iso. that's not
   # especially useful at this point, but the user will need the m1-support
   # 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
   boot.postBootCommands = lib.optionalString config.installer.cloneConfig ''
     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
   '';
 }