Update

Add gitignore
Use doom one
2025-12-13 22:46:22 +11:00 · 2025-12-13 22:46:15 +11:00 · 2025-12-13 22:46:09 +11:00
3 changed files with 12 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,14 @@
 *.log
 tmp/

+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6231dc6 (Add gitignore)
+=======
+
+=======
+>>>>>>> 8ac4896 (Update)
+>>>>>>> 70fd802 (Update)
 custom.el
--- a/config.el
+++ b/config.el
@@ -31,7 +31,7 @@
   (add-to-list 'default-frame-alist '(width . 100))))

 (setq catppuccin-flavor 'catppuccin)
-(setq doom-theme 'doom-material-dark)
+(setq doom-theme 'doom-one)
 (setq display-line-numbers-type 'relative)
 (setq org-directory "~/org/")

--- a/config.org
+++ b/config.org
@@ -43,7 +43,7 @@
   (add-to-list 'default-frame-alist '(width . 100))))

 (setq catppuccin-flavor 'catppuccin)
-(setq doom-theme 'doom-material-dark)
+(setq doom-theme 'doom-one)
 (setq display-line-numbers-type 'relative)
 (setq org-directory "~/org/")
 #+end_src
Author	SHA1	Message	Date
Zelong Kuang	5e0502c8f2	Update	2025-12-13 22:46:22 +11:00
Zelong Kuang	2b848a35a7	Add gitignore	2025-12-13 22:46:15 +11:00
Zelong Kuang	c03f2de523	Use doom one	2025-12-13 22:46:09 +11:00