tweaking, themes, beginning ocamlmodes, pomidor customization

1 files changed, 53 insertions, 10 deletions

diff --git a/init-el.org b/init-el.org
index 7b10363..ac148eb 100644
--- a/init-el.org
+++ b/init-el.org
@@ -584,9 +584,8 @@ New in emacs 28, native compilation can be enabled:
 ;(load "~/.emacs.d/shanty-themes.el")
 
 (setq my-installed-themes
-      '(gruvbox-theme
-        dracula-theme
-        solarized-theme
+      '(dracula-theme
+        kaolin-themes
         modus-themes
         shanty-themes))
 
@@ -608,15 +607,15 @@ New in emacs 28, native compilation can be enabled:
 (setq *my-themes*
       '(modus-operandi
         shanty-themes-light
-        gruvbox-light-hard
-        solarized-light
-        solarized-dark
+        kaolin-valley-light
+        kaolin-breeze
+        kaolin-temple
+        kaolin-shiva 
         dracula
-        gruvbox-dark-medium
         shanty-themes-dark
         modus-vivendi))
 
-(load-theme 'gruvbox-dark-medium t)
+(load-theme 'modus-vivendi t)
 
 (defun my-theme-string ()
   (if (car custom-enabled-themes)
@@ -773,6 +772,10 @@ stand up and move around.
 #+begin_src elisp :noweb no-export :results none
 
 (package-install 'pomidor)
+(setq pomidor-seconds (* 60 60)
+      pomidor-break-seconds (* 15 60)
+      pomidor-breaks-before-long 1000)
+
 
 #+end_src
 
@@ -951,7 +954,7 @@ stand up and move around.
 
 (setq elfeed-feeds
       '(
-        ("https://tinyklaus.substack.com/feed" ufology oddball frontpage)
+        ("http://blog.fogus.me/feed/" lisp blog frontpage)
         ("https://thereader.mitpress.mit.edu//feed" magazine frontpage culture philosophy science)
         ("https://blog.p-cos.net/categories/lisp/feed.xml" lisp frontpage)
         ("https://justinehsmith.substack.com/feed" blog newsletter )
@@ -962,7 +965,6 @@ stand up and move around.
         ("https://computer.rip/rss.xml"  technology)
         ("http://waywardmonkeys.org/feeds/all.atom.xml" lisp frontpage)
         ("https://www.sicpers.info/rss" frontpage)
-        ("https://manuelmoreale.com/feed" frontpage)
         ("https://www.stephendiehl.com/feed.rss" frontpage)
         ("https://www.raphkoster.com/feed/" frontpage gamedev)
         ("https://babbagefiles.xyz/posts/index.xml" frontpage lisp)
@@ -1104,6 +1106,9 @@ stand up and move around.
 <<software-dev-essentials>>
 <<shell-config>>
 <<common-lisp-config>>
+<<ocaml-config>>
+<<haskell-config>>
+<<c-and-cpp-config>>
 #+end_src
 ** Literate Programming
 
@@ -1218,10 +1223,15 @@ association one shell with each [[*Perspectives Leader Key Menu][perspective aka
 
 #+name: common-lisp-packages
 #+begin_src elisp :results none
+
 (package-install 'paredit)
 (package-install 'slime)
 (package-install 'slime-company)
 
+(setq slime-contribs
+      '(slime-fancy slime-company slime-fuzzy slime-asdf))
+
+
 #+end_src
 
 *** Starting SLIME with different Lisps
@@ -1279,9 +1289,11 @@ from debian contrib
     (?l "[l]oad file" slime-load-file)
     (?< "[<] list callers" slime-list-callers)
     (?> "[>] list callees" slime-list-callees)
+    (?s "[s]ymbol describe" slime-describe-symbol)
     (?d "[d]ocumentation" slime-documentation)
     (?\t "[TAB] inspect-presentation" slime-inspect-presentation-at-point)
     (?B "Open CLTL2 [B]ook" open-cltl2)
+    (?b "[b]rows system" slime-browse-system)
     (?h "[h]yperspec lookup" hyperspec-lookup)))
 
 (defun open-cltl2 ()
@@ -1335,3 +1347,34 @@ from debian contrib
 
 
 
+
+** 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
+#+begin_src elisp :noweb no-export :results none
+
+#+end_src