From 303b8e2ed8b836858b4dc6ca2210178ace9c6b6f Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Thu, 9 Nov 2023 03:00:14 +0300
Subject: 2023-11-09

---
 modules/common/emacs/default.nix    |  7 +++++-
 modules/common/emacs/doom/config.el | 49 ++++++++++++++-----------------------
 modules/common/emacs/doom/init.el   |  6 ++---
 3 files changed, 28 insertions(+), 34 deletions(-)

(limited to 'modules/common/emacs')

diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index dfc657c..e7597ad 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -83,6 +83,8 @@ in {
                     gnumake # :term vterm
                     gnuplot # :lang (org +gnuplot)
                     gnutls # doom!
+                    go # :lang go org
+                    gocode # :lang go org
                     gomodifytags # :lang go
                     gopls # :lang (go +lsp)
                     gore # :lang go
@@ -154,7 +156,10 @@ in {
                       circe-default-user circe-default-nick)
 
                 ;; :lang plantuml
-                (setq org-plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar")
+                (setq plantuml-jar-path "${pkgs.plantuml}/lib/plantuml.jar"
+                      plantuml-executable-path "${pkgs.plantuml}/bin/plantuml"
+                      org-plantuml-jar-path plantuml-jar-path
+                      org-plantuml-executable-path plantuml-executable-path)
 
                 ;; :input japanese
                 (setq migemo-dictionary "${pkgs.cmigemo}/share/migemo/utf-8/migemo-dict")
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 493a79a..df8b82e 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -50,7 +50,6 @@
                                  ("WAIT" . +org-todo-onhold)
                                  ("HOLD" . +org-todo-onhold)
                                  ("PROJ" . +org-todo-project)
-                                 ("NO"   . +org-todo-cancel)
                                  ("KILL" . +org-todo-cancel))
         org-capture-templates '(("t" "Personal todo" entry
                                  (file+headline +org-capture-todo-file "Inbox")
@@ -62,13 +61,13 @@
                                  (file+olp+datetree +org-capture-journal-file)
                                  "* %U %?\n%i\n%a" :prepend t)
                                 ("p" "Templates for projects")
-                                ("pt" "Project-local todo" entry  ; {project-root}/todo.org
+                                ("pt" "Project-local todo" entry
                                  (file+headline +org-capture-project-todo-file "Inbox")
                                  "* TODO %?\n%i\n%a" :prepend t)
-                                ("pn" "Project-local notes" entry  ; {project-root}/notes.org
+                                ("pn" "Project-local notes" entry
                                  (file+headline +org-capture-project-notes-file "Inbox")
                                  "* %U %?\n%i\n%a" :prepend t)
-                                ("pc" "Project-local changelog" entry  ; {project-root}/changelog.org
+                                ("pc" "Project-local changelog" entry
                                  (file+headline +org-capture-project-changelog-file "Unreleased")
                                  "* %U %?\n%i\n%a" :prepend t)
                                 ("o" "Centralized templates for projects")
@@ -104,6 +103,13 @@
         org-roam-ui-update-on-save t
         org-roam-ui-open-on-start t))
 
+;;
+;;; PlantUML
+;;
+
+(setq plantuml-default-exec-mode 'executable
+      org-plantuml-exec-mode 'plantuml)
+
 ;;
 ;;; Elisp
 ;;
@@ -166,32 +172,15 @@
 ;;; Circe
 ;;
 
-(defun nixfiles/irc-bouncer-password-f (&rest _)
-  (+pass-get-secret "server/soju.manwe.shire.net/azahi"))
-
-(set-irc-server! "libera"
-  `(:host "shire.net"
-    :port 6667
-    :user "azahi/libera"
-    :pass nixfiles/irc-bouncer-password-f))
-
-(set-irc-server! "oftc"
-  `(:host "shire.net"
-    :port 6667
-    :user "azahi/oftc"
-    :pass nixfiles/irc-bouncer-password-f))
-
-(set-irc-server! "hackint"
-  `(:host "shire.net"
-    :port 6667
-    :user "azahi/hackint"
-    :pass nixfiles/irc-bouncer-password-f))
-
-(set-irc-server! "rizon"
-  `(:host "shire.net"
-    :port 6667
-    :user "azahi/rizon"
-    :pass nixfiles/irc-bouncer-password-f))
+(setq circe-network-options
+      (mapcar (lambda (server)
+                `(,server :server-buffer-name ,server
+                          :host "shire.net"
+                          :port 6667
+                          :user ,(concat circe-default-user "/" server)
+                          :pass ,(lambda (&rest _)
+                                   (+pass-get-secret "server/soju.manwe.shire.net/azahi"))))
+              '("libera" "oftc" "hackint" "rizon")))
 
 ;;
 ;;; Hledger
diff --git a/modules/common/emacs/doom/init.el b/modules/common/emacs/doom/init.el
index a76d0e3..3b26e0d 100644
--- a/modules/common/emacs/doom/init.el
+++ b/modules/common/emacs/doom/init.el
@@ -10,12 +10,12 @@
        doom
        ;; doom-dashboard
        ;; doom-quit
-       ;; emoji
+       (emoji +unicode)
        hl-todo
        hydra
        indent-guides
-       ;; ligatures
-       ;; modeline
+       (ligatures +extra)
+       (modeline +light)
        ;; nav-flash
        ophints
        (popup +defaults)
-- 
cgit v1.2.3