diff --git a/bindings.el b/bindings.el index d9a7a16..3f8111a 100644 --- a/bindings.el +++ b/bindings.el @@ -336,10 +336,8 @@ "C-S-a" #'mark-whole-buffer ;; "C-z" #'undo "C-S-Z" #'undo-redo - "C-S-E" #'+vertico/embark-export-write "C-w" #'kill-buffer "C-f" #'+default/search-buffer - "C-g" #'meow-search "C-s" #'save-buffer "C-;" #'comment-dwim "C-/" #'comment-line @@ -365,6 +363,12 @@ "C-S-" #'split-window-horizontally "C-" #'sp-backward-delete-word) +(map! :map minibuffer-mode-map + "C-S-E" #'+vertico/embark-export-write + "C-S-C" #'embark-collect + "C-S-X" #'embark-act) + + (map! :map 'smartparens-mode-map "C-}" #'sp-wrap-curly "C-]" #'sp-wrap-square diff --git a/config.el b/config.el index 2e46908..a3ca5e8 100644 --- a/config.el +++ b/config.el @@ -251,8 +251,30 @@ (use-package! colorful-mode :custom (colorful-use-prefix t) - (colorful-only-strings 'only-prog) + ;; (colorful-only-strings 'only-prog) (css-fontify-colors nil) :config (global-colorful-mode t) - (add-to-list 'global-colorful-modes 'helpful-mode)) + (add-to-list 'global-colorful-modes 'helpful-mode) + (setq css-fontify-colors nil + web-mode-enable-css-colorization nil)) + +(add-hook! 'post-command-hook + (lambda () + "delete colorful overlay on active mark" + (when-let* (colorful-mode + (beg (use-region-beginning)) + (end (use-region-end))) + ;; Remove full colorful overlay instead only the part where + ;; the region is. + (dolist (ov (overlays-in beg end)) + (when (overlay-get ov 'colorful--overlay) + (delete-overlay ov)))))) + +(add-hook! 'deactivate-mark-hook + (lambda () + "refontify deleted mark" + (when-let* (colorful-mode + (beg (region-beginning)) + (end (region-end))) + (font-lock-flush beg end)))) diff --git a/init.el b/init.el index aa14bdc..7911aad 100644 --- a/init.el +++ b/init.el @@ -114,4 +114,4 @@ ;; emms :config - (default +smartparens +bindings)) + (default +smartparens)) diff --git a/meow.el b/meow.el index bf7f375..01a0766 100644 --- a/meow.el +++ b/meow.el @@ -30,8 +30,8 @@ (meow-motion-define-key '("SPC" . doom/leader) - ;; '("j" . meow-next) - ;; '("k" . meow-prev) + '("j" . meow-next) + '("k" . meow-prev) '("" . doom/escape)) (meow-normal-define-key @@ -61,7 +61,7 @@ '("e" . meow-next-word) '("E" . meow-next-symbol) '("f" . meow-find) - '("F" . meow-query-replace) + '("F" . anzu-query-replace) '("g" . meow-cancel-selection) '("G" . meow-grab) '("h" . meow-left) @@ -75,7 +75,7 @@ '("l" . meow-right) '("L" . meow-right-expand) '("m" . meow-join) - ;; '("M" .) + '("M" . meow-kmacro-matches) '("n" . meow-search) '("o" . meow-block) '("O" . meow-to-block) @@ -83,7 +83,7 @@ '("P" . consult-yank-from-kill-ring) '("q" . meow-quit) ;; '("Q" . ) - '("r" . meow-swap-grab) + '("r" . meow-pop-or-unpop-to-mark) '("R" . rectangle-mark-mode) '("s" . meow-change) '("S" . meow-replace) @@ -91,12 +91,13 @@ '("u" . undo) '("U" . undo-redo) '("v" . meow-visit) + '("V" . meow-goto-line) '("w" . meow-mark-word) '("W" . meow-mark-symbol) '("x" . cua-cut-region) - ;; '("X" . ) - ;; '("y" . meow-change) - ;; '("Y" . meow-replace) + '("X" . meow-kill-whole-line) + '("y" . kmacro-start-macro) + '("Y" . kmacro-end-macro) '("z" . meow-line) '("Z" . meow-line-expand) '("<" . meow-beginning-of-thing) diff --git a/packages.el b/packages.el index bcc8412..6a62e2a 100644 --- a/packages.el +++ b/packages.el @@ -83,6 +83,9 @@ (package! sly-asdf) (package! sly-quicklisp) +(package! mixed-pitch) +(package! nerd-icons-ibuffer) + (package! a-janet-mode :recipe (:type git :host nil