Compare commits

..

No commits in common. "c40ff73059bb8d8263c380d7725d82b76b23a350" and "71da8bd68a35c46770f54270deac5ecd1cf4b413" have entirely different histories.

View file

@ -1646,24 +1646,6 @@ Highlighting for device tree configuration.
(use-package dts-mode)
#+end_src
*** OCaml
[[https://github.com/ocaml/tuareg][Tuareg]] is the recommended OCaml mode
#+begin_src emacs-lisp
(use-package tuareg)
#+end_src
[[https://github.com/ocaml/merlin][Merlin]] adds context-sensitive completion
#+begin_src emacs-lisp
(use-package merlin
:init (setq merlin-command "ocamlmerlin")
:hook (tuareg-mode . merlin-mode))
#+end_src
* Org
** Main org setup
@ -1720,7 +1702,7 @@ Hooks
((org-mode . org-indent-mode)
(org-mode . turn-on-visual-line-mode)
(org-mode . variable-pitch-mode)
(org-mode . (lambda () (display-line-numbers-mode -1)))
(org-mode . (lambda () (display-line-numbers-mode nil)))
(org-mode-indent . (lambda () (diminish 'org-indent-mode)))
(org-agenda-mode . (lambda () (hl-line-mode 1))))
#+end_src