Sync from Windows

tools/doom/config.el

@@ -55,7 +55,7 @@
 ;; This determines the style of line numbers in effect. If set to `nil', line
 ;; numbers are disabled. For relative line numbers, set this to `relative'.
 (setq display-line-numbers t)
-(setq display-line-numbers-type 'relative)
+(setq display-line-numbers-type 'visual)
 
 
 
@@ -93,6 +93,18 @@
 ;; they are implemented.
 
 (add-to-list 'load-path (expand-file-name "lisp" doom-user-dir))
+(setq doom-local-dir (expand-file-name "emacs" (getenv "XDG_DATA_HOME")))
+(setq doom-data-dir (expand-file-name "etc" doom-local-dir))
+
+(after! recentf
+  (setq recentf-max-saved-items 200)
+  (add-to-list 'recentf-exclude "\\.revive$")
+  (add-to-list 'recentf-exclude "\\.windows$")
+  (add-to-list 'recentf-exclude "\\.#.+$")
+  (add-to-list 'recentf-exclude "^/tmp/")
+  (add-to-list 'recentf-exclude "COMMIT_EDITMSG\\'")
+)[1][2]
+
 
 
 (after! wakatime-mode
@@ -119,11 +131,13 @@
   )
 
 
-(use-package! rime
-  :config
-  (setq default-input-method "rime")
-  (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method))
-  )
+(if (not (eq system-type 'windows-nt))
+    (use-package! rime
+    :config
+    (setq default-input-method "rime")
+    (add-hook! (org-mode markdown-mode) (activate-input-method default-input-method))
+        (setq rime-user-data-dir (expand-file-name "emacs-rime" (getenv "XDG_CONFIG_HOME")))
+    ))
 
 (load! "calendar.el")
 

tools/doom/lisp/org-pomodoro-music-controller.el

@@ -8,11 +8,18 @@
 (require 'org-pomodoro)
 
 ;; Variables
-(defcustom org-pomodoro-music-player-command "playerctl"
+
+(defcustom org-pomodoro-music-player-command
+  (cond
+   ((eq system-type 'windows-nt) "clmcontrol")
+   ((eq system-type 'darwin) "nowplaying-cli")
+   ((eq system-type 'gnu/linux) "playerctl")
+   (t "playerctl"))
   "Command to control the music player."
   :type 'string
   :group 'org-pomodoro)
 
+
 (defcustom org-pomodoro-music-player-args nil
   "Arguments to pass to the music player command."
   :type '(repeat string)

tools/doom/org.el

@@ -1,4 +1,4 @@
-;; If you use `org' and don't want your org files in the default location below,
+;; If use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/OrgFiles/")
 ;; (setq org-roam-directory  "~/OrgFiles/roam/")
@@ -29,6 +29,14 @@
   (setq org-todo-keywords '((sequence "TODO(t)" "NEXT(n)" "WAIT(w@/!)" "|" "DONE(d@/!)" "CANCELLED(c@)")
                             ))
 
+  (setq org-todo-keyword-faces
+        '(("TODO" . (:foreground "red" :weight bold :background "yellow"))
+          ("NEXT" . (:foreground "blue" :weight bold :background "lightgray"))
+          ("WAIT" . (:foreground "orange" :weight bold))
+          ("DONE" . (:foreground "grey" :weight bold :italic t))
+          ("CANCELLED" . (:foreground "grey" :weight bold))
+          ))
+
   ;; Keymaps
   (map! :map org-mode-map
         :desc "Bold with ZWS" "C-c b" (lambda () (interactive) (my/insert-emphasis-with-zws ?*))
@@ -196,7 +204,7 @@
 
 ;;; org-babel
 
-(if (bound-and-true-p ISMAC)
+(if (not (eq system-type 'gnu/linux))
     (setq org-babel-C-compiler "clang"))