From e52dce4e328a496e0a303522680453c891c96a9e Mon Sep 17 00:00:00 2001 From: benj Date: Fri, 4 Apr 2025 21:55:55 -0700 Subject: add changelog yasnippet; aphelia mode, and some web-mode config --- .gitignore | 1 + init.el | 14 ++++++++++---- snippets/org-mode/changelog-entry | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 snippets/org-mode/changelog-entry diff --git a/.gitignore b/.gitignore index b626c4a..d66cd3d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ emojis ensime history ido* +lsp-cache metastore_db* multisession/ network-security.data diff --git a/init.el b/init.el index d892eb9..5581e72 100644 --- a/init.el +++ b/init.el @@ -201,6 +201,7 @@ :ensure t :hook ((go-mode . lsp-mode) (python-mode . lsp) + (c-mode . lsp) (before-save . lsp-format-buffer) (before-save . lsp-organize-imports))) @@ -387,8 +388,8 @@ :ensure t :init (setq org-journal-dir org-dir-journal) - (setq org-journal-file-type 'weekly) - (setq org-journal-file-format "%Y%m%d.org") + (setq org-journal-file-type 'monthly) + (setq org-journal-file-format "%Y-%m.org") (setq org-journal-enable-agenda-integration t)) (use-package org-mode @@ -399,7 +400,7 @@ :prefix "C-c o" ("j o" . 'org-journal-open-current-journal-file) ("j n" . 'org-journal-new-entry) - ("j t" . 'org-journal-new-scheduled-entry)) + ("j s" . 'org-journal-new-scheduled-entry)) :hook ((org-mode . hl-todo-mode) (org-mode . olivetti-mode) @@ -551,7 +552,8 @@ ("\\.js?\\'" . web-mode) ("\\.ts?\\'" . web-mode)) :config - (setq web-mode-engines-alist '(("svelte" . ".svelte$"))) + (setq web-mode-engines-alist '(("svelte" . ".svelte$") + ("django" . "\\.html"))) :custom (web-mode-code-indent-offset 2) @@ -560,6 +562,7 @@ (web-mode-script-padding 2) (web-mode-style-padding 2) (web-mode-block-padding 2) + (apheleia-mode t) :hook ((web-mode . lsp) (web-mode . apheleia-mode))) @@ -574,6 +577,9 @@ :after lsp-mode :hook (lsp-mode . ws-butler-mode)) +(use-package yaml-mode + :ensure t) + (use-package yasnippet :ensure t ;; :bind (("" . 'yas-expand)) diff --git a/snippets/org-mode/changelog-entry b/snippets/org-mode/changelog-entry new file mode 100644 index 0000000..e3465a0 --- /dev/null +++ b/snippets/org-mode/changelog-entry @@ -0,0 +1,19 @@ +# -*- mode: snippet -*- +# name: changelog-entry +# key: