feat: add pandora host

flake.nix

@@ -1,7 +1,10 @@
 {
   description = "Consequence of allowing autistic people on the internet. Stay mad one-proper-config-structure purists :3";
 
-  outputs = inputs @ {flake-parts, ...}:
+  outputs = inputs @ {flake-parts, ...}: let
+    theme = import ./theme;
+    user = import ./user theme;
+  in
     flake-parts.lib.mkFlake {inherit inputs;} {
       flake = {
         nixosModules =
@@ -10,11 +13,7 @@
             # it's just so I can easily avoid ../../../../../ mess
             system = import ./system;
 
-            user = let
-              theme = import ./theme;
-              user = import ./user {inherit theme;};
-            in
-              user.module;
+            user = user.module;
 
             # place for my home brew modules
           }
@@ -25,15 +24,10 @@
         "x86_64-linux"
         "aarch64-linux"
       ];
-      perSystem = {pkgs, ...}: let
-        theme = import ./theme;
-        user = import ./user {
-          inherit pkgs theme;
-        };
-      in {
+      perSystem = {pkgs, ...}: {
         formatter = pkgs.alejandra;
-        packages = user.packages;
-        devShells.default = user.shell;
+        packages = user.packages pkgs;
+        devShells.default = user.shell pkgs;
       };
     };
 

hosts/calypso/default.nix

@@ -5,18 +5,46 @@
   ...
 }: {
   imports = [(modulesPath + "/installer/scan/not-detected.nix")];
-  boot.initrd.availableKernelModules =
-    [
-      "xhci_pci"
-      "ahci"
-      "usbhid"
-      "sd_mod"
-      "dm_mod"
-      "dm_crypt"
-      "cryptd"
-      "input_leds"
-    ]
-    ++ config.boot.initrd.luks.cryptoModules;
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+        memtest86.enable = true;
+        configurationLimit = 10;
+        editor = false;
+      };
+      # spam space to get to boot menu
+      timeout = 0;
+    };
+    loader.efi.canTouchEfiVariables = true;
+
+    kernelPackages = pkgs.linuxPackages_xanmod_latest;
+    kernelParams = [
+      # fix for suspend issues
+      # see: https://www.reddit.com/r/archlinux/comments/e5oe4p/comment/fa8mzft/
+      "snd_hda_intel.dmic_detect=0"
+      "acpi_osi=linux"
+      "nowatchdog"
+    ];
+    initrd.availableKernelModules =
+      [
+        "xhci_pci"
+        "ahci"
+        "usbhid"
+        "sd_mod"
+        "dm_mod"
+        "dm_crypt"
+        "cryptd"
+        "input_leds"
+      ]
+      ++ config.boot.initrd.luks.cryptoModules;
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-label/NIXBOOT";
+    fsType = "vfat";
+    options = ["noatime" "discard"];
+  };
 
   # For some reason my mic light indicator refuses to turn off on its own
   # it may not be a perfect solution, but it works
@@ -32,5 +60,17 @@
   };
 
   hardware.cpu.intel.updateMicrocode = true;
+  hardware.graphics.extraPackages = builtins.attrValues {
+    inherit
+      (pkgs)
+      vaapiIntel
+      libva
+      libvdpau-va-gl
+      vaapiVdpau
+      ocl-icd
+      intel-compute-runtime
+      ;
+  };
+
   hardware.laptop.enable = true;
 }

hosts/default.nix

@@ -24,4 +24,5 @@
     };
 in {
   calypso = mkHost "calypso" "x86_64-linux";
+  pandora = mkHost "pandora" "aarch64-linux";
 }

hosts/pandora/default.nix

@@ -0,0 +1,50 @@
+{
+  modulesPath,
+  lib,
+  inputs,
+  ...
+}: {
+  imports = [
+    inputs.apple-silicon-support.nixosModules.apple-silicon-support
+
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
+
+  boot.kernelPatches = [
+    {
+      name = "edge-config";
+      patch = null;
+      # derived from
+      # https://github.com/AsahiLinux/PKGBUILDs/blob/stable/linux-asahi/config.edge
+      extraConfig = ''
+        DRM_SIMPLEDRM_BACKLIGHT n
+        BACKLIGHT_GPIO n
+        DRM_APPLE m
+        APPLE_SMC m
+        APPLE_SMC_RTKIT m
+        APPLE_RTKIT m
+        APPLE_MBOX m
+        GPIO_MACSMC m
+        DRM_VGEM n
+        DRM_SCHED y
+        DRM_GEM_SHMEM_HELPER y
+        DRM_ASAHI m
+        SUSPEND y
+      '';
+    }
+  ];
+
+  hardware.asahi = {
+    enable = true;
+    extractPeripheralFirmware = true;
+    peripheralFirmwareDirectory = ./firmware;
+    withRust = true;
+    useExperimentalGPUDriver = true;
+    experimentalGPUInstallMode = "replace";
+  };
+
+  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
+
+  boot.initrd.availableKernelModules = ["usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.kernelModules = ["usbhid" "dm-snapshot"];
+}

system/boot/default.nix

@@ -1,33 +1,8 @@
 {pkgs, ...}: {
   boot = {
-    tmp = {
-      cleanOnBoot = true;
-      useTmpfs = true;
-    };
     initrd = {
       verbose = false;
       systemd.enable = true;
     };
-    kernelPackages = pkgs.linuxPackages_xanmod_latest;
-    kernelParams = [
-      # fix for suspend issues
-      # see: https://www.reddit.com/r/archlinux/comments/e5oe4p/comment/fa8mzft/
-      "snd_hda_intel.dmic_detect=0"
-      "acpi_osi=linux"
-      "nowatchdog"
-    ];
-
-    bootspec.enable = true;
-    loader = {
-      systemd-boot = {
-        enable = true;
-        memtest86.enable = true;
-        configurationLimit = 10;
-        editor = false;
-      };
-      # spam space to get to boot menu
-      timeout = 0;
-    };
-    loader.efi.canTouchEfiVariables = true;
   };
 }

system/disks/default.nix

@@ -19,7 +19,9 @@
   fileSystems."/" = {
     device = "none";
     fsType = "tmpfs";
-    options = ["size=8G" "mode=755"];
+    # if you need more than 1GB for root then
+    # you are doing something wrong
+    options = ["size=1G" "mode=755"];
   };
 
   fileSystems."/nix" = {
@@ -29,6 +31,12 @@
     options = ["noatime" "discard" "subvol=@nix" "compress=zstd"];
   };
 
+  fileSystems."/tmp" = {
+    device = "/dev/disk/by-label/NIXROOT";
+    fsType = "btrfs";
+    options = ["noatime" "discard" "subvol=@tmp"];
+  };
+
   fileSystems."/persist" = {
     neededForBoot = true;
     device = "/dev/disk/by-label/NIXROOT";
@@ -43,16 +51,11 @@
     options = ["noatime" "discard" "subvol=@home" "compress=zstd"];
   };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-label/NIXBOOT";
-    fsType = "vfat";
-    options = ["noatime" "discard"];
-  };
-
   #  btrfs filesystem mkswapfile --size 16g --uuid clear /persist/swap
   swapDevices = [
     {
       device = "/persist/swap";
+      size = 8 * 1024;
     }
   ];
 }

system/users/default.nix

@@ -1,12 +1,16 @@
-{flake, ...}: {
+{
+  flake,
+  pkgs,
+  ...
+}: {
   users = {
     mutableUsers = false;
     users = {
       root.hashedPasswordFile = "/persist/secrets/root";
       sioodmy = {
         isNormalUser = true;
         homix = true;
-        shell = flake.packages.x86_64-linux.cli.zsh;
+        # shell = flake.packages.${pkgs.system}.cli.zsh;
 
         hashedPasswordFile = "/persist/secrets/sioodmy";
         extraGroups = [

system/wayland/default.nix

@@ -1,20 +1,5 @@
-{pkgs, ...}: let
-  inherit (builtins) attrValues;
-in {
-  hardware.graphics = {
-    enable = true;
-    extraPackages = attrValues {
-      inherit
-        (pkgs)
-        vaapiIntel
-        libva
-        libvdpau-va-gl
-        vaapiVdpau
-        ocl-icd
-        intel-compute-runtime
-        ;
-    };
-  };
+{pkgs, ...}: {
+  hardware.graphics.enable = true;
 
   systemd.services = {
     seatd = {

user/default.nix

@@ -1,9 +1,5 @@
-{
-  pkgs,
-  theme,
-  ...
-}: rec {
-  packages = let
+theme: rec {
+  packages = pkgs: let
     inherit (pkgs) callPackage;
   in {
     cli =
@@ -21,14 +17,14 @@
     };
   };
 
-  shell = pkgs.mkShell {
-    name = "sioodmy-devshell";
-    buildInputs = builtins.attrValues packages.cli;
-  };
-
-  module = {
+  shell = pkgs:
+    pkgs.mkShell {
+      name = "sioodmy-devshell";
+      buildInputs = builtins.attrValues (packages pkgs).cli;
+    };
+  module = {pkgs, ...}: {
     config = {
-      environment.systemPackages = builtins.concatLists (map (x: builtins.attrValues x) (builtins.attrValues packages));
+      environment.systemPackages = builtins.concatLists (map (x: builtins.attrValues x) (builtins.attrValues (packages pkgs)));
     };
     imports = [
       ./packages.nix