From 3c66106017f3fe47ec379dafafdde6451ecae888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charlotte=20=F0=9F=A6=9D=20Delenk?= <lotte@chir.rs>
Date: Thu, 12 Jan 2023 14:21:58 +0100
Subject: [PATCH] Use x86_64-linux wine on all arches

---
 config/desktop.nix       | 18 +++++++++++++-----
 config/games/default.nix | 10 ++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/config/desktop.nix b/config/desktop.nix
index b53b4ae0..d07940b7 100644
--- a/config/desktop.nix
+++ b/config/desktop.nix
@@ -25,10 +25,10 @@ in {
     fontconfig = {
       enable = true;
       defaultFonts = {
-        emoji = [ "Noto Color Emoji" ];
-        monospace = [ "Fira Code" "Font Awesome 5 Free" ];
-        sansSerif = [ "Noto Sans" "Font Awesome 5 Free" ];
-        serif = [ "Noto Serif" "Font Awesome 5 Free" ];
+        emoji = ["Noto Color Emoji"];
+        monospace = ["Fira Code" "Font Awesome 5 Free"];
+        sansSerif = ["Noto Sans" "Font Awesome 5 Free"];
+        serif = ["Noto Serif" "Font Awesome 5 Free"];
       };
     };
     fonts = with pkgs; [
@@ -129,5 +129,13 @@ in {
   };
   security.polkit.enable = true;
   services.dbus.enable = true;
-  services.dbus.packages = with pkgs; [ dconf ];
+  services.dbus.packages = with pkgs; [dconf];
+  # Futureproofing: on non-x86 machines, emulate x86
+  boot.binfmt.emulatedSystems =
+    if system != "x86_64-linux"
+    then [
+      "x86_64-linux"
+      "i686-linux"
+    ]
+    else [];
 }
diff --git a/config/games/default.nix b/config/games/default.nix
index e6e01542..7e528f1a 100644
--- a/config/games/default.nix
+++ b/config/games/default.nix
@@ -1,9 +1,15 @@
-args: {pkgs, ...}: {
+args: {
+  pkgs,
+  nixpkgs,
+  ...
+}: let
+  x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";};
+in {
   imports = [
     (import ./grapejuice.nix args)
   ];
   home.packages = [
-    pkgs.wineWowPackages.staging
+    x86_64-linux-pkgs.wineWowPackages.staging
     pkgs.prismlauncher
   ];
 }