From 03a4d4f4b87bfc4f8cb2e992edfcb5becc0aec03 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Sun, 2 Jan 2022 16:37:05 -0500
Subject: [PATCH] enable rpi4 hardware

---
 flake.lock                   | 16 ++++++++++++++++
 flake.nix                    |  8 ++++++--
 lib/deploy.nix               |  1 +
 modules/profiles/desktop.nix |  2 ++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index fca86d5..cb73594 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,20 @@
 {
   "nodes": {
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1640686209,
+        "narHash": "sha256-6glXUlKRDhEhNuYx6r3fXU6KH2/Vq9mJZjB9oUpwrmc=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "46df95ca81e7e4cf3458cdb4b7d1714b5fce9da5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1640798027,
@@ -17,6 +32,7 @@
     },
     "root": {
       "inputs": {
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
     }
diff --git a/flake.nix b/flake.nix
index c01eb82..1cfa686 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,12 +1,16 @@
 {
   inputs.nixpkgs.url = "nixpkgs/nixos-21.11";
+  inputs.nixos-hardware.url = "github:NixOS/nixos-hardware";
 
-  outputs = { self, nixpkgs, ... }:
+  outputs = { self, nixpkgs, nixos-hardware, ... }:
     let
 
       mypkgs = import ./pkgs;
       deploy = import lib/deploy.nix;
-      hardware = import lib/hardware.nix "${nixpkgs}/nixos/modules";
+
+      hardware =
+        nixos-hardware.nixosModules //
+        import lib/hardware.nix "${nixpkgs}/nixos/modules";
 
       forAllSystems = f: builtins.listToAttrs (map
         (name: { inherit name; value = f name; })
diff --git a/lib/deploy.nix b/lib/deploy.nix
index 72ae979..315c140 100644
--- a/lib/deploy.nix
+++ b/lib/deploy.nix
@@ -95,6 +95,7 @@ in
     { meta.nixpkgs = nixpkgs.legacyPackages.${system}; } //
     builtins.mapAttrs
       (name: value: {
+        nixpkgs.system = value.config.nixpkgs.system; # needed for multi-arch deployments
         imports = value.extraArgs.modules ++ [
           ({ config, ... }: { inherit (config.sconfig) deployment; })
         ];
diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index f7ac954..2b69957 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -106,6 +106,8 @@ with lib;
 
     boot.kernelPackages = pkgs.linuxPackages_5_15;
 
+    boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
+
     boot.loader.timeout =
       if config.boot.loader.systemd-boot.enable
       then null else lib.mkOverride 9999 99;