Skip to content

Commit

Permalink
dev: add support for ess, clean up babel
Browse files Browse the repository at this point in the history
  • Loading branch information
mcraveiro committed Jul 10, 2024
1 parent 35db086 commit bff9b29
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 17 deletions.
38 changes: 21 additions & 17 deletions config/development.org
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ _p_rev _u_pper (mine) _=_: upper/lower _r_esolve
(setq plantuml-jar-path "C:/opt/plantuml/plantuml.jar"
plantuml-default-exec-mode 'jar)
(setq plantuml-jar-path "/usr/share/plantuml/plantuml.jar"
plantuml-default-exec-mode 'executable)))
plantuml-default-exec-mode 'executable))
(setq org-plantuml-jar-path plantuml-jar-path))

(require 'plantuml-mode)
(defun cunene/plantuml-make-diagram ()
Expand All @@ -357,14 +358,15 @@ _p_rev _u_pper (mine) _=_: upper/lower _r_esolve
(goto-char (point-max))
(insert "Starting PlantUML "(format-time-string "%D %-I:%M %p")))
(display-buffer plantuml-buffer-name)
(clear-image-cache)
;; copied from plantuml-jar-start-process, which uses stdin (e.g. -p)
(apply #'start-process
"PLANTUML" plantuml-buffer-name plantuml-java-command
`(,@plantuml-java-args
,plantuml-jar-path
,(plantuml-jar-output-type-opt plantuml-jar-output-type-opt)
,@plantuml-jar-args
,plantuml-diagram))))
"PLANTUML" plantuml-buffer-name plantuml-java-command
`(,@plantuml-java-args
,plantuml-jar-path
,(plantuml-jar-output-type-opt plantuml-jar-output-type-opt)
,@plantuml-jar-args
,plantuml-diagram))))

(use-package flycheck-plantuml
:ensure t
Expand Down Expand Up @@ -703,6 +705,13 @@ START and END mark the region."
(use-package cmake-mode)
#+end_src

* Statistics

#+begin_src emacs-lisp
(use-package ess)
#+end_src


* C#
:PROPERTIES:
:ID: C1FF33A7-84FB-6754-81F3-15492FEF9114
Expand Down Expand Up @@ -982,18 +991,11 @@ TODO: for some reason we do not trigger the mode with =/**=, it seems to require

#+begin_src emacs-lisp
(use-package mustache-mode
:ensure t
:config
;; (org-babel-do-load-languages 'org-babel-load-languages
;; '((mustache . t)))
)
:ensure t)

(use-package mustache
:ensure t
:config
;; (org-babel-do-load-languages 'org-babel-load-languages
;; '((mustache . t)))
)
:config)
#+end_src

* SQL
Expand Down Expand Up @@ -1061,7 +1063,9 @@ TODO: for some reason we do not trigger the mode with =/**=, it seems to require
("codestral" . (make-llm-ollama
:chat-model "codestral:latest" :embedding-model "codestral:latest"))
("codeqwen" . (make-llm-ollama
:chat-model "codeqwen:latest" :embedding-model "codeqwen:latest"))
:chat-model "codeqwen:latest" :embedding-model "codeqwen:latest"))
("gemma2" . (make-llm-ollama
:chat-model "gemma2" :embedding-model ":gemma2"))
))
)
#+end_src
Expand Down
21 changes: 21 additions & 0 deletions config/features.org
Original file line number Diff line number Diff line change
Expand Up @@ -807,12 +807,33 @@ authoring documents with a fast and effective plain-text system.
org-adapt-indentation nil ;; 'headline-data https://emacs.stackexchange.com/questions/69199/is-there-indentation-in-org-src-blocks
org-duration-format (quote h:mm)
org-fold-core-style 'overlays) ;; https://github.com/org-roam/org-roam/pull/223
(org-babel-do-load-languages
'org-babel-load-languages
'(
(awk . t)
(calc .t)
(emacs-lisp . t)
(gnuplot . t)
(latex . t)
; (ledger . t)
(js . t)
; (http . t)
(python . t)
(gnuplot . t)
(R . t)
; (sh . t)
(sql . t)
(sqlite . t)
; (mustache . t)
(plantuml . t)))

(require 'ob-shell)
(require 'org-indent)
(add-to-list 'org-babel-load-languages '(shell . t))
(modify-syntax-entry ?' "'" org-mode-syntax-table)
(advice-add 'org-src--construct-edit-buffer-name :override #'cunene/org-src-buffer-name))


;; Follow org links on the same window.
;; https://emacs.stackexchange.com/questions/62720/open-org-link-in-the-same-window
(setf (cdr (assoc 'file org-link-frame-setup)) 'find-file)
Expand Down

0 comments on commit bff9b29

Please sign in to comment.