diff --git a/nixos/machines/gw/default.nix b/nixos/machines/gw/default.nix
index 376374e..db09048 100644
--- a/nixos/machines/gw/default.nix
+++ b/nixos/machines/gw/default.nix
@@ -1,6 +1,3 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 {
   config,
   pkgs,
diff --git a/nixos/machines/metal/default.nix b/nixos/machines/metal/default.nix
index 5f3e7b2..e202fe3 100644
--- a/nixos/machines/metal/default.nix
+++ b/nixos/machines/metal/default.nix
@@ -44,29 +44,9 @@
       "rd.systemd.show_status=false"
     ];
     supportedFilesystems = ["ntfs"];
-
-    binfmt.registrations = {
-      DOSWin = {
-        interpreter = "${pkgs.wineWowPackages.waylandFull}/bin/wine64";
-        magicOrExtension = "MZ";
-        recognitionType = "magic";
-      };
-    };
   };
 
-  environment.systemPackages = [
-    config.boot.kernelPackages.perf
-    pkgs.wineWowPackages.waylandFull
-  ];
-
-  programs = {
-    adb.enable = true;
-    wireshark = {
-      enable = true;
-      package = pkgs.wireshark;
-    };
-  };
-  users.users.pbor.extraGroups = ["adbusers" "kvm" "wireshark"];
+  users.users.pbor.extraGroups = ["kvm"];
 
   powerManagement = {
     enable = true;
diff --git a/nixos/machines/metal/modules/default.nix b/nixos/machines/metal/modules/default.nix
index 4245435..bdccc2f 100644
--- a/nixos/machines/metal/modules/default.nix
+++ b/nixos/machines/metal/modules/default.nix
@@ -1,5 +1,7 @@
 {...}: {
   imports = [
+    ./devtools
     ./networking
+    ./wine
   ];
 }
diff --git a/nixos/machines/metal/modules/devtools/default.nix b/nixos/machines/metal/modules/devtools/default.nix
new file mode 100644
index 0000000..c2793e7
--- /dev/null
+++ b/nixos/machines/metal/modules/devtools/default.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = [
+    config.boot.kernelPackages.perf
+  ];
+
+  programs = {
+    adb.enable = true;
+    wireshark = {
+      enable = true;
+      package = pkgs.wireshark;
+    };
+  };
+  users.users.pbor.extraGroups = ["adbusers" "wireshark"];
+}
diff --git a/nixos/machines/metal/modules/wine/default.nix b/nixos/machines/metal/modules/wine/default.nix
new file mode 100644
index 0000000..3cb2f6c
--- /dev/null
+++ b/nixos/machines/metal/modules/wine/default.nix
@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  boot.binfmt.registrations = {
+    DOSWin = {
+      interpreter = "${pkgs.wineWowPackages.waylandFull}/bin/wine64";
+      magicOrExtension = "MZ";
+      recognitionType = "magic";
+    };
+  };
+  environment.systemPackages = [
+    pkgs.wineWowPackages.waylandFull
+  ];
+}