diff --git a/hosts/IROH/default.nix b/hosts/IROH/default.nix
index 5689d48..c765ed7 100755
--- a/hosts/IROH/default.nix
+++ b/hosts/IROH/default.nix
@@ -22,6 +22,7 @@
     bluetooth.enable = false;
     printing.enable = true;
     vpn.enable = true;
+    sync.enable = true;
 
     devenv.enable = true;
     virtualisation.enable = true;
diff --git a/hosts/T430/default.nix b/hosts/T430/default.nix
index df4e797..94121ba 100755
--- a/hosts/T430/default.nix
+++ b/hosts/T430/default.nix
@@ -22,6 +22,7 @@
     bluetooth.enable = true;
     printing.enable = true;
     vpn.enable = true;
+    sync.enable = true;
 
     devenv.enable = true;
     virtualisation.enable = true;
diff --git a/hosts/W530/default.nix b/hosts/W530/default.nix
index 724a8cb..b60e18c 100644
--- a/hosts/W530/default.nix
+++ b/hosts/W530/default.nix
@@ -1,6 +1,11 @@
-{ ... }: {
+{ ... }@inputs: {
 
-  imports = [ ./hardware.nix ];
+  imports = [
+    ./hardware.nix
+    inputs.nixos-hardware.nixosModules.common-pc-laptop
+    inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call
+    inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
+  ];
 
   networking.hostName = "W530";
 
@@ -8,14 +13,15 @@
 
     gui = {
       enable = true;
-      greeter.enable = true;
-      flavour = [ "sway" "i3" ];
+      greeter.enable = false;
+      flavour = [ "sway" ];
     };
     nvidia.enable = false;
     audio.enable = true;
     bluetooth.enable = true;
     printing.enable = true;
     vpn.enable = true;
+    sync.enable = false;
 
     devenv.enable = true;
     virtualisation.enable = true;
diff --git a/hosts/W530/hardware.nix b/hosts/W530/hardware.nix
index dc90c8f..adee462 100644
--- a/hosts/W530/hardware.nix
+++ b/hosts/W530/hardware.nix
@@ -1,15 +1,9 @@
 { config, lib, modulesPath, ... }:
 
 {
-  imports =
-    [
-      (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
diff --git a/modules/default.nix b/modules/default.nix
index fe401e4..c363667 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -38,6 +38,10 @@
       enable = mkEnableOption "vpn";
     };
 
+    sync = {
+      enable = mkEnableOption "sync";
+    };
+
     devenv = {
       enable = mkEnableOption "devenv";
     };
diff --git a/modules/syncthing.nix b/modules/syncthing.nix
index 4dd3256..636e96b 100644
--- a/modules/syncthing.nix
+++ b/modules/syncthing.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ lib, config, ... }: lib.mkIf config.bchmnn.sync.enable {
 
   services.syncthing = {
     enable = true;
diff --git a/modules/vpn.nix b/modules/vpn.nix
index 3f49d86..5871669 100644
--- a/modules/vpn.nix
+++ b/modules/vpn.nix
@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }: lib. mkIf config.bchmnn.vpn.enable {
+{ pkgs, lib, config, ... }: lib.mkIf config.bchmnn.vpn.enable {
 
   environment.systemPackages = with pkgs; [
     openvpn3