add vm-aarch64

flake.nix

@@ -114,7 +114,7 @@
   in
     {
       nixosConfigurations = {
-        vm = nixpkgs.lib.nixosSystem {
+        vm-x86_64 = nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             {nixpkgs.overlays = overlays;}
@@ -125,6 +125,17 @@
           specialArgs = {inherit myData;} // inputs;
         };
 
+        vm-aarch64 = nixpkgs.lib.nixosSystem {
+          system = "aarch64-linux";
+          modules = [
+            {nixpkgs.overlays = overlays;}
+            home-manager.nixosModules.home-manager
+            ./hosts/vm/configuration.nix
+            ./modules
+          ];
+          specialArgs = {inherit myData;} // inputs;
+        };
+
         op5p = nixpkgs.lib.nixosSystem {
           system = "aarch64-linux";
           modules = [

modules/profiles/desktop/default.nix

@@ -4,6 +4,10 @@
   ...
 }: let
   username = config.mj.username;
+  firefox =
+    if (pkgs.stdenv.hostPlatform.system == "x86_64-linux")
+    then pkgs.firefox-bin
+    else pkgs.firefox;
 in {
   config = {
     hardware.bluetooth = {
@@ -14,7 +18,7 @@ in {
     programs = {
       firefox = {
         enable = true;
-        package = pkgs.firefox-bin;
+        package = firefox;
       };
       wireshark.enable = true;
     };
@@ -109,14 +113,15 @@ in {
       };
     };
 
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs;
+      lib.mkMerge [
+        [
           # packages defined here
           nicer
           tmuxbash
 
           iw
           vlc
-      i7z
           acpi
           gimp
           qgis
@@ -164,7 +169,6 @@ in {
           shellcheck
           borgbackup
           efibootmgr
-      winetricks
           virtualenv
           python3Full
           libva-utils # intel video tests
@@ -173,18 +177,15 @@ in {
           poppler_utils
           rkdeveloptool
           squashfsTools
-      google-chrome
           aspellDicts.en
           aspellDicts.lt
           libreoffice-qt
           graphicsmagick
-      joplin-desktop
           signal-desktop
           element-desktop
           netsurf-browser
           man-pages-posix
           geoipWithDatabase
-      wineWowPackages.full
           hunspellDicts.en_US
           python3Packages.ipython
           samsung-unified-linux-driver
@@ -204,14 +205,6 @@ in {
           xorg.xeyes
           xorg.lndir
 
-      intel-gpu-tools
-      (nvtop.override {
-        amd = true;
-        intel = true;
-        msm = false;
-        nvidia = false;
-      })
-
           (texlive.combine {
             inherit
               (texlive)
@@ -227,6 +220,22 @@ in {
               hyphen-lithuanian
               ;
           })
+        ]
+        (lib.mkIf (pkgs.stdenv.hostPlatform.system == "x86_64-linux") [
+          i7z
+          (nvtop.override {
+            amd = true;
+            intel = true;
+            msm = false;
+            nvidia = false;
+          })
+          google-chrome
+          joplin-desktop
+          intel-gpu-tools
+
+          winetricks
+          wineWowPackages.full
+        ])
       ];
 
     # https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-networkmanager-wait-online-service-failure/30746

shared/home/default.nix

@@ -94,8 +94,8 @@ in {
         # firefox doesn't need the wrapper on the personal laptop
         package =
           if hmOnly
-          then (glintel pkgs.firefox-bin "firefox")
-          else pkgs.firefox-bin;
+          then (glintel firefox "firefox")
+          else firefox;
         policies.DisableAppUpdate = true;
         profiles = {
           xdefault = {