From 07a458df3751d1278a264cfd0fdf3be3f500cbbc Mon Sep 17 00:00:00 2001 From: eriedaberrie Date: Mon, 23 Jan 2023 21:28:42 -0800 Subject: [PATCH] Shorten modeline, fix aggressive-indent-mode hook --- init.el | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/init.el b/init.el index 67058a5..d45475d 100644 --- a/init.el +++ b/init.el @@ -145,13 +145,14 @@ ,(catppuccin-get-color 'overlay1))))))) (use-package goggles - :hook ((prog-mode text-mode) . goggles-mode) + :hook prog-mode text-mode :config (setq-default goggles-pulse t) (with-eval-after-load 'catppuccin-theme (face-spec-set 'goggles-added `((t (:background ,(catppuccin-get-color 'green))))) (face-spec-set 'goggles-removed `((t (:background ,(catppuccin-get-color 'red))))) - (face-spec-set 'goggles-changed `((t (:background ,(catppuccin-get-color 'blue))))))) + (face-spec-set 'goggles-changed `((t (:background ,(catppuccin-get-color 'blue)))))) + (setcar (cdr (assq 'goggles-mode minor-mode-alist)) " O-O")) (use-package treesit :ensure nil @@ -173,12 +174,25 @@ (use-package dtrt-indent :demand t :config - (dtrt-indent-global-mode)) + (dtrt-indent-global-mode) + (setcar (cdr (assq 'dtrt-indent-mode minor-mode-alist)) " dtrt")) (use-package aggressive-indent - :hook (lispyville-mode + :custom + (aggressive-indent-sit-for-time 0.1) + :hook (emacs-lisp-mode + ielm-mode + lisp-mode + lisp-interaction-mode + scheme-mode + clojure-mode nix-mode - org-mode)) + org-mode) + :config + (with-eval-after-load 'meow + (add-to-list 'aggressive-indent-protected-commands #'my-meow-undo) + (add-to-list 'aggressive-indent-protected-commands #'meow-undo) + (add-to-list 'aggressive-indent-protected-commands #'meow-undo-in-selection))) (use-package rainbow-delimiters :hook prog-mode) @@ -254,8 +268,7 @@ :init (all-the-icons-completion-mode)) -(use-package treemacs - :commands treemacs) +(use-package treemacs) (use-package treemacs-all-the-icons :demand t :after treemacs @@ -263,6 +276,7 @@ (treemacs-load-theme 'all-the-icons)) (use-package doom-modeline + :disabled t :demand t :custom (doom-modeline-fn-alist (--map @@ -317,7 +331,8 @@ (use-package editorconfig :demand t :config - (editorconfig-mode)) + (editorconfig-mode) + (setcar (cdr (assq 'editorconfig-mode minor-mode-alist)) " EdConf")) (use-package nix-mode :mode "\\.nix'") @@ -468,7 +483,8 @@ read-file-name-completion-ignore-case t read-buffer-completion-ignore-case t completion-ignore-case t - sentence-end-double-space nil) + sentence-end-double-space nil + custom-safe-themes t) (setq-default c-basic-offset 4 c-ts-mode-indent-offset 4