diff options
| author | 2024-04-08 17:43:40 +0000 | |
|---|---|---|
| committer | 2024-04-08 17:43:40 +0000 | |
| commit | 9e73e8c68f39a9b2e92f1b2b4d035d2ca6d2c1f3 (patch) | |
| tree | d07eab9d969540f34b2811218b207edb24527187 | |
| parent | 6ebc65501047918be5326858c832b9e1c35aaf9c (diff) | |
emacs: meow com graphite + yasnippets; kanata: graphite
| -rw-r--r-- | emacs/init.el | 93 | ||||
| -rw-r--r-- | kanata/akko.kbd | 127 |
2 files changed, 109 insertions, 111 deletions
diff --git a/emacs/init.el b/emacs/init.el index 47a11d1..8221e85 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -524,74 +524,74 @@ apps are not started from a shell." '("o" . meow-prev) '("e" . meow-next) - '("n" . meow-left) + '("h" . meow-left) '("i" . meow-right) - '("z" . meow-search) - '("." . meow-visit) + '("j" . meow-search) + '("/" . meow-visit) '("O" . meow-prev-expand) '("E" . meow-next-expand) - '("N" . meow-left-expand) + '("H" . meow-left-expand) '("I" . meow-right-expand) - '("j" . meow-back-word) - '("J" . meow-back-symbol) + '("f" . meow-back-word) + '("F" . meow-back-symbol) '("u" . meow-next-word) '("U" . meow-next-symbol) - '("c" . meow-mark-word) - '("C" . meow-mark-symbol) + '("n" . meow-mark-word) + '("N" . meow-mark-symbol) '("r" . meow-line) '("R" . meow-goto-line) '("l" . meow-block) - '("w" . meow-join) - '("b" . meow-grab) - '("B" . meow-pop-grab) - '("h" . meow-swap-grab) - '("H" . meow-sync-grab) - '(";" . meow-cancel-selection) - '(":" . meow-pop-selection) + '("b" . meow-join) + '("g" . meow-grab) + '("G" . meow-pop-grab) + '("k" . meow-swap-grab) + '("K" . meow-sync-grab) + '("'" . meow-cancel-selection) + '("\"" . meow-pop-selection) '("ç" . meow-cancel-selection) '("Ç" . meow-pop-selection) - '("v" . meow-till) - '("x" . meow-find) + '("m" . meow-till) + '("M" . meow-find) - '("/" . meow-beginning-of-thing) - '("," . meow-end-of-thing) - '("?" . meow-inner-of-thing) - '("<" . meow-bounds-of-thing) + '("-" . meow-beginning-of-thing) + '("." . meow-end-of-thing) + '("_" . meow-inner-of-thing) + '(">" . meow-bounds-of-thing) - '("s" . meow-kill) - '("t" . meow-change) - '("k" . meow-delete) - '("g" . meow-save) - '("d" . meow-yank) - '("D" . meow-yank-pop) + '("t" . meow-kill) + '("s" . meow-change) + '("z" . meow-delete) + '("v" . meow-save) + '("c" . meow-yank) + '("C" . meow-yank-pop) - '("y" . meow-insert) - '("Y" . meow-open-above) - '("P" . meow-append) - '("P" . meow-open-below) + '("d" . meow-insert) + '("D" . meow-open-above) + '("w" . meow-append) + '("W" . meow-open-below) - '("f" . undo-only) - '("F" . undo-redo) + '("y" . undo-only) + '("Y" . undo-redo) '("q" . open-line) '("Q" . split-line) - '("[" . indent-rigidly-left-to-tab-stop) - '("]" . indent-rigidly-right-to-tab-stop) + '(";" . indent-rigidly-left-to-tab-stop) + '("=" . indent-rigidly-right-to-tab-stop) - '("mt" . meow-comment) - '("mk" . meow-start-kmacro-or-insert-counter) - '("mp" . meow-start-kmacro) - '("my" . meow-end-or-call-kmacro) + '("pt" . meow-comment) + '("pk" . meow-start-kmacro-or-insert-counter) + '("pp" . meow-start-kmacro) + '("py" . meow-end-or-call-kmacro) - '("at" . save-buffer) - '("aT" . save-some-buffers) - '("as" . meow-query-replace-regexp) + '("as" . save-buffer) + '("aS" . save-some-buffers) + '("at" . meow-query-replace-regexp) '("<escape>" . ignore) @@ -624,6 +624,15 @@ apps are not started from a shell." :config (powerline-default-theme)) +(use-package yasnippet + :commands (yas-global-mode) + :config (setopt yasnippet-snippets-dir + '((concat user-emacs-directory "snippets") + (concat user-emacs-directory "straight/repos/yasnippet-snippets/snippets")))) + +(use-package yasnippet-snippets + :after yasnippet) + (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/kanata/akko.kbd b/kanata/akko.kbd index 3e545cc..8b67f7c 100644 --- a/kanata/akko.kbd +++ b/kanata/akko.kbd @@ -14,33 +14,32 @@ (defalias l (chord chords l) - y (chord chords y) - p (chord chords p) - k (chord chords k) + d (chord chords d) + w (chord chords w) z (chord chords z) j (chord chords j) + f (chord chords f) o (chord chords o) u (chord chords u) r (chord chords r) - s (chord chords s) t (chord chords t) - b (chord chords b) - f (chord chords f) - n (chord chords n) + s (chord chords s) + g (chord chords g) + y (chord chords y) + h (chord chords h) e (chord chords e) i (chord chords i) + m (chord chords m) v (chord chords v) - g (chord chords g) - d (chord chords d) + c (chord chords c) q (chord chords q) - m (chord chords m) - h (chord chords h) - / (chord chords /) - , (chord chords ,) + p (chord chords p) + k (chord chords k) + - (chord chords -) + . (chord chords .) - can (layer-switch canary) nav (layer-while-held nav) num (layer-while-held num) @@ -49,7 +48,7 @@ lsft (one-shot-release 1000 lsft) lctl (one-shot-release 1000 lctl) - c (tap-hold-press 150 150 c @nav) + n (tap-hold-press 150 150 n @nav) a (tap-hold-press 150 150 a @num) ;; mouse @@ -67,69 +66,69 @@ (defchords chords 1000 ;; fileira de cima (l ) l - (y ) y - (p ) p - (k ) k + (d ) d + (w ) w (z ) z (j ) j + (f ) f (o ) o (u ) u ;; fileira do meio (r ) r - (s ) s (t ) t - (b ) b - (f ) f - (n ) n + (s ) s + (g ) g + (y ) y + (h ) h (e ) e (i ) i ;; fileira de baixo + (m ) m (v ) v - (g ) g - (d ) d + (c ) c (q ) q - (m ) m - (h ) h - (/ ) / - (, ) , + (p ) p + (k ) k + (- ) - + (. ) . ;; combos laterais - lado esquerdo - (l y) esc - (y p) ret - (r s) tab - (s t) rpt - (v g) C-c - (g d) C-v + (l d) esc + (d w) ret + (r t) tab + (t s) rpt + (m v) C-c + (v c) C-v ;; combos verticais - lado esquerdo (l r) S-2 - (y s) S-3 - (p t) S-4 - (k b) S-5 - (r v) grv - (s g) S-1 - (t d) = - (b q) S-grv + (d t) S-3 + (w s) S-4 + (z g) S-5 + (r m) grv + (t v) S-1 + (s c) = + (g q) S-grv ;; combos laterais - lado direito - (j o) bspc + (f o) bspc (o u) del - (n e) S-9 + (h e) S-9 (e i) S-0 - (h /) [ - (/ ,) ] + (k -) [ + (- .) ] ;; combos verticais - lado direito - (z f) S-6 - (j n) + + (j y) S-6 + (f h) + (o e) S-8 (u i) S-7 - (f m) S-- - (n h) - - (e /) / - (i ,) S-\ + (y p) S-- + (h k) - + (e -) / + (i .) S-\ ) (defchords m-chords 500 @@ -138,14 +137,12 @@ (mlc mrc) mmid ) -;; Canary layout (dg swap) -;; https://github.com/Apsu/Canary -(deflayer canary - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc grv - tab w @l @y @p @k @z @j @o @u ; [ ] \ - caps @c @r @s @t @b @f @n @e @i @a ' ret - lsft x @v @g @d @q @m @h @/ @, . rsft - lctl lmet @mous spc ralt rctl +(deflayer grephati + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc grv + tab b @l @d @w @z @j @f @o @u ' ; = \ + caps @n @r @t @s @g @y @h @e @i @a , ret + lsft x @m @v @c @q @p @k @- @. / rsft + lctl lmet lalt spc ralt rctl ) (deflayer empty @@ -164,19 +161,11 @@ _ _ _ _ _ _ ) -;; (deflayer num -;; _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ -;; _ _ _ _ _ _ _ 7 8 9 _ _ _ _ -;; _ _ @lalt @lctl @lsft _ _ 4 5 6 _ _ _ -;; _ _ _ _ @lmet _ 0 1 2 3 _ _ -;; _ _ _ _ _ _ -;; ) - (deflayer num _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 9 8 7 _ _ _ _ _ _ _ _ _ _ _ 6 5 4 _ _ @lsft @lctl @lalt _ _ _ - _ _ 3 2 1 0 _ @lmet _ _ _ _ + _ 3 2 1 0 _ _ @lmet _ _ _ _ _ _ _ _ _ _ ) @@ -193,5 +182,5 @@ _ _ _ _ _ _ _ @mlc @mup @mrc _ _ _ _ _ _ _ _ _ _ _ @mlft @mdn @mrgt _ _ _ _ _ _ _ _ _ _ @mwup _ @mwdn _ _ - _ _ @can _ _ _ + _ _ _ _ _ _ ) |
