diff --git a/bindings.el b/bindings.el index ab3fd92..0517465 100644 --- a/bindings.el +++ b/bindings.el @@ -6,7 +6,7 @@ "C-x p" #'+popup/other) (:when (modulep! :ui workspaces) - (:when IS-MAC + (:when (featurep :system 'macos) "s-t" #'+workspace/new "s-T" #'+workspace/display "s-1" #'+workspace/switch-to-0 @@ -20,7 +20,6 @@ "s-9" #'+workspace/switch-to-8 "s-0" #'+workspace/switch-to-final))) - (map! :leader "`" nil (:prefix ("m" . "")) ; bound locally @@ -404,14 +403,6 @@ "s-" #'split-window-below "C-M-S-s-" #'+fold/toggle) -;; remove default Lispy mode bindings -(map! :map lispy-mode-map - "M-" nil - "M-" nil) -(map! :map lispy-mode-map-lispy - "M-" nil - "M-" nil) - (map! :localleader :map lisp-mode-map @@ -423,6 +414,8 @@ "M-]" #'sp-forward-slurp-sexp "M-{" #'sp-backward-slurp-sexp "M-}" #'sp-backward-barf-sexp + "M-)" #'sp-split-sexp + "M-(" #'sp-splice-sexp "s-(" #'sp-wrap-round "s-)" #'sp-unwrap-sexp "s-[" #'sp-wrap-square diff --git a/config.el b/config.el index 611901d..d2dcfa6 100644 --- a/config.el +++ b/config.el @@ -100,6 +100,10 @@ (after! anzu (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 dap-ui-variable-length 200) @@ -176,7 +180,7 @@ (after! vertico (vertico-mouse-mode)) -;; better completions for sly +;; sly (after! sly (setq sly-lisp-implementations '((sbcl ("sbcl" "--dynamic-space-size" "12000")) diff --git a/init.el b/init.el index 8bdb01a..d59be44 100644 --- a/init.el +++ b/init.el @@ -95,7 +95,7 @@ docker editorconfig ; let someone else argue about tabs vs spaces 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 lookup ; navigate your code and its documentation lsp ; M-x vscode @@ -169,7 +169,7 @@ (ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} (rust +lsp +tree-sitter) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;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 ;;sml ;;solidity ; do you need a blockchain? No. diff --git a/modules/editor/meow/config.el b/modules/editor/meow/config.el index 38962e7..d50b85c 100644 --- a/modules/editor/meow/config.el +++ b/modules/editor/meow/config.el @@ -4,88 +4,100 @@ ;; Leader Key (defun meow/setup-leader () - (map! :leader - :desc "Meow Cheatsheet" - "?" #'meow-cheatsheet)) + (map! :leader + :desc "Meow Cheatsheet" + "?" #'meow-cheatsheet)) (defun meow/setup-qwerty () (setq meow-cheatsheet-layout meow-cheatsheet-layout-qwerty) (meow-motion-overwrite-define-key - '("j" . meow-next) - '("k" . meow-prev)) + '("j" . meow-next) + '("k" . meow-prev)) (meow-leader-define-key ;; SPC j/k will run the original command in MOTION state. '("j" . "H-j") '("k" . "H-k")) - (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 - "'" #'repeat - "=" #'meow--eval-sexp - ":" #'meow--eval-sexp - "[" #'sp-backward-sexp - "]" #'sp-forward-sexp - "{" #'sp-backward-up-sexp - "}" #'sp-down-sexp - "" #'corfu-quit)) + + ;; (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 + ":" #'meow--eval-sexp + "[" #'sp-backward-sexp + "]" #'sp-forward-sexp + "{" #'sp-backward-up-sexp + "}" #'sp-down-sexp + "" #'corfu-quit)) (defun meow--eval-sexp () (interactive) @@ -118,4 +130,4 @@ (meow/setup-leader) (pushnew! meow-mode-state-list '(sly-db-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))) diff --git a/packages.el b/packages.el index 0b52673..056caba 100644 --- a/packages.el +++ b/packages.el @@ -17,6 +17,7 @@ (unpin! cape) (unpin! corfu) (unpin! yasnippet-capf) +(unpin! parinfer-rust-mode) ;; (unpin! geiser) (package! meow-vterm