dap mode, eglot the new theme

2 files changed, 38 insertions, 28 deletions

diff --git a/configuration.el b/configuration.el
index 2918bcc..3db987b 100644
--- a/configuration.el
+++ b/configuration.el
@@ -15,7 +15,11 @@
 
 (use-package dap-mode
   :straight t
-  :after lsp-mode)
+  :after lsp-mode
+  :bind (("C-c M-n" . dap-next)
+         ("C-c M-s" . dap-step-in)
+         ("C-c M-a" . dap-step-out)
+         ("C-c M-w" . dap-continue)))
 
 (require 'dap-netcore)
 
@@ -100,7 +104,10 @@
 	   (corfu-popupinfo-defer corfu-auto-defer))
   :hook ((prog-mode . (lambda ()
 			(corfu-mode)
-			(cond ((not window-system) (corfu-terminal-mode)))))
+			(unless window-system (corfu-terminal-mode))))
+	 (sql-mode . (lambda ()
+			(corfu-mode -1)
+			(unless window-system (corfu-terminal-mode -1))))
 	 (corfu-mode . corfu-popupinfo-mode)
 	 (eshell-mode . corfu-mode)))
 
@@ -208,6 +215,13 @@
   (erlang-mode . lsp-deferred)
   (erlang-mode . yas-minor-mode))
 
+
+;; (use-package eglot
+;;   :straight t
+;;   :bind (:map eglot-mode-map
+;; 	      ("C-c C-d" . eglot-help-at-point)
+;; 	      ("C-c C-r" . eglot-code-actions)))
+
 ;; (use-package eglot
 ;;   :straight t)
 
@@ -296,23 +310,9 @@
 (use-package protobuf-mode
   :straight t)
 
-;; (when (file-exists-p "~/.emacs.d/postgres-secrets.el")
-;;   (load-file "~/.emacs.d/postgres-secrets.el"))
-
-(use-package emacs
-  :hook (sql-mode . (lambda ()
-		      (add-to-list 'sql-connection-alist
-				   '(dev (sql-product 'postgres)
-					 (sql-port 5433)
-					 (sql-user    "admin")
-					 (sql-server "localhost")
-					 (sql-database   "supabase")))
-		      (add-to-list 'sql-connection-alist
-				   '(supabase-local (sql-product 'postgres)
-						    (sql-port 54322)
-						    (sql-user    "postgres")
-						    (sql-server "localhost")
-						    (sql-database   "postgres"))))))
+(let ((secrets (concat (getenv "HOME") "/.emacs.d/secrets.el")))
+  (when (file-exists-p secrets)
+    (load-file secrets)))
 
 ;; (with-eval-after-load 'sql-mode
 ;;   (progn
@@ -367,7 +367,12 @@
 
 (use-package tuareg
   :straight t
-  :hook (tuareg-mode . lsp-deferred))
+  :after dap-mode
+  :hook (tuareg-mode . lsp-deferred)
+  :config
+  (require 'dap-mode)
+  (require 'dap-codelldb)
+  (require 'dap-ocaml))
 
 (use-package eros
   :straight t
diff --git a/theme.el b/theme.el
index 8fe1862..54ac7ce 100644
--- a/theme.el
+++ b/theme.el
@@ -3,7 +3,12 @@
 (use-package color-theme-modern
   :straight t
   ;; :config (load-theme 'snowish :no-confirm))
-  :config (load-theme 'deep-blue :no-confirm))
+  ;; :config (load-theme 'deep-blue :no-confirm))
+  :config (load-theme 'marquardt :no-confirm)
+  :init (if (seq-find (lambda (x) (eq 'marquardt x)) custom-enabled-themes)
+	    (set-face-attribute 'helm-selection nil
+				:background (color-lighten-name (face-attribute 'default :foreground) 50)
+				:foreground (color-darken-name (face-attribute 'default :background) 40))))
 
 ;; (use-package catppuccin-theme
 ;;   :straight t
@@ -54,13 +59,13 @@
 (display-time-mode +1)
 
 (custom-set-faces
- '(rainbow-delimiters-depth-1-face ((t (:foreground "systemTealColor"))))
- '(rainbow-delimiters-depth-2-face ((t (:foreground "Brown"))))
- '(rainbow-delimiters-depth-3-face ((t (:foreground "Blue"))))
- '(rainbow-delimiters-depth-4-face ((t (:foreground "Orange"))))
- '(rainbow-delimiters-depth-5-face ((t (:foreground "Purple"))))
- '(rainbow-delimiters-depth-6-face ((t (:foreground "dark green"))))
- '(rainbow-delimiters-depth-9-face ((t (:foreground "indian red"))))
+ '(rainbow-delimiters-depth-2-face ((t (:foreground "indian red"))))
+ '(rainbow-delimiters-depth-6-face ((t (:foreground "Brown"))))
+ '(rainbow-delimiters-depth-5-face ((t (:foreground "Blue"))))
+ '(rainbow-delimiters-depth-3-face ((t (:foreground "Orange"))))
+ '(rainbow-delimiters-depth-1-face ((t (:foreground "Purple"))))
+ '(rainbow-delimiters-depth-4-face ((t (:foreground "dark green"))))
+ '(rainbow-delimiters-depth-9-face ((t (:foreground "systemTealColor"))))
  (cond
   ((eq system-type 'darwin) '(default ((t (:family "Menlo" :foundry "nil" :slant normal :weight regular :height 180 :width normal)))))
   (t '(default ((t (:family "MesloLGS NF" :foundry "nil" :slant normal :weight regular :height 130 :width normal)))))))