From 4c6a95c84463ccd6c061d2e0ceef0a59b2a42ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 9 Feb 2024 16:40:10 +0100
Subject: [PATCH] drop unused mounts

---
 nixosModules/clanCore/vm.nix      | 29 +++++++++++++++++++----------
 pkgs/clan-cli/clan_cli/vms/run.py |  6 ++----
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/nixosModules/clanCore/vm.nix b/nixosModules/clanCore/vm.nix
index 46cea819e..cf98e1725 100644
--- a/nixosModules/clanCore/vm.nix
+++ b/nixosModules/clanCore/vm.nix
@@ -34,10 +34,16 @@ let
 
     boot.initrd.kernelModules = [ "virtiofs" ];
     virtualisation.writableStore = false;
-    virtualisation.fileSystems = {
+    virtualisation.fileSystems = lib.mkForce ({
+      "/" = {
+        device = "/dev/disk/by-label/nixos";
+        fsType = "ext4";
+        options = [ "defaults" "x-systemd.makefs" ];
+      };
       "/nix/store" = {
-        options = lib.mkForce [ "x-systemd.requires=systemd-modules-load.service" ];
-        fsType = lib.mkForce "virtiofs";
+        device = "nix-store";
+        options = [ "x-systemd.requires=systemd-modules-load.service" ];
+        fsType = "virtiofs";
       };
 
       "/vmstate" = {
@@ -46,18 +52,21 @@ let
         options = [ "x-systemd.makefs" ];
       };
 
-      ${config.clanCore.secretsUploadDirectory} = lib.mkForce {
+      ${config.clanCore.secretsUploadDirectory} = {
         device = "secrets";
         fsType = "9p";
         neededForBoot = true;
         options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
       };
-    } // lib.listToAttrs (map (folder:
-      lib.nameValuePair folder {
-        device = "/vmstate${folder}";
-        fsType = "none";
-        options = ["bind"];
-      }) stateFolders);
+
+    } // lib.listToAttrs (map
+      (folder:
+        lib.nameValuePair folder {
+          device = "/vmstate${folder}";
+          fsType = "none";
+          options = [ "bind" ];
+        })
+      stateFolders));
   };
 
   # We cannot simply merge the VM config into the current system config, because
diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py
index e3b1148e2..36ad1868a 100644
--- a/pkgs/clan-cli/clan_cli/vms/run.py
+++ b/pkgs/clan-cli/clan_cli/vms/run.py
@@ -119,10 +119,8 @@ def qemu_command(
         "-device", "virtio-rng-pci",
         "-netdev", "user,id=user.0",
         "-device", "virtio-net-pci,netdev=user.0,romfile=",
-        "-chardev", f"socket,id=char0,path={virtiofsd_socket}",
-        "-device", "vhost-user-fs-pci,chardev=char0,tag=nix-store",
-        "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=shared",
-        "-virtfs", f"local,path={xchg_dir},security_model=none,mount_tag=xchg",
+        "-chardev", f"socket,id=char1,path={virtiofsd_socket}",
+        "-device", "vhost-user-fs-pci,chardev=char1,tag=nix-store",
         "-virtfs", f"local,path={secrets_dir},security_model=none,mount_tag=secrets",
         "-drive", f"cache=writeback,file={rootfs_img},format=raw,id=drive1,if=none,index=1,werror=report",
         "-device", "virtio-blk-pci,bootindex=1,drive=drive1,serial=root",