From 5384cc05cd7f1ef5a0e5faf30fd98129d0b2e30b Mon Sep 17 00:00:00 2001
From: Yan Lin <github@yanlincs.com>
Date: Wed, 10 Sep 2025 01:26:33 +0200
Subject: [PATCH] Move keyboard config to macos default config

---
 hosts/darwin/system-default.nix | 19 ++++++++++++++++++-
 modules/keyboard.nix            | 22 ----------------------
 2 files changed, 18 insertions(+), 23 deletions(-)
 delete mode 100644 modules/keyboard.nix

diff --git a/hosts/darwin/system-default.nix b/hosts/darwin/system-default.nix
index 2a4301b..03d6045 100644
--- a/hosts/darwin/system-default.nix
+++ b/hosts/darwin/system-default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ../../modules/homebrew.nix
-    ../../modules/keyboard.nix
     nix-homebrew.darwinModules.nix-homebrew
   ];
 
@@ -52,4 +51,22 @@
     echo "Erasing existing Spotlight index..."
     sudo mdutil -E /
   '';
+
+  # Key remapping using hidutil via launchd agent
+  # This swaps Control and Caps Lock keys bidirectionally
+  launchd.user.agents.remap-keys = {
+    serviceConfig = {
+      ProgramArguments = [
+        "/usr/bin/hidutil"
+        "property"
+        "--set"
+        ''{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E0},{"HIDKeyboardModifierMappingSrc":0x7000000E0,"HIDKeyboardModifierMappingDst":0x700000039}]}''
+      ];
+      RunAtLoad = true;
+      KeepAlive = false;
+      Label = "org.nixos.remap-keys";
+      StandardErrorPath = "/tmp/remap-keys.err";
+      StandardOutPath = "/tmp/remap-keys.out";
+    };
+  };
 }
diff --git a/modules/keyboard.nix b/modules/keyboard.nix
deleted file mode 100644
index 331069b..0000000
--- a/modules/keyboard.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # Key remapping using hidutil via launchd agent
-  # This swaps Control and Caps Lock keys bidirectionally
-  
-  launchd.user.agents.remap-keys = {
-    serviceConfig = {
-      ProgramArguments = [
-        "/usr/bin/hidutil"
-        "property"
-        "--set"
-        ''{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E0},{"HIDKeyboardModifierMappingSrc":0x7000000E0,"HIDKeyboardModifierMappingDst":0x700000039}]}''
-      ];
-      RunAtLoad = true;
-      KeepAlive = false;
-      Label = "org.nixos.remap-keys";
-      StandardErrorPath = "/tmp/remap-keys.err";
-      StandardOutPath = "/tmp/remap-keys.out";
-    };
-  };
-}
\ No newline at end of file