Merge branch 'main' into cosmic

hosts/vm-base.nix

@@ -1,19 +1,21 @@
-{ ... }:
+{ lib, modulesPath, ... }:
 
 {
   imports = [
-    ../nix-os/core.nix
-    ../nix-os/docker.nix
-    ../nix-os/desktopManagers/gnome.nix
-    ../nix-os/displayManagers/gdm.nix
-    #../nix-os/desktop/kde-plasma.nix
-    ../nix-os/shell.nix
-    ../nix-os/virtualization.nix
-    ../nix-os/polkit/disable-shutdown.nix
-    ../nix-os/locale.nix
-    ../nix-os/adb.nix
+    "${modulesPath}/virtualisation/qemu-vm.nix"
     ../nix-os/account.nix
-    ../nix-os/xdg-default-apps.nix
+    ../nix-os/core.nix
+    ../nix-os/locale.nix
+    ../nix-os/polkit/disable-shutdown.nix
+    ../nix-os/shell.nix
     ../nix-os/udev.nix
+    ../nix-os/xdg-default-apps.nix
   ];
-}
+
+  config = {
+    services.syncthing.enable = lib.mkForce false;
+    virtualisation = {
+      memorySize = 4096;
+    };
+  };
+}

hosts/vm-gnome.nix

@@ -0,0 +1,9 @@
+{ lib, ... }:
+
+{
+  imports = [
+    ./vm-base.nix
+    ../nix-os/desktopManagers/gnome.nix
+    ../nix-os/displayManagers/gdm.nix
+  ];
+}