about summary refs log tree commit diff
path: root/modules/common/emacs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--modules/common/emacs/default.nix10
-rw-r--r--modules/common/emacs/doom/config.el32
2 files changed, 4 insertions, 38 deletions
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 082b3c3..439a6bc 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -71,6 +71,7 @@ in {
                     cmigemo # :lang japanese
                     config.hm.programs.emacs.package # !doom
                     config.nix.package # !doom
+                    delve # :lang go :tools debugger
                     dockerfile-language-server-nodejs # :tools (docker +lsp)
                     dockfmt # :tools docker :editor format
                     editorconfig-core-c # :tools editorconfig
@@ -198,7 +199,6 @@ in {
                       org-plantuml-jar-path plantuml-jar-path
                       org-plantuml-executable-path plantuml-executable-path)
 
-
                 ;; :app irc
                 (setq circe-default-nick "${my.username}"
                       circe-default-realname "${my.email}"
@@ -248,14 +248,6 @@ in {
           # https://github.com/akermu/emacs-libvterm
           if [[ "$INSIDE_EMACS" = vterm ]] && [[ -n "$EMACS_VTERM_PATH" ]] && [[ -f "$EMACS_VTERM_PATH/etc/emacs-vterm-bash.sh" ]]; then
               source "$EMACS_VTERM_PATH/etc/emacs-vterm-bash.sh"
-
-              message() {
-                  vterm_cmd message "%s" "$*"
-              }
-
-              find-file() {
-                  vterm_cmd find-file "$(realpath "''${@:-.}")"
-              }
           fi
 
           # Not sourced from inside Emacs for some reason. Maybe it's not
diff --git a/modules/common/emacs/doom/config.el b/modules/common/emacs/doom/config.el
index 13eb5ba..70116f8 100644
--- a/modules/common/emacs/doom/config.el
+++ b/modules/common/emacs/doom/config.el
@@ -64,41 +64,15 @@
                                  ("HOLD" . +org-todo-onhold)
                                  ("PROJ" . +org-todo-project)
                                  ("KILL" . +org-todo-cancel))
-        org-capture-templates '(("t" "Personal todo" entry
+        org-capture-templates '(("t" "Todo" entry
                                  (file+headline +org-capture-todo-file "Inbox")
                                  "* TODO %?\n%i\n%a" :prepend t)
-                                ("n" "Personal notes" entry
+                                ("n" "Note" entry
                                  (file+headline +org-capture-notes-file "Inbox")
                                  "* %u %?\n%i\n%a" :prepend t)
                                 ("j" "Journal" entry
                                  (file+olp+datetree +org-capture-journal-file)
-                                 "* %U %?\n%i\n%a" :prepend t)
-                                ("p" "Templates for projects")
-                                ("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
-                                 (file+headline +org-capture-project-notes-file "Inbox")
-                                 "* %U %?\n%i\n%a" :prepend t)
-                                ("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")
-                                ("ot" "Project todo" entry
-                                 (function +org-capture-central-project-todo-file)
-                                 "* TODO %?\n %i\n %a"
-                                 :heading "Tasks"
-                                 :prepend nil)
-                                ("on" "Project notes" entry
-                                 (function +org-capture-central-project-notes-file)
-                                 "* %U %?\n %i\n %a"
-                                 :heading "Notes"
-                                 :prepend t)
-                                ("oc" "Project changelog" entry
-                                 (function +org-capture-central-project-changelog-file)
-                                 "* %U %?\n %i\n %a"
-                                 :heading "Changelog"
-                                 :prepend t))))
+                                 "* %U %?\n%i\n%a" :prepend t))))
 
 (add-hook! 'org-mode-hook 'auto-fill-mode)
 

Consider giving Nix/NixOS a try! <3