From 5dd2b2282164f87a674f160da175afe472e1489b Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Fri, 30 May 2025 13:00:47 -0500
Subject: [PATCH] moved keyboard config to hardware.nix

---
 modules/nixos-modules/hardware.nix | 17 ++++++++++++++++-
 modules/nixos-modules/keyboard.nix | 12 ------------
 2 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 modules/nixos-modules/keyboard.nix

diff --git a/modules/nixos-modules/hardware.nix b/modules/nixos-modules/hardware.nix
index 1b22ece..8f4cc01 100644
--- a/modules/nixos-modules/hardware.nix
+++ b/modules/nixos-modules/hardware.nix
@@ -1,4 +1,9 @@
-{lib, ...}: {
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}: {
   options.host.hardware = {
     piperMouse = {
       enable = lib.mkEnableOption "host has a piper mouse";
@@ -16,4 +21,14 @@
       enable = lib.mkEnableOption "can a host be used on its own";
     };
   };
+  config = lib.mkMerge [
+    (lib.mkIf config.host.hardware.piperMouse.enable {
+      services.udev.packages = [pkgs.piper];
+    })
+    (lib.mkIf config.host.hardware.viaKeyboard.enable {
+      hardware.keyboard.qmk.enable = true;
+
+      services.udev.packages = [pkgs.via];
+    })
+  ];
 }
diff --git a/modules/nixos-modules/keyboard.nix b/modules/nixos-modules/keyboard.nix
deleted file mode 100644
index f820c48..0000000
--- a/modules/nixos-modules/keyboard.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: {
-  config = lib.mkIf config.host.hardware.viaKeyboard {
-    hardware.keyboard.qmk.enable = true;
-
-    services.udev.packages = [pkgs.via];
-  };
-}