From 421450c8a91d6626a32f06591473c45e87ef8fd2 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 18 Feb 2025 17:37:55 -0500 Subject: [PATCH] updaing kanata settings --- flake.lock | 6 +++--- modules/home/niri.nix | 7 ++++--- modules/system/kanata.nix | 13 ++++++++----- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index c171795..35b5603 100644 --- a/flake.lock +++ b/flake.lock @@ -323,11 +323,11 @@ ] }, "locked": { - "lastModified": 1739907986, - "narHash": "sha256-Vo7LHigoL4VdIJt+rVaQEctBzWN5di1FUvygeLg141E=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a135aae1be749a10227413f9eb944a6f887dab86", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 1c1051b..84a5699 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -192,6 +192,7 @@ in { "Mod+Shift+Slash".action = show-hotkey-overlay; "Mod+Space".action = wezlaunch "sway-launcher-desktop"; + "Print".action = wezlaunch "sway-launcher-desktop"; "Mod+Ctrl+T".action = spawn "wezterm"; "Mod+Ctrl+E".action = spawn "emacsclient" "-r" "-n"; @@ -337,9 +338,9 @@ in { "Mod+X".action = switch-focus-between-floating-and-tiling; "Mod+S".action = focus-workspace "scratchpad"; - "Print".action = screenshot; - "Ctrl+Print".action = screenshot-screen; - "Alt+Print".action = screenshot-window; + "Mod+Print".action = screenshot; + "Mod+Ctrl+Print".action = screenshot-screen; + "Mod+Alt+Print".action = screenshot-window; # The quit action will show a confirmation dialog to avoid accidental exits. "Mod+Shift+E".action = quit; diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 0ee9300..644a30b 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -5,10 +5,12 @@ enable = true; keyboards = { sinc = { - devices = [ "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd" ]; + devices = [ "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd" + "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-if02" + "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-if02-event-joystick" ]; config = '' (defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc ins + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc grv 1 2 3 4 5 6 7 8 9 0 - = \ del home tab q w e r t y u i o p [ ] bspc end caps a s d f g h j k l ; ' ret pgup @@ -22,7 +24,7 @@ controls (layer-while-held controls)) (deflayer qwerty - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc ins + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc grv 1 2 3 4 5 6 7 8 9 0 - = \ del home tab q w e r t y u i o p [ ] bspc end @supesc a s d f g h j k l ; ' ret pgup @@ -30,7 +32,7 @@ lmet @controls lalt lctrl spc rctrl ralt rmet left down right) (deflayer controls - esc VolumeMute VolumeDown VolumeUp f4 f5 MediaPlayPause MediaTrackPrevious MediaTrackNext f9 f10 f11 f12 prtsc ins + esc VolumeMute VolumeDown VolumeUp f4 f5 MediaPlayPause MediaTrackPrevious MediaTrackNext f9 f10 f11 f12 prtsc grv 1 2 3 4 5 6 7 8 9 0 - = \ del home tab q w e r t y u i o p [ ] bspc end @supesc a s d f g h j k l ; ' ret pgup @@ -40,7 +42,8 @@ ''; }; razer = { - devices = [ "/dev/input/by-id/usb-Razer_Razer_Blade-event-kbd" ]; + devices = [ "/dev/input/by-id/usb-Razer_Razer_Blade-event-kbd" + "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd" ]; config = '' (defsrc grv 1 2 3 4 5 6 7 8 9 0 - = bspc