update with clojure hooks and theme

2 files changed, 41 insertions, 9 deletions

diff --git a/configuration.el b/configuration.el
index ed9a7e0..133c7b3 100644
--- a/configuration.el
+++ b/configuration.el
@@ -236,24 +236,29 @@
   :hook ((sly-mode . corfu-mode)))
 
 (use-package cider
-  :straight t)
+  :straight t
+  :hook (cider-mode . corfu-mode))
 
 (use-package clojure-mode
   :straight t
-  :hook (clojure-mode . lsp-deferred))
+  :after cider
+  :hook ((clojure-mode . lsp-deferred)))
 
 (use-package rainbow-delimiters
   :straight t
   :hook
   (lisp-mode . rainbow-delimiters-mode)
   (emacs-lisp-mode . rainbow-delimiters-mode)
-  (lfe-mode . rainbow-delimiters-mode))
+  (lfe-mode . rainbow-delimiters-mode)
+  (clojure-mode . rainbow-delimiters-mode))
 
 (use-package smartparens
   :straight t
   :hook ((lisp-mode . smartparens-mode)
 	 (emacs-lisp-mode . smartparens-mode)
-	 (lfe-mode . smartparens-mode))
+	 (lfe-mode . smartparens-mode)
+	 (clojure-mode . smartparens-mode)
+	 (cider-mode . smartparens-mode))
   :bind (:map smartparens-mode-map
 	      ("C-M-<right>" . 'sp-forward-sexp)
 	      ("C-M-<left>" . 'sp-backward-sexp)
@@ -272,7 +277,8 @@
 (use-package protobuf-mode
   :straight t)
 
-(load-file ".emacs.d/postgres-secrets.el")
+(when (file-exists-p "~/.emacs.d/postgres-secrets.el")
+  (load-file "~/.emacs.d/postgres-secrets.el"))
 
 (use-package sqlformat
   :straight t
@@ -281,5 +287,26 @@
   (sqlformat-command 'pgformatter)
   (sqlformat-args '("-s2" "-g")))
 
+(lsp-register-client
+  (make-lsp-client
+   :new-connection
+   (lsp-stdio-connection (list "swipl"
+                               "-g" "use_module(library(lsp_server))."
+                               "-g" "lsp_server:main"
+                               "-t" "halt"
+                               "--" "stdio"))
+   :major-modes '(prolog-mode)
+   :priority 1
+   :multi-root t
+   :server-id 'prolog-ls))
+
+(use-package c++-mode
+  :after lsp-mode
+  :hook (c++-mode . lsp-deferred))
+
+(use-package tuareg
+  :straight t
+  :hook (tuareg-mode . lsp-deferred))
+
 (provide 'configuration)
 ;;; configuration.el ends here
diff --git a/theme.el b/theme.el
index 617070c..4faeb09 100644
--- a/theme.el
+++ b/theme.el
@@ -1,5 +1,9 @@
 (require 'use-package)
 
+(use-package color-theme-modern
+  :straight t
+  :config (load-theme 'snowish :no-confirm))
+
 ;; (use-package catppuccin-theme
 ;;   :straight t
 ;;   :custom catppuccin-flavor 'mocha
@@ -13,9 +17,9 @@
 ;;    :straight t
 ;;    :config (load-theme 'pastelmac t))
 
-(use-package color-theme-sanityinc-tomorrow
-  :straight t
-  :config (load-theme 'sanityinc-tomorrow-blue))
+;; (use-package color-theme-sanityinc-tomorrow
+;;   :straight t
+;;   :config (load-theme 'sanityinc-tomorrow-blue :no-confirm))
 
 ;; (use-package solarized-theme
 ;;   :straight t)
@@ -56,6 +60,7 @@
  '(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"))))
- '(default ((t (:family "Hack" :foundry "nil" :slant normal :weight regular :height 145 :width normal)))))
+ '(default ((t (:family "Menlo" :foundry "nil" :slant normal :weight regular :height 130 :width normal))))
+ )
 
 (provide 'theme)