From b1cc14a6076391ed363cf7c582d8cce581834cc2 Mon Sep 17 00:00:00 2001 From: Zelong Kuang Date: Sun, 22 Feb 2026 20:44:07 +1100 Subject: [PATCH] Update --- lisp/init-bindings.el | 2 +- lisp/init-completion.el | 2 +- lisp/init-llm.el | 3 ++ lisp/init-ui.el | 1 + lisp/init-utils.el | 2 +- lisp/init-workspace.el | 103 +++++++++++++++++++++------------------- 6 files changed, 62 insertions(+), 51 deletions(-) diff --git a/lisp/init-bindings.el b/lisp/init-bindings.el index e2129bb..39c2689 100644 --- a/lisp/init-bindings.el +++ b/lisp/init-bindings.el @@ -15,6 +15,6 @@ (global-set-key (kbd "C-c q r") #'restart-emacs) (global-set-key (kbd "C-c C-c") #'compile) -(global-set-key (kbd "C-x C-b") #'ibuffer) +;; (global-set-key (kbd "C-x C-b") #'ibuffer) (provide 'init-bindings) diff --git a/lisp/init-completion.el b/lisp/init-completion.el index 38c0a7a..ff7922d 100644 --- a/lisp/init-completion.el +++ b/lisp/init-completion.el @@ -150,7 +150,7 @@ ("M-g k" . consult-keep-lines) ("M-g u" . consult-focus-lines) ("C-x C-r" . consult-recent-file) - ("C-x b" . consult-buffer) + ("C-x B" . consult-buffer) ("M-g e" . consult-isearch-history) :map isearch-mode-map diff --git a/lisp/init-llm.el b/lisp/init-llm.el index ca7772c..391e6d8 100644 --- a/lisp/init-llm.el +++ b/lisp/init-llm.el @@ -14,4 +14,7 @@ (use-package gptel-magit :hook (magit-mode . gptel-magit-install)) +(use-package gptel-agent + :config (gptel-agent-update)) + (provide 'init-llm) diff --git a/lisp/init-ui.el b/lisp/init-ui.el index 9919600..3882a9c 100644 --- a/lisp/init-ui.el +++ b/lisp/init-ui.el @@ -32,6 +32,7 @@ doric-wind doric-beach doric-earth + doric-water doric-valley)) (loaded (seq-random-elt themes))) (load-theme loaded :no-confirm))) diff --git a/lisp/init-utils.el b/lisp/init-utils.el index 6305066..e728ce1 100644 --- a/lisp/init-utils.el +++ b/lisp/init-utils.el @@ -37,7 +37,7 @@ (pdf-tools-install)) (use-package keycast - :hook (elpaca-after-init . keycast-tab-bar-mode) + :hook (elpaca-after-init . keycast-mode-line-mode) :config (setq keycast-mode-line-remove-tail-elements nil)) diff --git a/lisp/init-workspace.el b/lisp/init-workspace.el index 6de4c57..ef21703 100644 --- a/lisp/init-workspace.el +++ b/lisp/init-workspace.el @@ -3,58 +3,65 @@ (use-package project) -(use-package tab-bar - :ensure nil - :init - (tab-bar-mode t) - (setq tab-bar-new-tab-choice "*scratch*") ;; buffer to show in new tabs - (setq tab-bar-close-button-show nil) ;; hide tab close / X button - (setq tab-bar-show 1) ;; hide bar if <= 1 tabs open - (setq tab-bar-format '(tab-bar-format-tabs tab-bar-separator)) +;; (use-package tab-bar +;; :ensure nil +;; :init +;; (tab-bar-mode t) +;; (setq tab-bar-new-tab-choice "*scratch*") ;; buffer to show in new tabs +;; (setq tab-bar-close-button-show nil) ;; hide tab close / X button +;; (setq tab-bar-show 1) ;; hide bar if <= 1 tabs open +;; (setq tab-bar-format '(tab-bar-format-tabs tab-bar-separator)) - (setq tab-bar-tab-hints t)) +;; (setq tab-bar-tab-hints t)) -(use-package tabspaces - :functions tabspaces-mode - :commands (tabspaces-switch-or-create-workspace - tabspaces-open-or-create-project-and-workspace) - :hook (elpaca-after-init . tabspaces-mode) - :bind (:map tabspaces-mode-map - ([remap project-switch-project] . tabspaces-project-switch-project-open-file)) - :bind (:map tabspaces-command-map - ("l" . tabspaces-restore-session) - ("s" . tabspaces-save-session) - ("TAB" . tabspaces-switch-or-create-workspace)) +;; (use-package tabspaces +;; :functions tabspaces-mode +;; :commands (tabspaces-switch-or-create-workspace +;; tabspaces-open-or-create-project-and-workspace) +;; :hook (elpaca-after-init . tabspaces-mode) +;; :bind (:map tabspaces-mode-map +;; ([remap project-switch-project] . tabspaces-project-switch-project-open-file)) +;; :bind (:map tabspaces-command-map +;; ("l" . tabspaces-restore-session) +;; ("s" . tabspaces-save-session) +;; ("TAB" . tabspaces-switch-or-create-workspace)) - :custom - (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 TAB") - (tab-bar-new-tab-choice "default") +;; :custom +;; (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 TAB") +;; (tab-bar-new-tab-choice "default") - (with-eval-after-load 'consult - ;; hide full buffer list (still available with "b" prefix) - (consult-customize consult--source-buffer :hidden nil :default nil) - ;; set consult-workspace buffer list - (defvar consult--source-workspace - (list :name "Workspace Buffers" - :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))) +;; (with-eval-after-load 'consult +;; ;; hide full buffer list (still available with "b" prefix) +;; (consult-customize consult--source-buffer :hidden nil :default nil) +;; ;; set consult-workspace buffer list +;; (defvar consult--source-workspace +;; (list :name "Workspace Buffers" +;; :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))) +;; "Set workspace buffer list for consult-buffer.") +;; (add-to-list 'consult-buffer-sources 'consult--source-workspace))) + +(use-package beframe + :hook elpaca-after-init + :bind (("C-x b" . beframe-switch-buffer) + ("C-x C-b" . beframe-buffer-menu)) + :config + (setq beframe-functions-in-frames '(project-prompt-project-dir))) (provide 'init-workspace)