diff --git a/flake.nix b/flake.nix
index d376c07e..1a6e344d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,8 +48,6 @@
           ./system
           ./users/aly
           ./desktop/kde
-          ./modules/via-qmk
-          ./modules/logitech
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
@@ -74,8 +72,6 @@
           ./system
           ./users/aly
           ./desktop/gnome
-          ./modules/via-qmk
-          ./modules/logitech
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
@@ -101,8 +97,6 @@
           ./desktop/gnome
           ./modules/homelab
           ./modules/steam
-          ./modules/via-qmk
-          ./modules/logitech
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
@@ -122,8 +116,6 @@
           (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix")
           ./system
           ./desktop/gnome
-          ./modules/via-qmk
-          ./modules/logitech
 
           # Add managed flatpak module.
           nix-flatpak.nixosModules.nix-flatpak
diff --git a/modules/logitech/default.nix b/modules/logitech/default.nix
deleted file mode 100644
index 77798087..00000000
--- a/modules/logitech/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-    # Add support for logitech unifying receivers.
-    hardware.logitech.wireless.enable = true;
-    hardware.logitech.wireless.enableGraphical = true;
-}
diff --git a/modules/via-qmk/default.nix b/modules/via-qmk/default.nix
deleted file mode 100644
index 9c8a7a6b..00000000
--- a/modules/via-qmk/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  hardware.keyboard.qmk.enable = true;
-}
-
diff --git a/system/default.nix b/system/default.nix
index c3ded695..525af396 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -24,6 +24,13 @@
     LC_TIME = "en_US.UTF-8";
   };
 
+  # Add support for logitech unifying receivers.
+  hardware.logitech.wireless.enable = true;
+  hardware.logitech.wireless.enableGraphical = true;
+
+  # Add support for configuring QMK keyboards with Via.
+  hardware.keyboard.qmk.enable = true;
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;