diff --git a/lisp/init-org.el b/lisp/init-org.el
index 1ce5907..6b42237 100644
--- a/lisp/init-org.el
+++ b/lisp/init-org.el
@@ -160,6 +160,13 @@
                                  (todo . "  ")
                                  (tags . "  ")
                                  (search . "  ")))
+
+  (setq org-agenda-sorting-strategy
+      '((agenda time-up scheduled-up deadline-up priority-down category-keep)
+        (todo priority-down category-keep)
+        (tags priority-down category-keep)
+        (search category-keep)))
+
   (setq org-agenda-custom-commands
         '(("qd" "TODO entries sort by closed time"
            ((org-ql-block '(closed)
diff --git a/lisp/init-prog.el b/lisp/init-prog.el
index fed4bc1..279233a 100644
--- a/lisp/init-prog.el
+++ b/lisp/init-prog.el
@@ -31,9 +31,10 @@
 
 ;; tree-sitter
 (use-package treesit-auto
+  :hook
+  (after-init . global-treesit-auto-mode)
   :config
   (setq treesit-auto-install 'prompt)
-  (global-treesit-auto-mode)
   (setq treesit-font-lock-level 4))
 
 ;; scheme
diff --git a/lisp/init-window.el b/lisp/init-window.el
index 8bc7aaa..f75ad24 100644
--- a/lisp/init-window.el
+++ b/lisp/init-window.el
@@ -126,8 +126,10 @@
             (delete-window window)))))
     (advice-add #'keyboard-quit :before #'popper-close-window-hack)))
 
-;; es-windos，快速管理窗口
-(use-package es-windows)
+;; windmove
+(use-package windmove
+  :hook
+  (after-init . windmove-swap-states-default-keybindings))
 
 (provide 'init-window)