diff --git a/hosts/dunamis/configuration.nix b/hosts/dunamis/configuration.nix
index e1ee9c1..3e8911f 100644
--- a/hosts/dunamis/configuration.nix
+++ b/hosts/dunamis/configuration.nix
@@ -27,6 +27,7 @@
     config = {
       secureBoot = true;
       tpmDiskUnlock = true;
+      vaapi = "intel-media-driver";
     };
     stylix = {
       enable = true;
diff --git a/hosts/eldrid/configuration.nix b/hosts/eldrid/configuration.nix
index fa2128c..37650c1 100644
--- a/hosts/eldrid/configuration.nix
+++ b/hosts/eldrid/configuration.nix
@@ -22,6 +22,7 @@
     config = {
       secureBoot = true;
       useIwd = true;
+      vaapi = "intel-media-driver";
     };
     stylix = {
       enable = true;
diff --git a/hosts/sarien/configuration.nix b/hosts/sarien/configuration.nix
index 024b08b..6f9c755 100644
--- a/hosts/sarien/configuration.nix
+++ b/hosts/sarien/configuration.nix
@@ -14,6 +14,7 @@
     hostName = "sarien";
   };
 
+  boot.loader.systemd-boot.enable = true;
   environment.memoryAllocator.provider = "mimalloc";
   system.stateVersion = "25.05";
   time.timeZone = "Europe/Kyiv";
@@ -23,6 +24,7 @@
   module = {
     config = {
       useIwd = true;
+      vaapi = "intel-media-driver";
     };
     stylix = {
       enable = true;
diff --git a/modules/nixos/config/default.nix b/modules/nixos/config/default.nix
index fc0d2b8..3d231ce 100644
--- a/modules/nixos/config/default.nix
+++ b/modules/nixos/config/default.nix
@@ -6,7 +6,6 @@
   ...
 }: let
   inherit (lib) mkDefault mkEnableOption mkIf;
-  inherit (config.networking) hostName;
   cfg = config.module.config;
 in {
   imports = [
@@ -25,33 +24,27 @@ in {
       secureBoot = mkEnableOption "set if secure boot is configured";
       useIwd = mkEnableOption "set to use iwd instead of wpa-supplicant";
       vaapi = lib.mkOption {
-        type = lib.types.enum ["intel-media-driver"];
-        default = "intel-media-driver";
+        type = lib.types.nullOr (lib.types.enum ["intel-media-driver"]);
+        default = null;
       };
     };
   };
-  config =
-    mkIf (cfg.vaapi
-      == "intel-media-driver") {
+  config = lib.mkMerge [
+    (mkIf cfg.tpmDiskUnlock {
+      boot.initrd.systemd.tpm2.enable = mkDefault true;
+    })
+    (mkIf cfg.useIwd {
+      networking = {
+        networkmanager.wifi.backend = "iwd";
+        wireless.iwd.enable = true;
+      };
+    })
+    (mkIf (cfg.vaapi == "intel-media-driver") {
       hardware.graphics.extraPackages = with pkgs; [
         intel-compute-runtime
         intel-media-driver
         vpl-gpu-rt
       ];
-    }
-    // mkIf cfg.tpmDiskUnlock {
-      initrd.systemd.tpm2.enable = mkDefault true;
-    }
-    // mkIf cfg.useIwd {
-      networking = {
-        networkmanager.wifi.backend = "iwd";
-        wireless.iwd.enable = true;
-      };
-    }
-    // {
-      boot.loader.systemd-boot.enable =
-        if cfg.secureBoot
-        then false
-        else true;
-    };
+    })
+  ];
 }
diff --git a/modules/nixos/config/networking/default.nix b/modules/nixos/config/networking/default.nix
index 9bb532f..3d78438 100644
--- a/modules/nixos/config/networking/default.nix
+++ b/modules/nixos/config/networking/default.nix
@@ -8,7 +8,7 @@
         scanRandMacAddress = true;
       };
     };
-    wireless.iwd.settings = {
+    wireless.iwd = {
       settings = {
         General.AddressRandomization = "network";
         Settings.AlwaysRandomizeAddress = true;