More opt

modules/nixos/system/hw/boot/default.nix

@@ -1,12 +1,16 @@
-{ ... }: {
-  boot.loader = {
-    systemd-boot = {
-      enable = true;
-      configurationLimit = 8;
-    };
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
+{ lib, config, ... }:
+let isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+in {
+  config = lib.mkIf (!isCI) {
+    boot.loader = {
+      systemd-boot = {
+        enable = true;
+        configurationLimit = 8;
+      };
+      efi = {
+        canTouchEfiVariables = true;
+        efiSysMountPoint = "/boot/efi";
+      };
     };
   };
 }

modules/nixos/system/hw/power/default.nix

@@ -1,7 +1,5 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.syscfg.make.power;
-in {
-  config = lib.mkIf cfg {
+{ lib, config, pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.make.power) {
     services.tlp = {
       enable = true;
       settings = {

modules/nixos/system/hw/virt/default.nix

@@ -1,11 +1,9 @@
-{ lib, config, pkgs, ... }:
-let cfg = config.syscfg.make.virt;
-in {
-  config = lib.mkIf cfg {
+{ lib, config, pkgs, ... }: {
+  config = lib.mkIf (config.syscfg.make.virt) {
 
-    environment.systemPackages = [ pkgs.qemu ];
+    #environment.systemPackages = [ pkgs.qemu ];
     virtualisation = {
-      libvirtd.enable = true;
+      #libvirtd.enable = true;
       # waydroid.enable = true;
       # lxd.enable = true;
       docker = {