feat: Update Emacs config with new keybindings, org states

- Add `magit-refs-mode` to tab grouping
- Add `eshell`/`eat` under `C-c x` prefix
- Replace `WAITING` org state with `IDKY`
- Add `lisp-extra-font-lock` package
- Fix daemon mode theme loading
- Simplify denote keywords and update dired/dirvish bindings

lisp/init-base.el

@@ -174,7 +174,8 @@
                      (mode . magit-log-mode)
                      (mode . magit-process-mode)
                      (mode . magit-status-mode)
-		     (mode . magit-revision-mode)))
+		     (mode . magit-revision-mode)
+		     (mode . magit-refs-mode)))
 	   ("Directories" (or
 			   (mode . dired-mode)
 			   (name . "^*dirvish")))

lisp/init-dired.el

@@ -48,7 +48,8 @@
   (setq dirvish-use-mode-line t
 	dirvish-mode-line-format '(:left (sort omit symlink) :right (free-space index))
 	dirvish-attributes '(file-time file-size)
-	dirvish-yank-sources 'session)
+	dirvish-yank-sources 'session
+	dirvish-hide-cursor nil)
 
   :custom
   (dirvish-quick-access-entries

lisp/init-kbd.el

@@ -146,6 +146,12 @@
   "t" 'trashed
   "d" 'discomfort)
 
+;; x for some other command
+(general-def
+  :prefix "C-c x"
+  "e" 'eshell
+  "E" 'eat)
+
 ;; scratch buffer
 (if *is-mac*
     (general-def "C-c <f12>" 'scratch-buffer)
@@ -163,10 +169,10 @@
   "C-n" 'my-dired-next-line
   "n" 'my-dired-next-line
   "b" 'dired-up-directory
-  "C-b" 'dired-up-directory
+  "C-b" 'backward-char
+  "C-f" 'forward-char
   "<right>" 'dired-find-file
   "<left>" 'dired-up-directory
-  "C-f" 'dired-find-file
   "C-/" 'dired-undo
   "<SPC>" 'my-dirvish-layout-toggle
   "C-s" 'consult-line
@@ -310,7 +316,6 @@
   "l" 'org-store-link
   "k" 'comment-line
   "K" 'comment-kill
-  "E" 'eshell
   "C-s" 'consult-focus-lines)
 
 ;; global map

lisp/init-org.el

@@ -34,7 +34,7 @@
   ;; 设置todo关键字
   (setq org-todo-keywords
 	(quote ((sequence "TODO(t)" "STARTED(S)" "|" "DONE(d!/!)")
-		(sequence "WAITING(w@/!)" "SOMEDAY(s)" "|" "CANCELLED(c@/!)"))))
+		(sequence "IDKY(i)" "SOMEDAY(s)" "|" "CANCELLED(c@/!)"))))
 
   ;; agenda相关
   (cond
@@ -88,7 +88,7 @@
   (setq denote-signature-history
 	'("note" "project" "fun" "wisdom" "article" "data" "metanote" "agenda"))
   (setq denote-known-keywords
-	'("emacs" "org" "elisp" "scheme" "programming" "philosophy" "film" "linux" "computerstuff" "game" "masterpiece")))
+	'("emacs")))
 
 ;; denote-org
 (use-package denote-org)
@@ -190,7 +190,8 @@
                               (:name "priority = B" :priority "B")
                               (:name "priority = C" :priority "C")
                               (:name "other priority" :priority< "C")
-                              (:name "someday" :todo "SOMEDAY"))))))))))
+                              (:name "someday" :todo "SOMEDAY")
+			      (:name "I dont know yet" :todo "IDKY"))))))))))
 
 ;; capture
 (use-package org-capture
@@ -206,6 +207,10 @@
 	    ("s" "SOMEDAY" entry
 	     (file+headline "~/org/my-org-note/20260509T232442==agenda--all-my-todos__org.org" "Something to do")
 	     "* SOMEDAY %<%m-%d> %?\n%T"
+	     :empty-lines 1)
+	    ("i" "IDKY" entry
+	     (file+headline "~/org/my-org-note/20260509T232442==agenda--all-my-todos__org.org" "Something to do")
+	     "* IDKY %<%m-%d> %?\n%T"
 	     :empty-lines 1)))
 	 (*is-android*
 	  '(("t" "TODO" entry
@@ -215,6 +220,10 @@
 	    ("s" "SOMEDAY" entry
 	     (file+headline "~/storage/shared/my-org-note/20260509T232442==agenda--all-my-todos__org.org" "Something to do")
 	     "* SOMEDAY %<%m-%d> %?\n%T"
+	     :empty-lines 1)
+	    ("i" "IDKY" entry
+	     (file+headline "~/org/my-org-note/20260509T232442==agenda--all-my-todos__org.org" "Something to do")
+	     "* IDKY %<%m-%d> %?\n%T"
 	     :empty-lines 1)))
 	 (t nil))))
 

lisp/init-prog.el

@@ -49,6 +49,10 @@
   :config
   (setq sly-lisp-implementations nil))
 
+(use-package lisp-extra-font-lock
+  :hook
+  (lisp-mode . lisp-extra-font-lock-mode))
+
 ;; markdown
 (use-package markdown-mode
   :bind

lisp/init-ui.el

@@ -16,20 +16,12 @@
   '(solarized-emacs :fork (:host github :repo "Andsy10/solarized-emacs"))
   :init
   ;; 把主题加载延迟到frame创建之后，防止daemon模式下宏不能正常展开
-  ;; (if *is-android*
+  (if (daemonp)
-  ;;     (if (daemonp)
+      (add-hook 'after-make-frame-functions
-  ;; 	  (add-hook 'after-make-frame-functions
+		(lambda (frame)
-  ;; 		    (lambda (frame)
+		  (with-selected-frame frame
-  ;; 		      (with-selected-frame frame
+		    (load-theme 'my-base16-dark t))))
-  ;; 			(load-theme 'my-base16-light t))))
+    (load-theme 'my-base16-dark t)))
-  ;; 	(load-theme 'my-base16-light t))
-  ;;   (if (daemonp)
-  ;; 	(add-hook 'after-make-frame-functions
-  ;; 		  (lambda (frame)
-  ;; 		    (with-selected-frame frame
-  ;; 		      (load-theme 'my-base16-dark t))))
-  ;;     (load-theme 'my-base16-dark t)))
-  (load-theme 'my-base16-dark))
 
 ;; 行号
 (use-package display-line-numbers

lisp/my-base16-dark-theme.el

@@ -90,7 +90,8 @@
      `(keycast-key ((,class (:foreground ,green :weight bold))))
      `(emms-playlist-track-face ((,class (:foreground ,cyan))))
      `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold))))
-     `(diff-hunk-header ((,class (:foreground "#c1a059" :background "#253224")))))))
+     `(diff-hunk-header ((,class (:foreground "#c1a059" :background "#253224"))))
+     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face)))))))
 
 (provide-theme 'my-base16-dark)
 

lisp/my-base16-light-theme.el

@@ -90,7 +90,8 @@
      `(keycast-key ((,class (:foreground ,green :weight bold))))
      `(emms-playlist-track-face ((,class (:foreground ,cyan))))
      `(emms-playlist-selected-face ((,class (:foreground ,blue :weight bold))))
-     `(diff-hunk-header ((,class (:foreground "#6b561e" :background "#f0e6b8")))))))
+     `(diff-hunk-header ((,class (:foreground "#6b561e" :background "#f0e6b8"))))
+     `(lisp-extra-font-lock-backquote ((,class (:inherit font-lock-type-face)))))))
 
 (provide-theme 'my-base16-light)