From b073f895c138cbbb49ec21291b1245983146e8e7 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 31 Mar 2025 14:27:58 +0200 Subject: [PATCH 1/2] kanata: add laptop keyboard --- modules/services/kanata/main.kbd | 2 +- modules/services/kanata/module.nix | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/services/kanata/main.kbd b/modules/services/kanata/main.kbd index d448e22..bcdce85 100644 --- a/modules/services/kanata/main.kbd +++ b/modules/services/kanata/main.kbd @@ -1,4 +1,4 @@ -;; Source layer for my DasKeyboard 4 Professional +;; Source layer for my DasKeyboard 4 Professional and my Laptop (defsrc grv 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] diff --git a/modules/services/kanata/module.nix b/modules/services/kanata/module.nix index 8b3c748..7f6520f 100644 --- a/modules/services/kanata/module.nix +++ b/modules/services/kanata/module.nix @@ -1,7 +1,4 @@ -{ - ... -}: -{ +{...}: { services.kanata = { enable = true; @@ -9,5 +6,10 @@ devices = ["/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd"]; config = builtins.readFile (./. + "/main.kbd"); }; + + keyboards.laptop = { + devices = ["/dev/input/by-path/platform-i8042-serio-0-event-kbd"]; + config = builtins.readFile (./. + "/main.kbd"); + }; }; } From 29a82befe105837ec15ad233952ca92ee4b63cca Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 31 Mar 2025 14:28:30 +0200 Subject: [PATCH 2/2] hermit/programs.nix: add obsidian --- hosts/hermit/programs.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix index 1d33638..5047642 100644 --- a/hosts/hermit/programs.nix +++ b/hosts/hermit/programs.nix @@ -60,6 +60,7 @@ in { nicotine-plus nil nitch + obsidian swww microfetch nmap