From d7f39b5930e2ed125fffe7aefc8a28a9dfedab53 Mon Sep 17 00:00:00 2001
From: Marc <marc>
Date: Tue, 7 Mar 2023 07:20:02 +0100
Subject: [PATCH] more cleanup, dropped meow for evil

---
 config.org | 53 ++++++++++++++++-------------------------------------
 1 file changed, 16 insertions(+), 37 deletions(-)

diff --git a/config.org b/config.org
index cf1a9f5..8be6e29 100644
--- a/config.org
+++ b/config.org
@@ -440,6 +440,7 @@ Exclude some dirs from spamming recentf
   :custom
   (savehist-file (concat MY--PATH_USER_LOCAL "history")))
 #+end_src
+
 * undo
 #+BEGIN_SRC emacs-lisp
 (use-package undo-tree
@@ -506,17 +507,21 @@ Exclude some dirs from spamming recentf
       (quietly-read-abbrev-file))
   (setq save-abbrevs 'silently))  ;; don't bother me with asking for abbrev saving
 #+end_src
-* COMMENT Evil (now meow)
+
+* Evil
 #+BEGIN_SRC emacs-lisp
 (use-package evil
   :ensure t
   :defer .1 ;; don't block emacs when starting, load evil immediately after startup
-  :init
-  (setq evil-want-C-i-jump nil)  ;; prevent evil from blocking TAB in org tree expanding
+  :custom
+  (evil-want-C-i-jump nil)  ;; prevent evil from blocking TAB in org tree expanding
+  (evil-want-integration t)
+  (evil-want-keybinding nil)
   :config
   (evil-mode 1))
 #+END_SRC
-* Meow
+
+* COMMENT Meow
 #+begin_src emacs-lisp
 (use-package meow
   :ensure t
@@ -608,6 +613,7 @@ Exclude some dirs from spamming recentf
 ;  :config
   (meow-global-mode t))
 #+end_src
+
 * General (key mapper)
 #+BEGIN_SRC emacs-lisp
 (use-package general
@@ -831,15 +837,6 @@ End Sub
     (w32-shell-execute "open" "outlook" " /select outlook:000000008A209C397CEF2C4FBA9E54AEB5B1F97F0700846D043B407C5B43A0C05AFC46DC5C630587BE5E020900006E48FF8F6027694BA6593777F542C19E0002A6434D000000"))'
 #+END_SRC
 
-
-(w32-shell-execute "open" "outlook" " /select outlook:000000008A209C397CEF2C4FBA9E54AEB5B1F97F0700846D043B407C5B43A0C05AFC46DC5C630587BE5E020900006E48FF8F6027694BA6593777F542C19E0002A6434D000000")
-
-
-[[outlook:000000008A209C397CEF2C4FBA9E54AEB5B1F97F0700846D043B407C5B43A0C05AFC46DC5C630587BE5E020900006E48FF8F6027694BA6593777F542C19E0002A6434D000000][MESSAGE: AW: Offene LS Doray (Dennis Cornels)]]
-
-
-[[outlook:000000008A209C397CEF2C4FBA9E54AEB5B1F97F0700846D043B407C5B43A0C05AFC46DC5C630587BE5E020900006E48FF8F6027694BA6593777F542C19E0002A6434D000000]]
-
 * misc
 #+begin_src emacs-lisp
 (use-package autorevert
@@ -1454,7 +1451,7 @@ at least pandas couldnt be resolved in pyright
   (setq completion-category-overrides '((eglot (styles orderless)))))
   
 #+end_src
-** LSP (now eglot)
+** LSP
 Configuration for the language server protocol
 *ACHTUNG* Dateipfad muss absolut sein, symlink im Pfad führt zumindest beim ersten Start zu Fehlern beim lsp
 Sobald der lsp einmal lief, kann zukünftig der symlink-Pfad genommen werden.
@@ -1477,23 +1474,16 @@ TODO Unterverzeichnisse wurden noch nicht getestet
   (lsp-enable-folding t)          ; default, maybe evil-matchit instead for performance?
   (lsp-diagnostics-modeline-scope :project)
   (lsp-enable-file-watchers nil)
+  (lsp-keymap-prefix "C-c l")
   (lsp-session-file (concat MY--PATH_USER_LOCAL "lsp-session"))
   (lsp-eslint-library-choices-file (concat MY--PATH_USER_LOCAL "lsp-eslint-choices"))
   :bind (:map lsp-mode-map ("C-c C-f" . lsp-format-buffer))
   :hook
-  (((python-mode
-     js-mode
-     js2-mode
-     typescript-mode
-     web-mode
-     ) . lsp-deferred)
-   (lsp-mode . lsp-enable-which-key-integration)
-   (lsp-mode . lsp-diagnostics-modeline-mode)
-   (web-mode . #'lsp-flycheck-enable))  ;; enable flycheck-lsp for web-mode locally
+  (lsp-mode . lsp-enable-which-key-integration)
+  (lsp-mode . lsp-diagnostics-modeline-mode)
+  (web-mode . #'lsp-flycheck-enable)  ;; enable flycheck-lsp for web-mode locally
   :config
-  (setq lsp-diagnostics-package :none))              ; disable flycheck-lsp for most modes
-
-  ;;  (add-hook 'web-mode-hook #'lsp-flycheck-enable))  ; enable flycheck-lsp for web-mode locally
+  (setq lsp-diagnostic-package :none))              ; disable flycheck-lsp for most modes
 
 (use-package lsp-ui
   :after lsp-mode
@@ -1515,17 +1505,6 @@ TODO Unterverzeichnisse wurden noch nicht getestet
   ;; workaround hide mode-line of lsp-ui-imenu buffer
   (defadvice lsp-ui-imenu (after hide-lsp-ui-imenu-mode-line activate)
     (setq mode-line-format nil)))
-
-;;NO LONGER SUPPORTED, USE company-capf / completion-at-point
-;(use-package company-lsp
-;  :requires company
-;  :defer t
-;  :ensure t
-;  :config
-;  ;;disable client-side cache because lsp server does a better job
-;  (setq company-transformers nil
-;        company-lsp-async t
-;        company-lsp-cache-candidates nil))
 #+END_SRC
 
 ** yasnippet