about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAspen Smith <root@gws.fyi>2024-02-05T22·22-0500
committerclbot <clbot@tvl.fyi>2024-02-05T22·27+0000
commit2eafdbde321ae25b7cb9eeb3e20d8a45af393e1a (patch)
treec580e44fccc48b296593bf58f95c123ec02aa4f3
parentc397aaceef4ab72a9437eeb6fb97d534dce1b663 (diff)
feat(grfn/emacs): More ocaml config r/7477
Change-Id: I12d20f36226ed0d262d1bea4efcabfff8718d365
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10744
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: aspen <root@gws.fyi>
Tested-by: BuildkiteCI
-rw-r--r--users/grfn/emacs.d/config.el17
-rw-r--r--users/grfn/emacs.d/init.el2
2 files changed, 17 insertions, 2 deletions
diff --git a/users/grfn/emacs.d/config.el b/users/grfn/emacs.d/config.el
index 5549a621dcc7..6398feace8cb 100644
--- a/users/grfn/emacs.d/config.el
+++ b/users/grfn/emacs.d/config.el
@@ -347,7 +347,9 @@
   (set-face-foreground 'slack-message-output-header +solarized-s-base01)
   (set-face-attribute 'slack-message-output-header nil :underline nil)
   (set-face-attribute 'slack-message-output-text nil :height 1.0)
-  )
+  (set-face-attribute 'caml-types-expr-face
+                      nil
+                      :background +solarized-s-base2))
 
 (after! solarized-theme
   (set-face-foreground 'font-lock-doc-face +solarized-s-base1)
@@ -1122,3 +1124,16 @@
   :quit nil)
 
 (setq elcord-editor-icon "emacs_icon")
+
+;;; ocaml
+
+(after! merlin-mode
+  (set-face-attribute
+   'caml-types-expr-face
+   nil
+   :background +solarized-s-base2)
+  (add-hook! merlin-mode
+     (setq whitespace-line-column 90)))
+
+(use-package! dune-format
+  :hook (dune-mode . dune-format-on-save-mode))
diff --git a/users/grfn/emacs.d/init.el b/users/grfn/emacs.d/init.el
index cbc2dc24b58e..46530ab950a0 100644
--- a/users/grfn/emacs.d/init.el
+++ b/users/grfn/emacs.d/init.el
@@ -113,7 +113,7 @@
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
        nix               ; I hereby declare "nix geht mehr!"
-       ;;ocaml             ; an objective camel
+       ocaml             ; an objective camel
        (org              ; organize your plain life in plain text
         +dragndrop       ; drag & drop files/images into org buffers
         +attach          ; custom attachment system