emacs and kanata updates

This commit is contained in:
Matt Nish-Lapidus 2025-06-03 22:07:11 -04:00
parent 7e54cca1a3
commit 434c4cdb7a
4 changed files with 45 additions and 41 deletions

36
flake.lock generated
View file

@ -89,11 +89,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1748941793, "lastModified": 1749000515,
"narHash": "sha256-HncwK05hos0Z5SSjVF5CtZjwMTn56xjWq08fRIdKBms=", "narHash": "sha256-XFbY5WbxkTFzMGk3VkSLEYto2lrafaWpS++NEpXlR50=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "78278b770d2c83657657da569544cf20eccee0ef", "rev": "b23f5ee5d26ee40cafbec9e3d1c4d9cefdf93c27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -409,11 +409,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748955489, "lastModified": 1748979197,
"narHash": "sha256-OmZXyW2g5qIuo5Te74McwR0TwauCO2sF3/SjGDVuxyg=", "narHash": "sha256-mKYwYcO9RmA2AcAFIXGDBOw5iv/fbjw6adWvMbnfIuk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bb846c031be68a96466b683be32704ef6e07b159", "rev": "34a13086148cbb3ae65a79f753eb451ce5cac3d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -484,11 +484,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1748887365, "lastModified": 1748976320,
"narHash": "sha256-nXOH6w7NgnN8uPL6yexmeghcdiPKvEVdVkI0UxcOE4U=", "narHash": "sha256-3R4QZ7GeqcBV5lwlFj6qfo1vpNtT8eCJ60JZ59QmRW4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hypridle", "repo": "hypridle",
"rev": "63d08e8e726b9ba31fc237e1c89c085e6c0d42f3", "rev": "a282131ac77a239ebd0132b2111fd950e9903665",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -852,11 +852,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1748914633, "lastModified": 1748977926,
"narHash": "sha256-Lqrob1u9gXh2QQR68wHqA42JXc4v4i9/EXITcJPEe68=", "narHash": "sha256-4tERoqAxHSwcF86j1xxqXghxkJJkbqTrAoYXLPU//jg=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "b6084ca94d7be6aa9c3165fbdced16efc5b8247e", "rev": "89ce8038a15e06fad526523982424b08083cec77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -885,11 +885,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748794937, "lastModified": 1748971878,
"narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=", "narHash": "sha256-sgK5dsqsRX2xfkwOy8Wsi8oAuDvAZ8z2aBgN3vk0QLw=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba", "rev": "abac28a65c6c742114ef292221dd26e2a3a2f04b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1742,11 +1742,11 @@
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_3"
}, },
"locked": { "locked": {
"lastModified": 1748740817, "lastModified": 1748966898,
"narHash": "sha256-Vj4QAPNXONRmpL9LdmZt2DTqLCqgIBFjuseQprs9Kvg=", "narHash": "sha256-vpZNvQ9YM8jmGOcfxl3RDZEQ130FeyIGdabwLzaf9lg=",
"owner": "sxyazi", "owner": "sxyazi",
"repo": "yazi", "repo": "yazi",
"rev": "d5038eeed52a459fa43b953c3b42a65a1b0d922c", "rev": "20446544ef13f530792179804356ef2d28f403da",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -38,6 +38,7 @@ in
openrgb-with-all-plugins openrgb-with-all-plugins
bazecor bazecor
faircamp faircamp
sqlite
]) ])
]; ];

View file

@ -1,27 +1,27 @@
{ pkgs, ... }: { pkgs, ... }:
let let
emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages ( emacs_pkg = ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (
epkgs: [ epkgs: with epkgs; [
epkgs.vterm vterm
epkgs.mu4e mu4e
epkgs.sly sly
epkgs.sly-quicklisp sly-quicklisp
epkgs.geiser-racket geiser-racket
epkgs.cider cider
epkgs.editorconfig editorconfig
epkgs.shfmt shfmt
epkgs.apheleia apheleia
epkgs.parinfer-rust-mode parinfer-rust-mode
epkgs.manualPackages.tree-sitter-langs tree-sitter-langs
epkgs.manualPackages.treesit-grammars.with-all-grammars treesit-grammars.with-all-grammars
epkgs.pretty-sha-path pretty-sha-path
epkgs.pdf-tools pdf-tools
epkgs.all-the-icons all-the-icons
epkgs.eldoc eldoc
epkgs.tablist tablist
epkgs.parseedn parseedn
epkgs.parseclj parseclj
epkgs.track-changes track-changes
])); ]));
in { in {
programs.emacs = { programs.emacs = {

View file

@ -29,6 +29,9 @@ let
;; tap-dance for common combos ;; tap-dance for common combos
tap-copy (tap-dance 150 (c C-c)) tap-copy (tap-dance 150 (c C-c))
tap-paste (tap-dance 150 (v C-v))
tap-paste-p (tap-dance 150 (p C-v))
tap-undo (tap-dance 150 (u C-z))
) )
''; '';
basic-nav = '' basic-nav = ''
@ -87,9 +90,9 @@ ${shared-alias}
(deflayer base (deflayer base
grv 1 2 3 4 5 6 7 8 9 0 - = bspc grv 1 2 3 4 5 6 7 8 9 0 - = bspc
tab q w e r t y u i o p [ ] \ tab q w e r t y @tap-undo i o @tap-paste-p [ ] \
@supesc @a @s @d f g h j k l ; ' ret @supesc @a @s @d f g h j k l ; ' ret
@sp-lsft z x @tap-copy v b n m , . / @sp-rsft @sp-lsft z x @tap-copy @tap-paste b n m , . / @sp-rsft
@supesc @controls lalt lctrl @spcnav @spcnav rctrl ralt @controls @hyper @supesc @supesc @controls lalt lctrl @spcnav @spcnav rctrl ralt @controls @hyper @supesc
bspc mlft mrgt del) bspc mlft mrgt del)