updating parinfer and adjusting keymap

This commit is contained in:
Matt Nish-Lapidus 2024-04-06 13:20:25 -04:00
parent 7fd35f59e6
commit ec93c20223
5 changed files with 98 additions and 88 deletions

View file

@ -6,7 +6,7 @@
"C-x p" #'+popup/other) "C-x p" #'+popup/other)
(:when (modulep! :ui workspaces) (:when (modulep! :ui workspaces)
(:when IS-MAC (:when (featurep :system 'macos)
"s-t" #'+workspace/new "s-t" #'+workspace/new
"s-T" #'+workspace/display "s-T" #'+workspace/display
"s-1" #'+workspace/switch-to-0 "s-1" #'+workspace/switch-to-0
@ -20,7 +20,6 @@
"s-9" #'+workspace/switch-to-8 "s-9" #'+workspace/switch-to-8
"s-0" #'+workspace/switch-to-final))) "s-0" #'+workspace/switch-to-final)))
(map! :leader (map! :leader
"`" nil "`" nil
(:prefix ("m" . "<localleader>")) ; bound locally (:prefix ("m" . "<localleader>")) ; bound locally
@ -404,14 +403,6 @@
"s-<return>" #'split-window-below "s-<return>" #'split-window-below
"C-M-S-s-<mouse-1>" #'+fold/toggle) "C-M-S-s-<mouse-1>" #'+fold/toggle)
;; remove default Lispy mode bindings
(map! :map lispy-mode-map
"M-<left>" nil
"M-<right>" nil)
(map! :map lispy-mode-map-lispy
"M-<left>" nil
"M-<right>" nil)
(map! (map!
:localleader :localleader
:map lisp-mode-map :map lisp-mode-map
@ -423,6 +414,8 @@
"M-]" #'sp-forward-slurp-sexp "M-]" #'sp-forward-slurp-sexp
"M-{" #'sp-backward-slurp-sexp "M-{" #'sp-backward-slurp-sexp
"M-}" #'sp-backward-barf-sexp "M-}" #'sp-backward-barf-sexp
"M-)" #'sp-split-sexp
"M-(" #'sp-splice-sexp
"s-(" #'sp-wrap-round "s-(" #'sp-wrap-round
"s-)" #'sp-unwrap-sexp "s-)" #'sp-unwrap-sexp
"s-[" #'sp-wrap-square "s-[" #'sp-wrap-square

View file

@ -100,6 +100,10 @@
(after! anzu (after! anzu
(global-anzu-mode)) (global-anzu-mode))
(after! parinfer-rust-mode
(setq parinfer-rust-auto-download t)
(setq parinfer-rust-preferred-mode "smart"))
(setq vterm-kill-buffer-on-exit t) (setq vterm-kill-buffer-on-exit t)
(setq dap-ui-variable-length 200) (setq dap-ui-variable-length 200)
@ -176,7 +180,7 @@
(after! vertico (after! vertico
(vertico-mouse-mode)) (vertico-mouse-mode))
;; better completions for sly ;; sly
(after! sly (after! sly
(setq sly-lisp-implementations (setq sly-lisp-implementations
'((sbcl ("sbcl" "--dynamic-space-size" "12000")) '((sbcl ("sbcl" "--dynamic-space-size" "12000"))

View file

@ -95,7 +95,7 @@
docker docker
editorconfig ; let someone else argue about tabs vs spaces editorconfig ; let someone else argue about tabs vs spaces
ein ; tame Jupyter notebooks with emacs ein ; tame Jupyter notebooks with emacs
(eval +overlay) ; run code, run (also, repls) (eval +overlay) ; run code, run (also, repls)
;;gist ; interacting with github gists ;;gist ; interacting with github gists
lookup ; navigate your code and its documentation lookup ; navigate your code and its documentation
lsp ; M-x vscode lsp ; M-x vscode
@ -169,7 +169,7 @@
(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} (ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
(rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;;scala ; java, but good ;;scala ; java, but good
(scheme +guile +chez) ; a fully conniving family of lisps (scheme +guile) ; a fully conniving family of lisps
sh ; she sells {ba,z,fi}sh shells on the C xor sh ; she sells {ba,z,fi}sh shells on the C xor
;;sml ;;sml
;;solidity ; do you need a blockchain? No. ;;solidity ; do you need a blockchain? No.

View file

@ -4,88 +4,100 @@
;; Leader Key ;; Leader Key
(defun meow/setup-leader () (defun meow/setup-leader ()
(map! :leader (map! :leader
:desc "Meow Cheatsheet" :desc "Meow Cheatsheet"
"?" #'meow-cheatsheet)) "?" #'meow-cheatsheet))
(defun meow/setup-qwerty () (defun meow/setup-qwerty ()
(setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty) (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty)
(meow-motion-overwrite-define-key (meow-motion-overwrite-define-key
'("j" . meow-next) '("j" . meow-next)
'("k" . meow-prev)) '("k" . meow-prev))
(meow-leader-define-key (meow-leader-define-key
;; SPC j/k will run the original command in MOTION state. ;; SPC j/k will run the original command in MOTION state.
'("j" . "H-j") '("j" . "H-j")
'("k" . "H-k")) '("k" . "H-k"))
(map! :map meow-normal-state-keymap
"<" #'meow-beginning-of-thing ;; (map! :map meow-paren-state-keymap
">" #'meow-end-of-thing ;; "h" #'sp-backward-sexp
"a" #'meow-append ;; "j" #'sp-forward-sexp)
"A" #'meow-open-below
"b" #'meow-back-word ;; (meow-define-state paren
"B" #'meow-back-symbol ;; "meow state for lisps"
"c" #'meow-change ;; :lighter " [P]"
"d" #'meow-delete ;; :keymap meow-paren-state-keymap)
"D" #'meow-backward-delete
"e" #'meow-next-word (map! :map meow-normal-state-keymap
"E" #'meow-next-symbol "<" #'meow-beginning-of-thing
"f" #'meow-find ">" #'meow-end-of-thing
"g" #'meow-cancel-selection "a" #'meow-append
"G" #'meow-grab "A" #'meow-open-below
"h" #'meow-left "b" #'meow-back-word
"H" #'meow-left-expand "B" #'meow-back-symbol
"i" #'meow-insert "c" #'meow-change
"I" #'meow-open-above "d" #'meow-delete
"j" #'meow-next "D" #'meow-backward-delete
"J" #'meow-next-expand "e" #'meow-next-word
"k" #'meow-prev "E" #'meow-next-symbol
"K" #'meow-prev-expand "f" #'meow-find
"l" #'meow-right "g" #'meow-cancel-selection
"L" #'meow-right-expand "G" #'meow-grab
"m" #'meow-join "h" #'meow-left
"n" #'meow-search "H" #'meow-left-expand
"o" #'meow-block "i" #'meow-insert
"O" #'meow-to-block "I" #'meow-open-above
"p" #'meow-yank "j" #'meow-next
"q" #'meow-quit "J" #'meow-next-expand
"Q" #'meow-goto-line "k" #'meow-prev
"r" #'meow-replace "K" #'meow-prev-expand
"R" #'meow-swap-grab "l" #'meow-right
"s" #'meow-kill "L" #'meow-right-expand
"t" #'meow-till "m" #'meow-join
"u" #'meow-undo "n" #'meow-search
"U" #'meow-undo-in-selection "o" #'meow-block
"v" #'meow-visit "O" #'meow-to-block
"w" #'meow-mark-word "p" #'meow-yank
"W" #'meow-mark-symbol "q" #'meow-quit
"x" #'meow-line "Q" #'meow-goto-line
"X" #'meow-goto-line "r" #'meow-replace
"y" #'meow-save "R" #'meow-swap-grab
"Y" #'meow-sync-grab "s" #'meow-kill
"z" #'meow-pop-selection "t" #'meow-till
"0" #'meow-expand-0 "u" #'meow-undo
"1" #'meow-expand-1 "U" #'meow-undo-in-selection
"2" #'meow-expand-2 "v" #'meow-visit
"3" #'meow-expand-3 "w" #'meow-mark-word
"4" #'meow-expand-4 "W" #'meow-mark-symbol
"5" #'meow-expand-5 "x" #'meow-line
"6" #'meow-expand-6 "X" #'meow-goto-line
"7" #'meow-expand-7 "y" #'meow-save
"8" #'meow-expand-8 "Y" #'meow-sync-grab
"9" #'meow-expand-9 "z" #'meow-pop-selection
"-" #'negative-argument "0" #'meow-expand-0
";" #'meow-reverse "1" #'meow-expand-1
"," #'meow-inner-of-thing "2" #'meow-expand-2
"." #'meow-bounds-of-thing "3" #'meow-expand-3
"\\" #'bookmark-jump "4" #'meow-expand-4
"'" #'repeat "5" #'meow-expand-5
"=" #'meow--eval-sexp "6" #'meow-expand-6
":" #'meow--eval-sexp "7" #'meow-expand-7
"[" #'sp-backward-sexp "8" #'meow-expand-8
"]" #'sp-forward-sexp "9" #'meow-expand-9
"{" #'sp-backward-up-sexp "-" #'negative-argument
"}" #'sp-down-sexp ";" #'meow-reverse
"<escape>" #'corfu-quit)) "," #'meow-inner-of-thing
"." #'meow-bounds-of-thing
"\\" #'bookmark-jump
"`" #'bookmark-set
"~" #'bookmark-delete
"'" #'repeat
"=" #'meow--eval-sexp
":" #'meow--eval-sexp
"[" #'sp-backward-sexp
"]" #'sp-forward-sexp
"{" #'sp-backward-up-sexp
"}" #'sp-down-sexp
"<escape>" #'corfu-quit))
(defun meow--eval-sexp () (defun meow--eval-sexp ()
(interactive) (interactive)
@ -118,4 +130,4 @@
(meow/setup-leader) (meow/setup-leader)
(pushnew! meow-mode-state-list '(sly-db-mode . motion)) (pushnew! meow-mode-state-list '(sly-db-mode . motion))
(pushnew! meow-mode-state-list '(sly-inspector-mode . motion))) (pushnew! meow-mode-state-list '(sly-inspector-mode . motion)))
;; (pushnew! meow-mode-state-list '(custom-mode . motion))) ;; (pushnew! meow-mode-state-list '(custom-mode . motion)))

View file

@ -17,6 +17,7 @@
(unpin! cape) (unpin! cape)
(unpin! corfu) (unpin! corfu)
(unpin! yasnippet-capf) (unpin! yasnippet-capf)
(unpin! parinfer-rust-mode)
;; (unpin! geiser) ;; (unpin! geiser)
(package! meow-vterm (package! meow-vterm