diff options
| -rw-r--r-- | emacs/init.el | 12 | ||||
| -rw-r--r-- | emacs/site-lisp/evil-config.el | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/emacs/init.el b/emacs/init.el index c4d0db7..e0975a3 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -141,16 +141,16 @@ '(helm-minibuffer-history-key "M-p") '(menu-bar-mode nil) '(package-selected-packages - '(2048-game all-the-icons-completion amsreftex auctex balanced-windows - benchmark-init bongo buffer-move cape chinese-conv - cmake-mode company-go corfu corfu-terminal + '(2048-game all-the-icons-completion amsreftex auctex avy-flycheck + balanced-windows benchmark-init bongo buffer-move cape + chinese-conv cmake-mode company-go corfu corfu-terminal counsel-projectile cuda-mode dockerfile-mode doom-modeline dumb-jump eat edit-indirect eglot embark-consult ement emms-player-simple-mpv emms-state esh-help eshell-fringe-status eshell-vterm esup evil-collection evil-easymotion evil-snipe evil-surround exwm-firefox-evil exwm-modeline eyebrowse - fish-mode flycheck-aspell flymake-aspell + fish-mode flycheck flycheck-aspell flymake-aspell flymake-diagnostic-at-point fold-this folding free-keys frog-jump-buffer gdscript-mode gxref haskell-mode helm-exwm helm-hoogle highlight hindent hl-todo @@ -205,7 +205,7 @@ ;; this is to avoid loading evil entirely, and ease some of the ;; internconnection complexity of the config -(setq want-evil t) +(setq want-evil nil) ;; -------------------------------------------------------------------- ;; external packages @@ -423,8 +423,6 @@ ;; file browser (use-package treemacs - :init - (if want-evil (use-package treemacs-evil)) :bind (("C-c t" . treemacs))) ;; password integration diff --git a/emacs/site-lisp/evil-config.el b/emacs/site-lisp/evil-config.el index 582617e..38db735 100644 --- a/emacs/site-lisp/evil-config.el +++ b/emacs/site-lisp/evil-config.el @@ -30,6 +30,8 @@ (define-key evil-normal-state-map (kbd "M-.") 'xref-find-definitions) (define-key evil-normal-state-map (kbd "M-Z") 'suspend-frame) +(use-package treemacs-evil) + (define-key evil-motion-state-map (kbd "TAB") 'indent-for-tab-command) (evil-set-initial-state 'vterm-mode 'emacs) (evil-set-initial-state 'eshell-mode 'emacs) |