From 6dc8d480892d0aa49b12ac8be516220fe3fd6312 Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Fri, 5 Dec 2025 19:17:15 +1100 Subject: [PATCH] refactor(config): Remove unused packages and reorganize configuration - Remove meow cursor configuration - Remove nano-modeline package and configuration - Re-enable default Doom modeline - Comment out org-habit module - Improve code formatting and indentation in org-mode config - Remove stray "hello" text from config.org - Reorganize org-mode sections for better clarity --- config.el | 25 +------ config.org | 192 ++++++++++++++++++++++++++++------------------------ init.el | 2 +- packages.el | 49 +++++++------- 4 files changed, 134 insertions(+), 134 deletions(-) diff --git a/config.el b/config.el index 15a38b3..512d199 100644 --- a/config.el +++ b/config.el @@ -20,10 +20,6 @@ (setq display-line-numbers-type 'relative) (setq org-directory "~/org/") -(use-package! meow - :init - (setq meow-cursor-type-normal 'box)) - ;; (use-package! ef-themes ;; :ensure t ;; :init @@ -51,23 +47,6 @@ ;; ;; (modus-themes-load-theme 'ef-light) ;; ) -(use-package! nano-modeline - :config - (add-hook 'prog-mode-hook #'nano-modeline-prog-mode) - (add-hook 'text-mode-hook #'nano-modeline-text-mode) - (add-hook 'org-mode-hook #'nano-modeline-org-mode) - (add-hook 'pdf-view-mode-hook #'nano-modeline-pdf-mode) - (add-hook 'mu4e-headers-mode-hook #'nano-modeline-mu4e-headers-mode) - (add-hook 'mu4e-view-mode-hook #'nano-modeline-mu4e-message-mode) - (add-hook 'elfeed-show-mode-hook #'nano-modeline-elfeed-entry-mode) - (add-hook 'elfeed-search-mode-hook #'nano-modeline-elfeed-search-mode) - (add-hook 'term-mode-hook #'nano-modeline-term-mode) - (add-hook 'xwidget-webkit-mode-hook #'nano-modeline-xwidget-mode) - (add-hook 'messages-buffer-mode-hook #'nano-modeline-message-mode) - (add-hook 'org-capture-mode-hook #'nano-modeline-org-capture-mode) - (add-hook 'org-agenda-mode-hook #'nano-modeline-org-agenda-mode) - (global-hide-mode-line-mode t)) - (use-package! yasnippet :config (defun my-yas-try-expanding-auto-snippets () @@ -124,8 +103,6 @@ (define-key typst-ts-mode-map (kbd "C-c C-l") #'typst-preview-mode) ) -(add-to-list 'org-modules 'org-habit) - (use-package org-latex-preview :hook ((org-mode . org-latex-preview-mode) (org-latex-preview-mode . org-latex-preview-center-mode)) @@ -179,3 +156,5 @@ (remove-hook 'org-latex-preview-overlay-open-functions #'my/org-latex-preview-uncenter))) ) + +;; (add-to-list 'org-modules 'org-habit) diff --git a/config.org b/config.org index 81ccd45..23e9273 100644 --- a/config.org +++ b/config.org @@ -30,12 +30,6 @@ (setq org-directory "~/org/") #+end_src -*** Meow cursor -#+begin_src emacs-lisp -(use-package! meow - :init - (setq meow-cursor-type-normal 'box)) -#+end_src *** Themes #+begin_src emacs-lisp :tangle packages.el (package! catppuccin-theme) @@ -73,10 +67,10 @@ ;; ) #+end_src *** Nano modeline -#+begin_src emacs-lisp :tangle packages.el +#+begin_src emacs-lisp :tangle no (package! nano-modeline) #+end_src -#+begin_src emacs-lisp +#+begin_src emacs-lisp :tangle no (use-package! nano-modeline :config (add-hook 'prog-mode-hook #'nano-modeline-prog-mode) @@ -199,94 +193,118 @@ Thisenables the feature of auto-expanding snippets when matching the pattern (load-file "lisp/texpresso/texpresso.el") #+end_src *** Org -#+begin_src elisp -(add-to-list 'org-modules 'org-habit) +#+begin_src emacs-lisp :tangle packages.el +(package! org :recipe + (:host nil :repo "https://code.tecosaur.net/mirrors/org-mode.git" + :remote "mirror" :fork + (:host nil :repo "https://code.tecosaur.net/tec/org-mode.git" + :branch "dev" :remote "tecosaur") + :files (:defaults "etc") :build t :pre-build + (with-temp-file "lisp/org-version.el" + (require 'lisp-mnt) + (let + ((version + (with-temp-buffer + (insert-file-contents "lisp/org.el") + (lm-header "version"))) + (git-version + (string-trim + (with-temp-buffer + (call-process "git" nil t nil "rev-parse" + "--short" "HEAD") + (buffer-string))))) + (insert + (format + "(defun org-release () \"The release version of Org.\" %S)\n" + version) + (format + "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" + git-version) + "(provide 'org-version)\n")))) + :pin nil) +(unpin! org) #+end_src **** Latex live-preview (fast) 1. delete all org-* packages from emacs (can be done by deleting folders in .local/straight) 2. delete eln-cache 3. doom sync -u -#+begin_src emacs-lisp :tangle packages.el -(package! org :recipe - (:host nil :repo "https://git.tecosaur.net/mirrors/org-mode.git" :remote "mirror" :fork - (:host nil :repo "https://git.tecosaur.net/tec/org-mode.git" :branch "dev" :remote "tecosaur") - :files - (:defaults "etc") - :build t :pre-build - (with-temp-file "org-version.el" - (require 'lisp-mnt) - (let - ((version - (with-temp-buffer - (insert-file-contents "lisp/org.el") - (lm-header "version"))) - (git-version - (string-trim - (with-temp-buffer - (call-process "git" nil t nil "rev-parse" "--short" "HEAD") - (buffer-string))))) - (insert - (format "(defun org-release () \"The release version of Org.\" %S)\n" version) - (format "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" git-version) - "(provide 'org-version)\n")))) - :pin nil) -(unpin! org) -#+end_src #+begin_src emacs-lisp -(use-package org-latex-preview - :hook ((org-mode . org-latex-preview-mode) - (org-latex-preview-mode . org-latex-preview-center-mode)) - :config - ;; Increase preview width - ;; (plist-put org-latex-preview-appearance-options - ;; :page-width 0.8) + (use-package org-latex-preview + :hook ((org-mode . org-latex-preview-mode) + (org-latex-preview-mode . org-latex-preview-center-mode)) + :config + ;; Increase preview width + ;; (plist-put org-latex-preview-appearance-options + ;; :page-width 0.8) - ;; ;; Enable consistent equation numbering - (setq org-latex-preview-numbered t) + ;; ;; Enable consistent equation numbering + (setq org-latex-preview-numbered t) - ;; Bonus: Turn on live previews. This shows you a live preview of a LaTeX - ;; fragment and updates the preview in real-time as you edit it. - ;; To preview only environments, set it to '(block edit-special) instead - (setq org-latex-preview-mode-display-live t) + ;; Bonus: Turn on live previews. This shows you a live preview of a LaTeX + ;; fragment and updates the preview in real-time as you edit it. + ;; To preview only environments, set it to '(block edit-special) instead + (setq org-latex-preview-mode-display-live t) - ;; More immediate live-previews -- the default delay is 1 second - (setq org-latex-preview-mode-update-delay 0) + ;; More immediate live-previews -- the default delay is 1 second + (setq org-latex-preview-mode-update-delay 0) - ;; code for centering LaTeX previews -- a terrible idea - (defun my/org-latex-preview-uncenter (ov) - (overlay-put ov 'before-string nil)) - (defun my/org-latex-preview-recenter (ov) - (overlay-put ov 'before-string (overlay-get ov 'justify))) - (defun my/org-latex-preview-center (ov) - (save-excursion - (goto-char (overlay-start ov)) - (when-let* ((elem (org-element-context)) - ((or (eq (org-element-type elem) 'latex-environment) - (string-match-p "^\\\\\\[" (org-element-property :value elem)))) - (img (overlay-get ov 'display)) - (prop `(space :align-to (- center (0.55 . ,img)))) - (justify (propertize " " 'display prop 'face 'default))) - (overlay-put ov 'justify justify) - (overlay-put ov 'before-string (overlay-get ov 'justify))))) - (define-minor-mode org-latex-preview-center-mode - "Center equations previewed with `org-latex-preview'." - :global nil - (if org-latex-preview-center-mode - (progn - (add-hook 'org-latex-preview-overlay-open-functions - #'my/org-latex-preview-uncenter nil :local) - (add-hook 'org-latex-preview-overlay-close-functions - #'my/org-latex-preview-recenter nil :local) - (add-hook 'org-latex-preview-overlay-update-functions - #'my/org-latex-preview-center nil :local)) - (remove-hook 'org-latex-preview-overlay-close-functions - #'my/org-latex-preview-recenter) - (remove-hook 'org-latex-preview-overlay-update-functions - #'my/org-latex-preview-center) - (remove-hook 'org-latex-preview-overlay-open-functions - #'my/org-latex-preview-uncenter))) - ) + ;; code for centering LaTeX previews -- a terrible idea + (defun my/org-latex-preview-uncenter (ov) + (overlay-put ov 'before-string nil)) + (defun my/org-latex-preview-recenter (ov) + (overlay-put ov 'before-string (overlay-get ov 'justify))) + (defun my/org-latex-preview-center (ov) + (save-excursion + (goto-char (overlay-start ov)) + (when-let* ((elem (org-element-context)) + ((or (eq (org-element-type elem) 'latex-environment) + (string-match-p "^\\\\\\[" (org-element-property :value elem)))) + (img (overlay-get ov 'display)) + (prop `(space :align-to (- center (0.55 . ,img)))) + (justify (propertize " " 'display prop 'face 'default))) + (overlay-put ov 'justify justify) + (overlay-put ov 'before-string (overlay-get ov 'justify))))) + (define-minor-mode org-latex-preview-center-mode + "Center equations previewed with `org-latex-preview'." + :global nil + (if org-latex-preview-center-mode + (progn + (add-hook 'org-latex-preview-overlay-open-functions + #'my/org-latex-preview-uncenter nil :local) + (add-hook 'org-latex-preview-overlay-close-functions + #'my/org-latex-preview-recenter nil :local) + (add-hook 'org-latex-preview-overlay-update-functions + #'my/org-latex-preview-center nil :local)) + (remove-hook 'org-latex-preview-overlay-close-functions + #'my/org-latex-preview-recenter) + (remove-hook 'org-latex-preview-overlay-update-functions + #'my/org-latex-preview-center) + (remove-hook 'org-latex-preview-overlay-open-functions + #'my/org-latex-preview-uncenter))) + ) +#+end_src +**** Org-roam (deprecated) +#+begin_src emacs-lisp :tangle no + (use-package! org-roam + :ensure t + :custom + (org-roam-directory (file-truename "~/org/roam")) + :bind (("C-c n r l" . org-roam-buffer-toggle) + ("C-c n r f" . org-roam-node-find) + ("C-c n r g" . org-roam-graph) + ("C-c n r i" . org-roam-node-insert) + ("C-c n r c" . org-roam-capture) + ;; Dailies + ("C-c n r j" . org-roam-dailies-capture-today)) + :config + ;; If you're using a vertical completion framework, you might want a more informative completion interface + (setq org-roam-node-display-template (concat "${title:*} " (propertize "${tags:10}" 'face 'org-tag))) + (org-roam-db-autosync-mode) + ;; If using org-roam-protocol + (require 'org-roam-protocol)) +#+end_src +**** org habit +#+begin_src emacs-lisp +;; (add-to-list 'org-modules 'org-habit) #+end_src - -hello diff --git a/init.el b/init.el index e558d99..79fbaa7 100644 --- a/init.el +++ b/init.el @@ -37,7 +37,7 @@ ;; indent-guides ; highlighted indent columns ( ligatures +extras) ; ligatures and symbols to make your code pretty again ;;minimap ; show a map of the code on the side - ;; modeline ; snazzy, Atom-inspired modeline, plus API + modeline ; snazzy, Atom-inspired modeline, plus API ;;nav-flash ; blink cursor line after big motions ;;neotree ; a project drawer, like NERDTree for vim ophints ; highlight the region an operation acts on diff --git a/packages.el b/packages.el index 2c8a3fc..650c0c7 100644 --- a/packages.el +++ b/packages.el @@ -4,8 +4,6 @@ ;; (package! ef-themes) -(package! nano-modeline) - (package! rainbow-delimiters) (package! leetcode) @@ -16,26 +14,31 @@ :recipe (:host github :repo "havarddj/typst-preview.el")) (package! org :recipe - (:host nil :repo "https://git.tecosaur.net/mirrors/org-mode.git" :remote "mirror" :fork - (:host nil :repo "https://git.tecosaur.net/tec/org-mode.git" :branch "dev" :remote "tecosaur") - :files - (:defaults "etc") - :build t :pre-build - (with-temp-file "org-version.el" - (require 'lisp-mnt) - (let - ((version - (with-temp-buffer - (insert-file-contents "lisp/org.el") - (lm-header "version"))) - (git-version - (string-trim - (with-temp-buffer - (call-process "git" nil t nil "rev-parse" "--short" "HEAD") - (buffer-string))))) - (insert - (format "(defun org-release () \"The release version of Org.\" %S)\n" version) - (format "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" git-version) - "(provide 'org-version)\n")))) + (:host nil :repo "https://code.tecosaur.net/mirrors/org-mode.git" + :remote "mirror" :fork + (:host nil :repo "https://code.tecosaur.net/tec/org-mode.git" + :branch "dev" :remote "tecosaur") + :files (:defaults "etc") :build t :pre-build + (with-temp-file "lisp/org-version.el" + (require 'lisp-mnt) + (let + ((version + (with-temp-buffer + (insert-file-contents "lisp/org.el") + (lm-header "version"))) + (git-version + (string-trim + (with-temp-buffer + (call-process "git" nil t nil "rev-parse" + "--short" "HEAD") + (buffer-string))))) + (insert + (format + "(defun org-release () \"The release version of Org.\" %S)\n" + version) + (format + "(defun org-git-version () \"The truncate git commit hash of Org mode.\" %S)\n" + git-version) + "(provide 'org-version)\n")))) :pin nil) (unpin! org)