Update

.gitignore

@@ -3,4 +3,14 @@
 *.log
 tmp/
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+
+>>>>>>> 6231dc6 (Add gitignore)
+=======
+
+=======
+>>>>>>> 8ac4896 (Update)
+>>>>>>> 70fd802 (Update)
 custom.el

config.el

@@ -4,6 +4,11 @@
   ;; To disable collection of benchmark data after init is done.
   (add-hook 'after-init-hook 'benchmark-init/deactivate))
 
+(setq tab-width 4)
+(setq shell-file-name (executable-find "bash"))
+(setq-default vterm-shell (executable-find "fish"))
+(setq-default explicit-shell-file-name (executable-find "fish"))
+
 (setf meow-expand-hint-remove-delay 0)
 
 (setq duplicate-line-final-position 1)
@@ -31,7 +36,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/")
 

config.org

@@ -10,6 +10,13 @@
   (add-hook 'after-init-hook 'benchmark-init/deactivate))
 #+end_src
 * My doom config
+** Some basic config
+#+begin_src emacs-lisp
+(setq tab-width 4)
+(setq shell-file-name (executable-find "bash"))
+(setq-default vterm-shell (executable-find "fish"))
+(setq-default explicit-shell-file-name (executable-find "fish"))
+#+end_src
 ** Meow
 #+begin_src emacs-lisp
 (setf meow-expand-hint-remove-delay 0)
@@ -43,7 +50,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