Update

init.el

@@ -11,7 +11,7 @@
 (require 'init-workspace)
 
 (require 'init-dired)
-(require 'init-treemacs)
+;; (require 'init-treemacs)
 ;; (require 'init-dashboard)
 
 (require 'init-llm)

lisp/init-dired.el

@@ -3,7 +3,8 @@
 (use-package dired
   :ensure nil
   :bind (:map dired-mode-map
-              ("C-c C-p" . wdired-change-to-wdired-mode))
+              ("C-c C-p" . wdired-change-to-wdired-mode)
+	      ("C-b" . dired-up-directory))
   :config
   ;; Always delete and copy recursively
   (setq dired-recursive-deletes 'always
@@ -15,7 +16,8 @@
   ;; Colorful dired
   (use-package diredfl
     :diminish
-    :hook dired-mode)
+    :hook dired-mode
+    :hook dirvish-directory-view-mode)
   
   (use-package nerd-icons-dired
     :diminish
@@ -32,4 +34,11 @@
     ;; Extra Dired functionality
   (use-package dired-aux :ensure nil))
 
+;; (use-package dirvish
+;;   :bind ("C-c o p" . dirvish-side)
+;;   :init (dirvish-override-dired-mode)
+;;   :config
+;;   (setq dirvish-use-header-line nil
+;; 	dirvish-use-mode-line nil))
+
 (provide 'init-dired)

lisp/init-treemacs.el

@@ -2,30 +2,37 @@
 (use-package treemacs
   :ensure t
   :defer t
+  :commands (treemacs-follow-mode
+             treemacs-filewatch-mode
+             treemacs-git-mode
+	     treemacs-project-follow-mode
+	     treemacs-hide-gitignored-files-mode)
   :custom-face
   (cfrs-border-color ((t (:inherit posframe-border))))
   :init
   (with-eval-after-load 'winum
     (define-key winum-keymap (kbd "M-0") #'treemacs-select-window))
   :config
-  (treemacs-follow-mode t)
-  (treemacs-filewatch-mode t)
-  (treemacs-fringe-indicator-mode 'always)
   (pcase (cons (not (null (executable-find "git")))
                (not (null (executable-find "python3"))))
     (`(t . t)
      (treemacs-git-mode 'deferred))
     (`(t . _)
      (treemacs-git-mode 'simple)))
-  (treemacs-git-commit-diff-mode t)
+
-  (treemacs-hide-gitignored-files-mode t)
   (setq treemacs-collapse-dirs           (if treemacs-python-executable 3 0)
         treemacs-missing-project-action  'remove
         treemacs-user-mode-line-format   'none
         treemacs-sorting                 'alphabetic-asc
         treemacs-follow-after-init       t
         treemacs-width                   30
+	treemacs-show-hidden-files       nil
+	treemacs-silent-refresh          t
         treemacs-no-png-images           1)
+  
+  (treemacs-follow-mode t)
+  (treemacs-project-follow-mode t)
+  (treemacs-filewatch-mode t)
   :bind
   (:map global-map
         ("M-0"       . treemacs-select-window)

lisp/init-ui.el

@@ -55,12 +55,12 @@
 
 (pcase system-type
   ('darwin  ; macOS
-   (set-face-attribute 'default nil :font "Sarasa Mono SC-24")
+   (set-face-attribute 'default nil :font "Sarasa Term SC-24")
    (add-to-list 'default-frame-alist '(height . 53))
    (add-to-list 'default-frame-alist '(width . 120)))
   
   ('gnu/linux  ; Linux (including Debian)
-   (set-face-attribute 'default nil :font "Maple Mono-14")  ; 20 * 1.5
+   (set-face-attribute 'default nil :font "Sarasa Term SC-16")  ; 20 * 1.5
    (add-to-list 'default-frame-alist '(height . 40))
    (add-to-list 'default-frame-alist '(width . 90))))