From 2a79357d343011e44ec1df3c028e857ce05e5049 Mon Sep 17 00:00:00 2001
From: Zelong Kuang <zelongk@wasteproducer.home.arpa>
Date: Sun, 21 Dec 2025 14:53:44 +1100
Subject: [PATCH] Update

---
 lisp/init-coding.el     |  4 ++-
 lisp/init-completion.el |  9 ++++---
 lisp/init-workspace.el  | 59 +++++++++++------------------------------
 3 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/lisp/init-coding.el b/lisp/init-coding.el
index cec4819..316583a 100644
--- a/lisp/init-coding.el
+++ b/lisp/init-coding.el
@@ -3,8 +3,10 @@
 (use-package transient)
 
 (use-package magit
+  :bind (("C-c g" . magit-dispatch))
   :config
-  (setq magit-show-long-lines-warning nil))
+  (setq magit-show-long-lines-warning nil)
+  )
 
 ;; (use-package eat
 ;;   :ensure `(eat :repo "https://codeberg.org/akib/emacs-eat"
diff --git a/lisp/init-completion.el b/lisp/init-completion.el
index 80ffa68..2a49be2 100644
--- a/lisp/init-completion.el
+++ b/lisp/init-completion.el
@@ -121,13 +121,13 @@
 	 ("C-c T" . consult-theme)
 
 	 ([remap Info-search]        . consult-info)
-         ;; ([remap isearch-forward]    . consult-line)
-         ([remap recentf-open-files] . consult-recent-file)
+     ;; ([remap isearch-forward]    . consult-line)
+     ([remap recentf-open-files] . consult-recent-file)
 
 
 	 ("s-f" . consult-line)
 	 ("C-c s s" . consult-line)
-	 ("C-c p f" . consult-project-buffer)
+	 ("C-c p f" . consult-projectile)
 	 ("C-c f r" . consult-recent-file)
 	 ("C-x C-b" . consult-buffer)
 	 ("C-c s p" . consult-ripgrep))
@@ -135,7 +135,8 @@
   :init
   (setq register-preview-delay 0.5
         register-preview-function #'consult-register-format))
- 
+
+(use-package consult-projectile)
 
 (use-package consult-dir
   :ensure t
diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el
index bd268d8..58f0755 100644
--- a/lisp/init-workspace.el
+++ b/lisp/init-workspace.el
@@ -1,51 +1,22 @@
 ;; -*- lexical-binding: t; -*-
-  
-(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 w")
+  (persp-mode-prefix-key "w")
   :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-delete-childframe (&rest _)
-      "Delete all child frames."
-      (ignore-errors
-        (posframe-delete-all)))
-    (advice-add #'tabspaces-save-session :before #'my-tabspaces-delete-childframe)
+(use-package persp-projectile
+  :after persp-mode)
 
-    (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 projectile
+  :hook (elpaca-after-init . projectile-mode)
+  :custom
+  (projectile-enable-caching t)
+  :config
+  ;; Recommended keymap prefix on Windows/Linux
+  (define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map))
 
 (provide 'init-workspace)