From d40c28c5fc5ebc1eb76144174e187f21ccc07593 Mon Sep 17 00:00:00 2001 From: Joseph Ferano Date: Sat, 24 Dec 2022 00:33:50 +0700 Subject: [PATCH] Move the theme changes to a forked version of doom themes --- .config/emacs/init.org | 48 +++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/.config/emacs/init.org b/.config/emacs/init.org index 8775de3..43971bb 100644 --- a/.config/emacs/init.org +++ b/.config/emacs/init.org @@ -198,32 +198,17 @@ Use Dashboard.el. First load `all-the-icons` for nicer rendering *** Themes #+begin_src emacs-lisp -(straight-use-package 'doom-themes) -;; (setq custom-safe-themes t) +;; Small changes to my favorite themes +(straight-use-package + '(doom-themes :type git :host github :repo "doomemacs/themes" + :fork (:host github + :repo "JosephFerano/doom-themes"))) + +(setq custom-safe-themes t) -;; (setq debug-on-message "stop") -;; General Faces (custom-set-faces '(dashboard-items-face ((t (:inherit widget-button :weight normal))))) -;; Theme Specific -;; (with-eval-after-load 'doom-themes -;; (load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-flatwhite-theme.el") -(load "/home/joe/.dotfiles/.config/emacs/straight/build/doom-themes/doom-palenight-theme.el") - -(custom-theme-set-faces - 'doom-palenight - `(highlight ((t (:background ,(doom-color 'base3) :foreground ,(doom-color 'fg))))) - `(markdown-code-face ((t (:extend t :background ,(doom-color 'base2)))))) - -(load-theme 'doom-palenight t) - -;; (custom-theme-set-faces -;; 'doom-flatwhite -;; '(hl-line ((t (:extend t :background "#e4ddd2")))) -;; '(org-block ((t (:extend t :background "#f1ece4")))) -;; '(org-block-begin-line ((t (:extend t :background "#3C435E"))))) -;; ) #+end_src We want to add whatever custom theme we selected to the custom variables since emacs will just @@ -238,9 +223,9 @@ our case is worse since we have a literate file. Send all custom variables to ~c Save the last used theme when exiting emacs and then reload it. #+begin_src emacs-lisp tangle: no -;; (defun joe/save-current-theme () -;; (customize-save-variable 'custom-enabled-themes custom-enabled-themes)) -;; (add-hook 'kill-emacs-hook #'joe/save-current-theme) +(defun joe/save-current-theme () + (customize-save-variable 'custom-enabled-themes custom-enabled-themes)) +(add-hook 'kill-emacs-hook #'joe/save-current-theme) #+end_src *** Other @@ -298,6 +283,9 @@ Setup other stuff (doom-modeline-set-modeline 'main 'default))) +(dolist (mode '(dired-mode-hook lsp-help-mode-hook)) + (add-hook mode (lambda () (display-line-numbers-mode 0)))) + ;; (straight-use-package 'centaur-tabs) ;; (setq centaur-tabs-set-bar 'under) ;; (setq x-underline-at-descent-line t) @@ -806,10 +794,10 @@ targets." (setq dirvish-reuse-session nil) (dirvish-define-preview exa (file) - "Use `exa' to generate directory preview." - :require ("exa") ; tell Dirvish to check if we have the executable - (when (file-directory-p file) ; we only interest in directories here - `(shell . ("exa" "--icons" "--color=always" "--no-user" "-al" "--group-directories-first" ,file)))) + "Use `exa' to generate directory preview." + :require ("exa") ; tell Dirvish to check if we have the executable + (when (file-directory-p file) ; we only interest in directories here + `(shell . ("exa" "--icons" "--color=always" "--no-user" "-al" "--group-directories-first" ,file)))) (add-to-list 'dirvish-preview-dispatchers 'exa) (setq dired-listing-switches "-l --sort=version --almost-all --human-readable --time-style=long-iso --group-directories-first --no-group") @@ -855,8 +843,6 @@ targets." (global-set-key (kbd "C-x d") #'dirvish-dwim) (global-set-key (kbd "C-x C-d") #'joe/dirvish-find-directory) -(add-hook 'dired-mode-hook (lambda () (setq truncate-lines t))) - #+end_src ** Org Mode