From 128bb4fa20e56adf2726e9c57c61188861904dc3 Mon Sep 17 00:00:00 2001 From: Alexander Rosenberg Date: Sat, 23 Mar 2024 04:56:00 -0700 Subject: [PATCH] Fix go-mode and undo-tree --- init.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/init.el b/init.el index 58bb6f3..783283b 100644 --- a/init.el +++ b/init.el @@ -138,8 +138,6 @@ (c++-mode . c++-ts-mode) (c-or-c++-mode . c-or-c++-ts-mode) (python-mode . python-ts-mode) - (go-mode . go-ts-mode) - (go-dot-mod-mode . go-mod-ts-mode) (java-mode . java-ts-mode) (rust-mode . rust-ts-mode) (json-mode . json-ts-mode) @@ -190,7 +188,10 @@ ;; undo-tree (use-package undo-tree :defer nil + :hook (undo-tree-visualizer-mode . my/-undo-tree-visualizer-mode-setup) :config + (defun my/-undo-tree-visualizer-mode-setup () + (visual-line-mode -1)) (global-undo-tree-mode)) ;; evil @@ -207,8 +208,7 @@ (evil-define-key '(normal visual motion) proced-mode-map "u" #'proced-unmark) (evil-define-key '(normal visual motion) dired-mode-map - "u" #'dired-unmark) - (evil-set-initial-state 'undo-tree-visualizer-mode 'emacs)) + "u" #'dired-unmark)) (use-package evil-collection :after evil :diminish evil-collection-unimpaired-mode @@ -802,7 +802,8 @@ COMMAND and COMINT are like `compile'." ;; go mode (use-package go-mode - :defer nil) + :defer nil + :hook (go-mode . eglot-ensure)) (use-package go-ts-mode :ensure nil :hook (go-ts-mode . eglot-ensure))