oi

1 files changed, 8 insertions, 31 deletions

diff --git a/init-el.org b/init-el.org
index f98b746..02acf49 100644
--- a/init-el.org
+++ b/init-el.org
@@ -599,6 +599,7 @@ New in emacs 28, native compilation can be enabled:
 
 (setq my-installed-themes
       '(
+        warm-night-theme
         badger-theme
         spacemacs-theme
         moe-theme
@@ -622,17 +623,16 @@ New in emacs 28, native compilation can be enabled:
 #+begin_src elisp :results none
 
 (setq *my-themes*
-      '(modus-operandi-tinted
+      '(modus-operandi-tritanopia
         spacemacs-light
         moe-light
         avk-daylight
         shades-of-purple
         yoshi
         morgentau
-        timu-caribbean
-        badger
-        solarized-selenized-black
-        modus-vivendi-tinted))
+        warm-night
+        solarized-dark-high-contrast
+        modus-vivendi-tritanopia))
 
 (when (car custom-enabled-themes)
   (disable-theme (car custom-enabled-themes)))
@@ -1175,8 +1175,6 @@ stand up and move around.
 <<software-dev-essentials>>
 <<shell-config>>
 <<common-lisp-config>>
-<<ocaml-config>>
-<<haskell-config>>
 <<c-and-cpp-config>>
 <<haxe>>
 #+end_src
@@ -1400,6 +1398,8 @@ from debian contrib
 (add-to-list 'auto-mode-alist (cons "\\.lass\\'" 'lisp-mode))
 (add-to-list 'auto-mode-alist (cons "\\.spinneret\\'" 'lisp-mode))
 
+(add-hook 'lisp-mode-hook #'linum-mode)
+
 
 (defun space-for-delimiter-after-$-p (delimiter endp)
   (not (char-equal ?$ (char-before (point))))) 
@@ -1451,6 +1451,7 @@ from debian contrib
    (#:slice #:coalton-library/slice)
    (#:hashtable #:coalton-library/hashtable)
    (#:st #:coalton-library/monad/state)
+   (#:free #:coalton-library/monad/free)
    (#:iter #:coalton-library/iterator)
    (#:sys #:coalton-library/system)))
 
@@ -1474,30 +1475,6 @@ from debian contrib
 : insert-coalton-defpackage
 
 
-** OCaml
-#+name: ocaml-config
-#+begin_src elisp :noweb no-export :results none
-(package-install 'tuareg)
-
-(let ((opam-share (ignore-errors (car (process-lines "opam" "var" "share")))))
-  (when (and opam-share (file-directory-p opam-share))
-    ;; Register Merlin
-    (add-to-list 'load-path (expand-file-name "emacs/site-lisp" opam-share))
-       (autoload 'merlin-mode "merlin" nil t nil)
-       ;; Automatically start it in OCaml buffers
-       (add-hook 'tuareg-mode-hook 'merlin-mode t)
-       (add-hook 'caml-mode-hook 'merlin-mode t)
-       ;; Use opam switch to lookup ocamlmerlin binary
-       (setq merlin-command 'opam)))
-#+end_src
-
-** Haskell
-
-#+name: haskell-config
-#+begin_src elisp :noweb no-export :results none
-
-#+end_src
-
 ** C/C++
 
 #+name: c-and-cpp-config