updated keybinds for meow and bookmarks

This commit is contained in:
Matt Nish-Lapidus 2024-06-05 14:14:43 -04:00
parent 102e372f3e
commit 50fd534f04
4 changed files with 113 additions and 101 deletions

View file

@ -23,22 +23,12 @@
(map! :leader
"`" nil
(:prefix ("m" . "<localleader>")) ; bound locally
;; (:prefix-map ("!" . "checkers")) ; bound by flycheck
(:prefix-map ("!" . "checkers")) ; bound by flycheck
:desc "M-x" ":" #'execute-extended-command
:desc "Pop up scratch buffer" "x" #'doom/open-scratch-buffer
:desc "Universal argument" "u" #'universal-argument
(:prefix-map ("w" . "window")
:desc "ace-window" "w" #'ace-window
:desc "split vertical" "v" #'split-window-horizontally
:desc "split horizontal" "h" #'split-window-vertically
:desc "make taller" "+" #'enlarge-window
:desc "make taller" "-" #'shrink-window
:desc "make wider" ">" #'enlarge-window-horizontally
:desc "make narrower" "<" #'shrink-window-horizontally
:desc "delete current window" "d" #'delete-window
:desc "delete other windows" "o" #'delete-other-windows)
:desc "help" "h" help-map
:desc "Toggle last popup" "~" #'+popup/toggle
@ -53,6 +43,17 @@
:desc "Find file in project" "SPC" #'projectile-find-file
:desc "Jump to bookmark" "RET" #'bookmark-jump
(:prefix-map ("w" . "window")
:desc "ace-window" "w" #'ace-window
:desc "split vertical" "v" #'split-window-horizontally
:desc "split horizontal" "h" #'split-window-vertically
:desc "make taller" "+" #'enlarge-window
:desc "make taller" "-" #'shrink-window
:desc "make wider" ">" #'enlarge-window-horizontally
:desc "make narrower" "<" #'shrink-window-horizontally
:desc "delete current window" "d" #'delete-window
:desc "delete other windows" "o" #'delete-other-windows)
;;; <leader> b --- buffer
(:prefix-map ("b" . "buffer")
:desc "Toggle narrowing" "-" #'doom/toggle-narrow-buffer
@ -348,7 +349,19 @@
:desc "Delete trailing newlines" "W" #'doom/delete-trailing-newlines
:desc "List errors" "x" #'+default/diagnostics
:desc "Spaces -> Tabs" "<tab>" #'tabify
:desc "Tabs -> Spaces" "<S-tab>" #'untabify)
:desc "Tabs -> Spaces" "<S-tab>" #'untabify
:desc "Diff buffer and file" "b" #'diff-buffer-with-file
(:prefix ("-" . "String Case")
:desc "cycle" "~" #'string-inflection-all-cycle
:desc "CamelCase" "c" #'string-inflection-camelcase
:desc "downCase" "d" #'string-inflection-lower-camelcase
:desc "kebab-case" "-" #'string-inflection-kebab-case
:desc "under_score" "_" #'string-inflection-underscore
:desc "Upper_Score" "u" #'string-inflection-capital-underscore
:desc "UP_CASE" "U" #'string-inflection-upcase
:desc "ALL CAPS" "A" #'upcase-dwim
:desc "all lower" "a" #'downcase-dwim
:desc "Capitalize Sentence" "s" #'capitalize-dwim))
;;; <leader> q --- quit/restart
@ -380,8 +393,8 @@
"C-M-s-b" #'bookmark-set
"M-s-<up>" #'next-window-any-frame
"M-s-<down>" #'previous-window-any-frame
;; "s-<up>" #'beginning-of-buffer
;; "s-<down>" #'end-of-buffer
"s-<up>" #'beginning-of-buffer
"s-<down>" #'end-of-buffer
"s-<return>" #'split-window-below
"C-M-S-s-<mouse-1>" #'+fold/toggle)
@ -470,3 +483,78 @@
(cl-pushnew `((,(format "\\`\\(?:C-w\\|%s w\\) m\\'" prefix-re))
nil . "maximize")
which-key-replacement-alist)))
;; main meow normal mode keymap
(map! :map meow-normal-state-keymap
"<" #'meow-beginning-of-thing
">" #'meow-end-of-thing
"a" #'meow-append
"A" #'meow-open-below
"b" #'meow-back-word
"B" #'meow-back-symbol
"c" #'meow-change
"d" #'meow-delete
"D" #'meow-backward-delete
"e" #'meow-next-word
"E" #'meow-next-symbol
"f" #'meow-find
"g" #'meow-cancel-selection
"G" #'meow-grab
"h" #'meow-left
"H" #'meow-left-expand
"i" #'meow-insert
"I" #'meow-open-above
"j" #'meow-next
"J" #'meow-next-expand
"k" #'meow-prev
"K" #'meow-prev-expand
"l" #'meow-right
"L" #'meow-right-expand
"m" #'meow-join
"n" #'meow-search
"o" #'meow-block
"O" #'meow-to-block
"p" #'meow-yank
"q" #'meow-quit
"Q" #'meow-goto-line
"r" #'meow-replace
"R" #'meow-swap-grab
"s" #'meow-kill
"t" #'meow-till
"u" #'meow-undo
"U" #'meow-undo-in-selection
"v" #'meow-visit
"w" #'meow-mark-word
"W" #'meow-mark-symbol
"x" #'meow-line
"X" #'meow-goto-line
"y" #'meow-save
"Y" #'meow-sync-grab
"z" #'meow-pop-selection
"0" #'meow-expand-0
"1" #'meow-expand-1
"2" #'meow-expand-2
"3" #'meow-expand-3
"4" #'meow-expand-4
"5" #'meow-expand-5
"6" #'meow-expand-6
"7" #'meow-expand-7
"8" #'meow-expand-8
"9" #'meow-expand-9
"-" #'negative-argument
";" #'meow-reverse
"," #'meow-inner-of-thing
"." #'meow-bounds-of-thing
"/" #'bookmark-in-project-jump
"?" #'bookmark-jump
"\\" #'bookmark-set
"|" #'bookmark-delete
"'" #'repeat
"=" #'meow--eval-sexp
"[" #'sp-backward-sexp
"]" #'sp-forward-sexp
"{" #'sp-backward-up-sexp
"}" #'sp-down-sexp
"!" #'meow-start-kmacro-or-insert-counter
"@" #'meow-end-or-call-kmacro
"<escape>" #'corfu-quit)

View file

@ -103,6 +103,8 @@
(after! anzu
(global-anzu-mode))
(global-so-long-mode 1)
(after! parinfer-rust-mode
(setq parinfer-rust-auto-download t)
(setq parinfer-rust-preferred-mode "smart"))

View file

@ -16,95 +16,13 @@
(meow-leader-define-key
;; SPC j/k will run the original command in MOTION state.
'("j" . "H-j")
'("k" . "H-k"))
;; (map! :map meow-paren-state-keymap
;; "h" #'sp-backward-sexp
;; "j" #'sp-forward-sexp)
;; (meow-define-state paren
;; "meow state for lisps"
;; :lighter " [P]"
;; :keymap meow-paren-state-keymap)
(map! :map meow-normal-state-keymap
"<" #'meow-beginning-of-thing
">" #'meow-end-of-thing
"a" #'meow-append
"A" #'meow-open-below
"b" #'meow-back-word
"B" #'meow-back-symbol
"c" #'meow-change
"d" #'meow-delete
"D" #'meow-backward-delete
"e" #'meow-next-word
"E" #'meow-next-symbol
"f" #'meow-find
"g" #'meow-cancel-selection
"G" #'meow-grab
"h" #'meow-left
"H" #'meow-left-expand
"i" #'meow-insert
"I" #'meow-open-above
"j" #'meow-next
"J" #'meow-next-expand
"k" #'meow-prev
"K" #'meow-prev-expand
"l" #'meow-right
"L" #'meow-right-expand
"m" #'meow-join
"n" #'meow-search
"o" #'meow-block
"O" #'meow-to-block
"p" #'meow-yank
"q" #'meow-quit
"Q" #'meow-goto-line
"r" #'meow-replace
"R" #'meow-swap-grab
"s" #'meow-kill
"t" #'meow-till
"u" #'meow-undo
"U" #'meow-undo-in-selection
"v" #'meow-visit
"w" #'meow-mark-word
"W" #'meow-mark-symbol
"x" #'meow-line
"X" #'meow-goto-line
"y" #'meow-save
"Y" #'meow-sync-grab
"z" #'meow-pop-selection
"0" #'meow-expand-0
"1" #'meow-expand-1
"2" #'meow-expand-2
"3" #'meow-expand-3
"4" #'meow-expand-4
"5" #'meow-expand-5
"6" #'meow-expand-6
"7" #'meow-expand-7
"8" #'meow-expand-8
"9" #'meow-expand-9
"-" #'negative-argument
";" #'meow-reverse
"," #'meow-inner-of-thing
"." #'meow-bounds-of-thing
"\\" #'bookmark-jump
"`" #'bookmark-set
"~" #'bookmark-delete
"'" #'repeat
"=" #'meow--eval-sexp
"[" #'sp-backward-sexp
"]" #'sp-forward-sexp
"{" #'sp-backward-up-sexp
"}" #'sp-down-sexp
"-" #'meow-start-kmacro-or-insert-counter
"_" #'meow-end-or-call-kmacro
"<escape>" #'corfu-quit))
'("k" . "H-k")))
(defun meow--eval-sexp ()
(interactive)
(cond ((derived-mode-p 'lisp-mode) (sly-eval-defun))
((derived-mode-p 'sclang-mode) (sclang-eval-region-or-line))
(t (eros-eval-defun nil))))
((derived-mode-p 'sclang-mode) (sclang-eval-region-or-line)))
(t (eros-eval-defun nil)))
(defun meow--post-isearch-function ()
(unless isearch-mode-end-hook-quit

View file

@ -21,6 +21,8 @@
;; (unpin! geiser)
(unpin! vterm)
(package! bookmark-in-project)
(package! meow-vterm
:recipe (:type git
:host github
@ -34,6 +36,9 @@
(package! just-mode)
(package! justl)
(package! fennel-mode)
(package! systemd)
(package! nerd-icons-completion)
(package! nerd-icons-dired)
(package! treemacs-nerd-icons)
@ -56,7 +61,6 @@
(package! sly-asdf)
(package! sly-quicklisp)
(package! a-janet-mode
:recipe (:type git
:host nil