From f155382789171617e350a20053e6892c2917ba4d Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Sun, 5 Nov 2023 13:09:34 +0100
Subject: [PATCH] Make nix config evaluate on m1

---
 home/macbook-nixos.nix           | 2 +-
 kagami-air-m1/configuration.nix  | 2 ++
 modules/common/linux/default.nix | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/home/macbook-nixos.nix b/home/macbook-nixos.nix
index a0e57fa..1f96203 100644
--- a/home/macbook-nixos.nix
+++ b/home/macbook-nixos.nix
@@ -2,7 +2,7 @@
 
 let
   discord =
-    (pkgs.armcord.override { nss = pkgs.nss_latest; }).overrideAttrs (attrs: {
+    (pkgs.unstable.armcord.override { nss = pkgs.nss_latest; mesa = pkgs.mesa; }).overrideAttrs (attrs: {
       postInstall = ''
         # Wrap the startup command
         makeWrapper $out/opt/ArmCord/armcord $out/bin/armcord \
diff --git a/kagami-air-m1/configuration.nix b/kagami-air-m1/configuration.nix
index 42fbfba..35fb2ca 100644
--- a/kagami-air-m1/configuration.nix
+++ b/kagami-air-m1/configuration.nix
@@ -28,6 +28,8 @@
     useExperimentalGPUDriver = true;
     experimentalGPUInstallMode = "overlay";
   };
+  ## Additional mesa-related packages
+  environment.systemPackages = with pkgs; [ SDL2 ];
 
   # Power Management
   services.upower = {
diff --git a/modules/common/linux/default.nix b/modules/common/linux/default.nix
index 668068e..dff1f29 100644
--- a/modules/common/linux/default.nix
+++ b/modules/common/linux/default.nix
@@ -26,7 +26,7 @@ let
       };
     };
 
-    accounts = { pkgs, ... }: mkIf config.common.linux.enable {
+    accounts = { pkgs, ... }: mkIf (config.common.linux.enable && !pkgs.stdenv.isAarch64) {
       environment.systemPackages = with pkgs.gnome; [ pkgs.glib gnome-control-center ];
       services.accounts-daemon.enable = true;
       services.gnome.gnome-online-accounts.enable = true;