make vm architecture agnostic

system/hosts/alien/default.nix

@@ -1,8 +1,6 @@
 {
   config,
   pkgs,
-  lib,
-  inputs,
   catppuccin,
   nix-cachyos-kernel,
   ...
@@ -10,8 +8,9 @@
   networking.hostName = "alien";
 
   environment.systemPackages = with pkgs; [
-    pkgs.ddcutil
-    pkgs.mangohud
+    ddcutil
+    mangohud
+    (bottles.override {removeWarningPopup = true;})
   ];
 
   # enable ddcutil

system/hosts/vm-aarch64/default.nix

@@ -1,31 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  catppuccin,
-  ...
-}: {
-  networking.hostName = "vm-aarch64";
-
-  boot.binfmt.emulatedSystems = [
-    "x86_64-linux"
-    "riscv64-linux"
-  ];
-
-  catppuccin.accent = "green";
-
-  home-manager.users.sckova = {
-    imports = [catppuccin.homeModules.catppuccin];
-  };
-
-  services.spice-vdagentd.enable = true;
-
-  virtualisation.vmVariant = {
-    virtualisation = {
-      memorySize = 8192;
-      cores = 6;
-    };
-  };
-
-  security.sudo.wheelNeedsPassword = false;
-}

system/hosts/vm-generic/default.nix

@@ -0,0 +1,32 @@
+{
+  config,
+  pkgs,
+  lib,
+  catppuccin,
+  ...
+}: {
+  networking.hostName = "vm";
+
+  # Enable emulation for architectures we're not currently running
+  boot.binfmt.emulatedSystems =
+    lib.optional (pkgs.stdenv.hostPlatform.system != "x86_64-linux") "x86_64-linux"
+    ++ lib.optional (pkgs.stdenv.hostPlatform.system != "aarch64-linux") "aarch64-linux"
+    ++ lib.optional (pkgs.stdenv.hostPlatform.system != "riscv64-linux") "riscv64-linux";
+
+  catppuccin.accent = "green";
+
+  home-manager.users.sckova = {
+    imports = [catppuccin.homeModules.catppuccin];
+  };
+
+  services.spice-vdagentd.enable = true;
+
+  virtualisation.vmVariant = {
+    virtualisation = {
+      memorySize = 8192;
+      cores = 6;
+    };
+  };
+
+  security.sudo.wheelNeedsPassword = false;
+}