From 48a13da8fb389f90e33f72e436aa13f9c5c18d3f Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 16 May 2025 15:18:48 -0400 Subject: [PATCH] smll tweaks --- flake.lock | 6 +- modules/home/shell-conf/wezterm/wezterm.lua | 1 + modules/system/kanata.nix | 66 ++++++++++++++++++--- 3 files changed, 63 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index ea40eba..761c3b2 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1747362374, - "narHash": "sha256-nHXQ8mq3eYq0aLGkGJudJFmq8NoQ0uCBQ+q2NISmDAY=", + "lastModified": 1747416254, + "narHash": "sha256-rX+l5VwLCCcvIO3hArtrY5j3H2jzWpF89HNbRMxwYaY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6876891497fa209feda114600f4170d905abde53", + "rev": "c52caefb7f44578df586759f3ee675b687c5ab65", "type": "github" }, "original": { diff --git a/modules/home/shell-conf/wezterm/wezterm.lua b/modules/home/shell-conf/wezterm/wezterm.lua index 91b644f..bb09630 100644 --- a/modules/home/shell-conf/wezterm/wezterm.lua +++ b/modules/home/shell-conf/wezterm/wezterm.lua @@ -48,6 +48,7 @@ config.audible_bell = "Disabled"; config.warn_about_missing_glyphs = false; config.font_size = 14 +config.freetype_load_flags = 'NO_HINTING' config.color_scheme = 'One Half Black (Gogh)' -- config.color_scheme = 'Adventure' diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 4327ad9..a20423a 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -33,6 +33,7 @@ in extraDefCfg = '' process-unmapped-keys yes concurrent-tap-hold yes +allow-hardware-repeat false ''; config = '' @@ -50,7 +51,8 @@ ${k-vars} supesc (tap-hold-press $tap-timeout $hold-timeout esc lmet) sp-lsft (tap-hold-press $tap-timeout $hold-timeout S-9 lsft) sp-rsft (tap-hold-press $tap-timeout $hold-timeout S-0 lsft) - controls (layer-while-held controls)) + controls (layer-while-held media-controls) + nav (tap-hold-press $tap-timeout $hold-timeout a (layer-while-held navigation))) (deflayer qwerty esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prtsc @@ -60,17 +62,67 @@ ${k-vars} @sp-lsft z x c v b n m , . / @sp-rsft up pgdn lmet @controls lalt lctrl spc rctrl ralt rmet left down right) -(deflayer controls - esc VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 prtsc +(deflayer navigation + 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 - @sp-lsft z x c v b n m , . / @sp-rsft pgup _ - lmet lmet lalt lctrl spc rctrl ralt rmet home pgdn end) + @supesc a s d f g left down up right ; ' ret pgup + @sp-lsft z x c v b n m , . / @sp-rsft up pgdn + lmet @controls lalt lctrl spc rctrl ralt rmet left down right) +(deflayer media-controls + esc VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext 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 MediaPlayPause [ ] bspc end + @supesc a s d f g MediaTrackNext VolumeDown VolumeUp MediaTrackPrevious ; ' ret pgup + @sp-lsft z x c v b n VolumeMute , . / @sp-rsft pgup _ + lmet lmet lalt lctrl spc rctrl ralt rmet home pgdn end) ''; }; - razer = { + +# quefrency = { +# 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" ]; +# extraDefCfg = '' +# process-unmapped-keys yes +# concurrent-tap-hold yes +# ''; + +# config = '' +# (defsrc +# 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 +# lsft z x c v b n m , . / rsft up pgdn +# lctl slck lmet lalt spc ralt rmet rctrl left down right) + +# ${k-vars} + +# (defalias +# supesc (tap-hold-press $tap-timeout $hold-timeout esc lmet) +# sp-lsft (tap-hold-press $tap-timeout $hold-timeout S-9 lsft) +# sp-rsft (tap-hold-press $tap-timeout $hold-timeout S-0 lsft) +# controls (layer-while-held controls)) + +# (deflayer qwerty +# 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 +# @sp-lsft z x c v b n m , . / @sp-rsft up pgdn +# lmet @controls lalt lctrl spc rctrl ralt rmet left down right) + +# (deflayer controls +# grv 1 2 3 4 5 6 7 8 9 0 - = \ del home +# tab q w e r t y u i o MediaPlayPause [ ] bspc end +# @supesc a s d f g MediaTrackNext VolumeDown VolumeUp MediaTrackPrevious l ; ' ret pgup +# @sp-lsft z x c v b n VolumeMute , . / @sp-rsft pgup _ +# lmet lmet lalt lctrl spc rctrl ralt rmet home pgdn end) + +# ''; +# } + + razer = { devices = [ "/dev/input/by-id/usb-Razer_Razer_Blade-event-kbd" "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd" ]; config = ''