1 files changed, 29 insertions, 33 deletions

diff --git a/hosts/local/master/keyboard.nix b/hosts/local/master/keyboard.nix
index 215d05f..852f084 100644
--- a/hosts/local/master/keyboard.nix
+++ b/hosts/local/master/keyboard.nix
@@ -1,46 +1,42 @@
-{ config, lib, pkgs, ... }:
-
-{
- services.logind.extraConfig = ''
+{pkgs, ...}: {
+  services.logind.extraConfig = ''
     # don’t shutdown when power button is short-pressed
     HandlePowerKey=ignore
   '';
 
-# config file keeps getting rewritten but I don't know by who
- # i18n.inputMethod = {
- #   enabled = "fcitx5";
- #   fcitx5.addons = with pkgs; [
- #     fcitx5-mozc
- #     # mozc-ut is better, wat do
- #     fcitx5-gtk
- #     libsForQt5.fcitx5-qt
- #     fcitx5-lua
- #     fcitx5-configtool
- #     fcitx5-rime
- #   ];
- # };
+  # config file keeps getting rewritten but I don't know by who
+  i18n.inputMethod = {
+    enable = true;
+    type = "fcitx5";
+    fcitx5.addons = with pkgs; [
+      fcitx5-mozc
+      # mozc-ut is better, wat do
+      fcitx5-gtk
+      libsForQt5.fcitx5-qt
+      fcitx5-lua
+      fcitx5-configtool
+      fcitx5-rime
+    ];
+  };
   environment.variables = {
     GTK_IM_MODULE = "fcitx";
-    QT_IM_MODULE  = "fcitx";
+    QT_IM_MODULE = "fcitx";
     XMODIFIERS = "@im=fcitx";
     FCITX_SOCKET = "default";
   };
 
-
- #kmonad
-    services.kmonad ={
-      enable = true;
-
-      keyboards.internal = {
-        device = "/dev/input/by-id/usb-Compx_2.4G_Receiver-event-kbd";
-        config = builtins.readFile ./compx.kbd;
-        # device = "/dev/input/by-id/usb-RAPOO_Rapoo_2.4G_Wireless_Device-if02-event-kbd";
-        # config = builtins.readFile ./rapoo.kbd;
-
-       # defcfg = {
-       #   enable = true;
-       #   fallthrough = true;
-      #  };
+  #kmonad
+  services.kmonad = {
+    enable = true;
+    keyboards = {
+      wirelessThinkpad = {
+        device = "/dev/input/by-id/usb-Lenovo_TrackPoint_Keyboard_II-event-kbd";
+        config = builtins.readFile ./thinkpad.kbd;
+      };
+      wiredThinkpad = {
+        device = "/dev/input/by-id/usb-Lenovo_ThinkPad_Compact_USB_Keyboard_with_TrackPoint-event-kbd";
+        config = builtins.readFile ./thinkpad.kbd;
       };
     };
+  };
 }