From 73f3cdc3dc7c4cabf7c62ba2d63beac7e25a2072 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Sun, 8 Sep 2024 05:35:30 +0300
Subject: [PATCH] Vm : Extra fixes + disable keyd by default.

---
 host/x86_64-linux/dasha/default.nix   | 1 +
 host/x86_64-linux/desktop/default.nix | 2 +-
 host/x86_64-linux/home/default.nix    | 1 +
 host/x86_64-linux/laptop/default.nix  | 1 +
 host/x86_64-linux/work/default.nix    | 1 +
 module/Keyd.nix                       | 2 +-
 module/Vm.nix                         | 9 +++++++--
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/host/x86_64-linux/dasha/default.nix b/host/x86_64-linux/dasha/default.nix
index 3410385..ef55aa4 100644
--- a/host/x86_64-linux/dasha/default.nix
+++ b/host/x86_64-linux/dasha/default.nix
@@ -15,6 +15,7 @@
 		builder.client.enable = true;
 		desktop.sway.enable   = true;
 		kernel.enable         = true;
+		keyd.enable           = true;
 		print.enable          = true;
 		strongswan.enable     = true;
 		tablet.enable         = true;
diff --git a/host/x86_64-linux/desktop/default.nix b/host/x86_64-linux/desktop/default.nix
index b9f2728..cda5f4c 100644
--- a/host/x86_64-linux/desktop/default.nix
+++ b/host/x86_64-linux/desktop/default.nix
@@ -13,7 +13,7 @@
 		autoupdate.enable     = true;
 		builder.client.enable = true;
 		desktop.sway.enable   = true;
-		# ollama.enable         = true;
+		keyd.enable           = true;
 		print.enable          = true;
 		virtmanager.enable    = true;
 		amd = {
diff --git a/host/x86_64-linux/home/default.nix b/host/x86_64-linux/home/default.nix
index 65c9d0a..576eb51 100644
--- a/host/x86_64-linux/home/default.nix
+++ b/host/x86_64-linux/home/default.nix
@@ -18,6 +18,7 @@
 		builder.server.enable = true;
 		desktop.sway.enable   = true;
 		kernel.enable         = true;
+		keyd.enable           = true;
 		amd = {
 			cpu.enable = true;
 			gpu.enable = true;
diff --git a/host/x86_64-linux/laptop/default.nix b/host/x86_64-linux/laptop/default.nix
index a47dad4..2e37dc6 100644
--- a/host/x86_64-linux/laptop/default.nix
+++ b/host/x86_64-linux/laptop/default.nix
@@ -15,6 +15,7 @@
 		builder.client.enable = true;
 		desktop.sway.enable   = true;
 		kernel.enable         = true;
+		keyd.enable           = true;
 		print.enable          = true;
 		strongswan.enable     = true;
 		tablet.enable         = true;
diff --git a/host/x86_64-linux/work/default.nix b/host/x86_64-linux/work/default.nix
index bc523cd..5ceaa05 100644
--- a/host/x86_64-linux/work/default.nix
+++ b/host/x86_64-linux/work/default.nix
@@ -17,6 +17,7 @@
 		builder.client.enable      = true;
 		desktop.sway.enable        = true;
 		kernel.enable              = true;
+		keyd.enable           = true;
 		powerlimit.thinkpad.enable = true;
 		print.enable               = true;
 		intel.cpu = {
diff --git a/module/Keyd.nix b/module/Keyd.nix
index 485b19f..e9f4c04 100644
--- a/module/Keyd.nix
+++ b/module/Keyd.nix
@@ -3,7 +3,7 @@
 in {
 	options = {
 		module.keyd = {
-			enable = mkEnableOption "Keyboard remaps." // { default = true; };
+			enable = mkEnableOption "Keyboard remaps.";
 		};
 	};
 
diff --git a/module/Vm.nix b/module/Vm.nix
index 95675f5..0004558 100644
--- a/module/Vm.nix
+++ b/module/Vm.nix
@@ -1,7 +1,12 @@
-{ ... }: {
+{ lib, ... }: {
 	virtualisation.vmVariant = {
+		module = {
+			autoupdate.enable     = lib.mkForce false;
+			builder.client.enable = lib.mkForce false;
+			keyd.enable           = lib.mkForce false;
+		};
 		virtualisation = {
-			memorySize = 4 * 1024;
+			memorySize = 4  * 1024;
 			diskSize   = 20 * 1024;
 			cores      = 4;
 			restrictNetwork = false;