From d76ac0ed8af07b72b7af6ae5e89ac22340d78e97 Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Fri, 30 Jan 2026 15:15:41 +1100 Subject: [PATCH] Update --- init.el | 5 -- lisp/init-completion.el | 6 -- lisp/init-org.el | 9 +-- lisp/init-workspace.el | 118 ++++++++++++++++++++-------------------- 4 files changed, 61 insertions(+), 77 deletions(-) diff --git a/init.el b/init.el index a075be2..af41cad 100644 --- a/init.el +++ b/init.el @@ -13,18 +13,13 @@ (require 'init-window) (require 'init-ui) -;; (require 'init-meow) (require 'init-bindings) - (require 'init-workspace) (require 'init-dired) -;; (require 'init-treemacs) -;; (require 'init-dashboard) (require 'init-llm) -;; (require 'init-lsp) (require 'init-coding) (require 'init-check) (require 'init-eglot) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 8e9884e..d88600f 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -111,12 +111,6 @@ ;; Consulting completing-read (use-package consult - :defines (xref-show-xrefs-function xref-show-definitions-function) - :defines shr-color-html-colors-alist - :autoload (consult-register-format consult-register-window consult-xref) - :autoload (consult--read consult--customize-put) - :commands (consult-narrow-help) - :functions (list-colors-duplicates consult-colors--web-list) :bind (("C-." . consult-imenu) ("C-c T" . consult-theme) diff --git a/lisp/init-org.el b/lisp/init-org.el index 29620c4..ffd2ee6 100644 --- a/lisp/init-org.el +++ b/lisp/init-org.el @@ -11,6 +11,7 @@ :branch "dev") :hook (org-mode . org-cdlatex-mode) :hook (org-mode . org-indent-mode) + :hook (org-mode . visual-line-mode) :pretty-hydra ;; See `org-structure-template-alist' @@ -187,10 +188,6 @@ the element after the #+HEADER: tag." :hook (org-mode . org-latex-preview-mode) :hook (org-latex-preview-mode . org-latex-preview-center-mode) :config - ;; Increase preview width - (plist-put org-latex-preview-appearance-options - :page-width 0.8) - ;; ;; Block C-n, C-p etc from opening up previews when using `org-latex-preview-mode' ;; (setq org-latex-preview-mode-ignored-commands ;; '(next-line previous-line mwheel-scroll @@ -198,7 +195,7 @@ the element after the #+HEADER: tag." (setq org-latex-preview-numbered t) (setq org-latex-preview-mode-display-live t) - (setq org-latex-preview-mode-update-delay 0.25)) + (setq org-latex-preview-mode-update-delay 0.25) (defun my/org-latex-preview-uncenter (ov) (overlay-put ov 'before-string nil)) (defun my/org-latex-preview-recenter (ov) @@ -230,7 +227,7 @@ the element after the #+HEADER: tag." (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))) + #'my/org-latex-preview-uncenter)))) (use-package org-roam :ensure t diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el index 402a22c..986a28c 100644 --- a/lisp/init-workspace.el +++ b/lisp/init-workspace.el @@ -1,67 +1,65 @@ ;; -*- lexical-binding: t; -*- -;; (use-package persp-mode -;; :hook (elpaca-after-init . persp-mode) -;; :custom -;; (persp-mode-prefix-key "o") -;; :config -;; (setq wg-morph-on nil) -;; (setq persp-autokill-buffer-on-remove 'kill-weak)) - -;; (use-package persp-projectile -;; :after (persp-mode projectile)) - -;; (use-package projectile -;; :hook (elpaca-after-init . projectile-mode) -;; :bind ([remap projectile-switch-project] . projectile-persp-switch-project) -;; :custom -;; (projectile-enable-caching t) -;; :config -;; ;; Recommended keymap prefix on Windows/Linux -;; (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)) - -(use-package project) - -(use-package tabspaces - :functions tabspaces-mode - :hook (elpaca-after-init . tabspaces-mode) +(use-package persp-mode + :hook (elpaca-after-init . persp-mode) :custom - (tab-bar-show nil) - - (tabspaces-use-filtered-buffers-as-default t) - (tabspaces-default-tab "Default") - (tabspaces-remove-to-default t) - (tabspaces-include-buffers '("*scratch*" "*Messages*")) - (tabspaces-exclude-buffers '("*eat*" "*vterm*" "*shell*" "*eshell*")) - ;; sessions - (tabspaces-session t) - (tabspaces-session-auto-restore t) - (tabspaces-keymap-prefix "C-c o") + (persp-mode-prefix-key "o") :config - (with-no-warnings - ;; Filter Buffers for Consult-Buffer - (with-eval-after-load 'consult - ;; hide full buffer list (still available with "b" prefix) - (consult-customize consult--source-buffer :hidden t :default nil) - ;; set consult-workspace buffer list - (defvar consult--source-workspace - (list :name "Workspace Buffer" - :narrow ?w - :history 'buffer-name-history - :category 'buffer - :state #'consult--buffer-state - :default t - :items (lambda () (consult--buffer-query - :predicate #'tabspaces--local-buffer-p - :sort 'visibility - :as #'buffer-name))) - "Set workspace buffer list for consult-buffer.") - (add-to-list 'consult-buffer-sources 'consult--source-workspace)) + (setq wg-morph-on nil) + (setq persp-autokill-buffer-on-remove 'kill-weak)) - (defun my-tabspaces-burry-window (&rest _) - "Burry *Messages* buffer." - (ignore-errors - (quit-windows-on messages-buffer-name))) - (advice-add #'tabspaces-restore-session :after #'my-tabspaces-burry-window))) +(use-package persp-projectile + :after (persp-mode projectile)) + +(use-package projectile + :hook (elpaca-after-init . projectile-mode) + :bind ([remap projectile-switch-project] . projectile-persp-switch-project) + :custom + (projectile-enable-caching t) + :config + ;; Recommended keymap prefix on Windows/Linux + (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)) + +;; (use-package tabspaces +;; :functions tabspaces-mode +;; :hook (elpaca-after-init . tabspaces-mode) +;; :custom +;; (tab-bar-show nil) + +;; (tabspaces-use-filtered-buffers-as-default t) +;; (tabspaces-default-tab "Default") +;; (tabspaces-remove-to-default t) +;; (tabspaces-include-buffers '("*scratch*" "*Messages*")) +;; (tabspaces-exclude-buffers '("*eat*" "*vterm*" "*shell*" "*eshell*")) +;; ;; sessions +;; (tabspaces-session t) +;; (tabspaces-session-auto-restore t) +;; (tabspaces-keymap-prefix "C-c o") +;; :config +;; (with-no-warnings +;; ;; Filter Buffers for Consult-Buffer +;; (with-eval-after-load 'consult +;; ;; hide full buffer list (still available with "b" prefix) +;; (consult-customize consult--source-buffer :hidden t :default nil) +;; ;; set consult-workspace buffer list +;; (defvar consult--source-workspace +;; (list :name "Workspace Buffer" +;; :narrow ?w +;; :history 'buffer-name-history +;; :category 'buffer +;; :state #'consult--buffer-state +;; :default t +;; :items (lambda () (consult--buffer-query +;; :predicate #'tabspaces--local-buffer-p +;; :sort 'visibility +;; :as #'buffer-name))) +;; "Set workspace buffer list for consult-buffer.") +;; (add-to-list 'consult-buffer-sources 'consult--source-workspace)) + +;; (defun my-tabspaces-burry-window (&rest _) +;; "Burry *Messages* buffer." +;; (ignore-errors +;; (quit-windows-on messages-buffer-name))) +;; (advice-add #'tabspaces-restore-session :after #'my-tabspaces-burry-window))) (provide 'init-workspace)