diff --git a/emacs/init.el b/emacs/init.el index 22abfda..906e3ce 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -147,7 +147,7 @@ (tool-bar-mode nil) :custom-face ;;(default ((t (:weight bold :height 113 :width normal :family "VictorMono Nerd Font")))) - (default ((t (:weight regular :height 105 :width normal :family "MonaspiceXe Nerd Font Mono")))) + (default ((t (:weight regular :height 105 :width narrow :family "MonaspiceXe Nerd Font Mono")))) :hook (minibuffer-setup . cursor-intangible-mode) :config @@ -301,14 +301,22 @@ ;; load preferred theme (load-theme 'lambda-dark)) +;;;;; Long line handling + (use-package visual-fill-column :custom (visual-fill-column-center-text t) (visual-fill-column-enable-sensible-window-split t) - :hook visual-line-mode) + :hook + (prog-mode . visual-line-mode) + visual-line-mode) (use-package adaptive-wrap - :hook visual-fill-column) + :config + (setq-default adaptive-wrap-extra-indent 2) + :hook + visual-fill-column + (visual-line-mode . adaptive-wrap-prefix-mode)) ;;;; Security (use-package keychain-environment @@ -495,10 +503,10 @@ (evil-snipe-repeat-scope 'whole-buffer) (evil-snipe-spillover-scope 'whole-buffer) (evil-snipe-tab-increment t) + :custom :hook evil-mode (evil-mode . evil-snipe-override-mode) - (evil-mode . evil-snipe-mode) (magit-mode . turn-off-evil-snipe-override-mode) ;; See https://github.com/hlissner/evil-snipe/issues/95 ;; :config @@ -722,11 +730,21 @@ Point must be at the beginning of balanced expression (sexp)." ;;;;; Clojure (use-package clojure-ts-mode + :preface + (defun embark-eglot-rename (from to) + "Renames the symbol at point." + (interactive "sRename: \nsRename %s to: ") + (funcall-interactively #'eglot-rename to)) + :delight "" - :after tree-sitter + :after (tree-sitter embark) :config (require 'sesman) (sesman-install-menu clojure-mode-map) + (defvar-keymap embark-clj-identifier-map + :parent embark-identifier-map + "c" #'embark-eglot-rename) + (add-to-list 'embark-keymap-alist '(identifier . embark-clj-identifier-map)) :hook ((clojure-ts-mode . eglot-ensure) (clojure-ts-mode . prettify-symbols-mode)