diff --git a/hosts/cadmium/configuration.nix b/hosts/cadmium/configuration.nix
index 620fd71..32c1151 100644
--- a/hosts/cadmium/configuration.nix
+++ b/hosts/cadmium/configuration.nix
@@ -52,7 +52,6 @@
       sway.enable = true;
     };
     workstation.enable = true;
-    sdr.enable = true;
     libvirt.enable = true;
     autologin.enable = true;
     autologin.username = "jalr";
diff --git a/hosts/copper/configuration.nix b/hosts/copper/configuration.nix
index db715e2..d36934a 100644
--- a/hosts/copper/configuration.nix
+++ b/hosts/copper/configuration.nix
@@ -65,7 +65,6 @@
       sway.enable = true;
     };
     workstation.enable = true;
-    sdr.enable = true;
     libvirt.enable = true;
     autologin = {
       enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index 49b9b9d..ac459f1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -19,7 +19,6 @@
     ./bluetooth.nix
     ./bootloader
     ./debug.nix
-    ./dji-goggles.nix
     ./dns.nix
     ./esphome
     ./fish.nix
@@ -43,12 +42,11 @@
     ./podman.nix
     ./printers
     ./remarkable.nix
-    ./sdr.nix
     ./sshd.nix
     ./steelseries-nova-pro.nix
     ./sudo.nix
     ./sway.nix
-    ./udmx.nix
+    ./udev.nix
     ./uefi.nix
     ./unfree.nix
     ./upgrade-diff.nix
diff --git a/modules/dji-goggles.nix b/modules/dji-goggles.nix
deleted file mode 100644
index 951482a..0000000
--- a/modules/dji-goggles.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  services.udev.extraRules = ''
-    # DJI Goggles
-    SUBSYSTEM=="usb", ATTR{idVendor}=="2ca3", ATTR{idProduct}=="001f", MODE="0660", GROUP="plugdev"
-  '';
-}
diff --git a/modules/printers/default.nix b/modules/printers/default.nix
index 8692599..b207377 100644
--- a/modules/printers/default.nix
+++ b/modules/printers/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./hl3172cdw.nix
-    ./p-touch_p700.nix
   ];
   config = lib.mkIf config.jalr.gui.enable {
     # install virtual pdf printer
diff --git a/modules/printers/p-touch_p700.nix b/modules/printers/p-touch_p700.nix
deleted file mode 100644
index 07076b1..0000000
--- a/modules/printers/p-touch_p700.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  services.udev.extraRules = ''
-    SUBSYSTEM=="usb", ACTION=="add", ATTR{idVendor}=="04f9", ATTR{idProduct}=="2061", OWNER="root", GROUP="users", MODE="660"
-  '';
-}
diff --git a/modules/sdr.nix b/modules/sdr.nix
deleted file mode 100644
index a0b7686..0000000
--- a/modules/sdr.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-let
-  cfg = config.jalr;
-in
-{
-  options.jalr = {
-    sdr = {
-      enable = pkgs.lib.mkEnableOption "Enable software defined radio";
-    };
-  };
-  config = lib.mkIf cfg.sdr.enable {
-    services.udev.extraRules = ''
-      # rad10
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="cc15", GROUP="users", MODE="0660"
-      SUBSYSTEMS=="usb", ATTRS{idVendor}=="1d50", ATTRS{idProduct}=="6089", GROUP="users", MODE="0660"
-    '';
-  };
-}
diff --git a/modules/udev.nix b/modules/udev.nix
new file mode 100644
index 0000000..dc3a7e3
--- /dev/null
+++ b/modules/udev.nix
@@ -0,0 +1,22 @@
+let
+  usbDeviceRules = [
+    # rad10
+    { vendor = "1d50"; product = "cc15"; group = "users"; mode = "0660"; }
+    { vendor = "1d50"; product = "6089"; group = "users"; mode = "0660"; }
+
+    # DJI Goggles
+    { vendor = "2ca3"; product = "001f"; group = "plugdev"; mode = "0660"; }
+
+    # uDMX
+    { vendor = "16c0"; product = "05dc"; group = "users"; mode = "0660"; }
+
+    # Brother P-touch P700
+    { vendor = "04f9"; product = "2061"; group = "users"; mode = "0660"; }
+  ];
+
+  mkUsbRule = rule:
+    ''SUBSYSTEM=="usb", ATTR{idVendor}=="${rule.vendor}", ATTR{idProduct}=="${rule.product}", GROUP="${rule.group}", MODE="${rule.mode}"'';
+in
+{
+  services.udev.extraRules = builtins.concatStringsSep "\n" (map mkUsbRule usbDeviceRules);
+}
diff --git a/modules/udmx.nix b/modules/udmx.nix
deleted file mode 100644
index 3d7befe..0000000
--- a/modules/udmx.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  services.udev.extraRules = ''
-    # uDMX
-    SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="05dc", GROUP="users", MODE="0660"
-  '';
-}