more lsp stuff

2 files changed, 46 insertions, 25 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 3f58e9c..ffaaaa5 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -8,7 +8,7 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  '(package-selected-packages
-   '(lsp-ui lsp-mode rainbow-delimiters yasnippet-snippets markdown-mode yasnippet no-littering vertico orderless marginalia vc-use-package miasma-theme kind-icon dracula-theme corfu)))
+   '(flycheck color-identifiers-mode consult doom-themes lsp-ui lsp-mode rainbow-delimiters yasnippet-snippets markdown-mode yasnippet no-littering vertico orderless marginalia vc-use-package miasma-theme kind-icon dracula-theme corfu)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.config/emacs/settings.org b/.config/emacs/settings.org
index c79688b..def24f6 100644
--- a/.config/emacs/settings.org
+++ b/.config/emacs/settings.org
@@ -78,8 +78,12 @@
 
 * Themeing
 #+BEGIN_SRC emacs-lisp
-  (use-package dracula-theme)
-  (load-theme 'dracula t)
+  (use-package doom-themes
+  :config
+  (setq doom-themes-enable-bold t
+        doom-themes-enable-italic t)
+  (load-theme 'doom-dracula t)
+  (doom-themes-org-config))
 
   (set-face-attribute 'default nil
 		      :font "DejaVu Sans Mono"
@@ -128,17 +132,22 @@
 
   (use-package orderless
     :config
-    (setq completion-styles '(orderless)
+    (setq completion-styles '(orderless partial-completion basic)
 	  completion-category-defaults nil
 	  completion-category-overrides '((file (styles . (partial-completion))))))
 
+  (use-package consult)
+
 #+END_SRC
 
 * Development
 ** Visual
 #+BEGIN_SRC emacs-lisp
   (use-package rainbow-delimiters
-  :hook (prog-mode . rainbow-delimiters-mode))
+    :hook (prog-mode . rainbow-delimiters-mode))
+
+  (use-package ansi-color
+    :hook (compilation-filter . ansi-color-compilation-filter))
 #+END_SRC
 ** Magit
 #+BEGIN_SRC emacs-lisp
@@ -171,26 +180,38 @@
 ** LSP
 #+BEGIN_SRC emacs-lisp
 
-    (use-package lsp-mode
-      :commands (lsp lsp-deferred)
-      :init
-      (setq lsp-keymap-prefix "C-c l"
-	    lsp-headerline-breadcrumb-enable nil
-	    lsp-lens-enable nil)
-      :hook (
-	     (c-mode . lsp-deferred)
-	     (c++-mode . lsp-deferred)
-	     (python-mode . lsp-deferred)
-	     (csharp-mode . lsp-deferred))
-      :custom
-      (lsp-completion-provider :none) ; corfu
-      (lsp-idle-delay 0.2)
-      )
-
-    (use-package lsp-ui
-      :hook (lsp-mode . lsp-ui-mode)
-      :bind ("C-c r" . lsp-ui-peek-find-references))
+  (use-package lsp-mode
+    :commands (lsp lsp-deferred)
+    :init
+    (setq lsp-keymap-prefix "C-c l"
+	  lsp-headerline-breadcrumb-enable nil
+	  lsp-lens-enable nil)
+    (defun my/lsp-mode-setup-completion ()
+      (setf (alist-get 'styles (alist-get 'lsp-capf completion-category-defaults))
+	    '(orderless))) ;; Configure orderless
+    :hook ((lsp-completion-mode . my/lsp-mode-setup-completion)
+	   (c-mode . lsp-deferred)
+	   (c++-mode . lsp-deferred)
+	   (python-mode . lsp-deferred)
+	   (csharp-mode . lsp-deferred))
+
+    :custom
+    (lsp-completion-provider :none) ; corfu
+    (lsp-idle-delay 0.2)
+    )
+
+  (use-package lsp-ui
+    :hook (lsp-mode . lsp-ui-mode)
+    :bind ("C-c r" . lsp-ui-peek-find-references)
+
+
+#+END_SRC
 
+** Flycheck
+#+BEGIN_SRC
+  (use-package flycheck
+  :config
+  (add-hook 'after-init-hook #'global-flycheck-mode))
 #+END_SRC
 
 ** Corfu
@@ -201,7 +222,7 @@
     (corfu-cycle t)
     (corfu-auto t)
     (corfu-auto-prefix 2)
-    (corfu-auto-delay 0.3)
+    (corfu-auto-delay 0.1)
     (corfu-popupinfo-delay '(0.2 . 0.1))
     (corfu-preview-current 'insert)
     (corfu-preselect 'first)