Move org custom faces to a use-package :custom-face block.

This prevent the faces from being written to custom.el.

nix/configuration/roles/emacs/files/emacs/elisp/base.el

@@ -1,9 +1,19 @@
 (package-initialize)
-(use-package use-package)
+(use-package use-package
-
+  :custom
+  ;; Unless otherwise specified, always install packages if they are absent.
+  (use-package-always-ensure t)
+  ;; Allow updating built-in packages like eglot
+  ;; For some reason, built-in packages are still not updating so I'm just going to comment this out.
+  ;; (package-install-upgrade-built-in t)
+  ;; Natively compile packages
+  (package-native-compile t)
+  :config
   (add-to-list 'package-archives
                '("melpa" . "https://melpa.org/packages/")
                )
+  )
+
 
 (use-package auto-package-update
   :ensure t
@@ -71,10 +81,11 @@
   )
 
 (setq-default
- ;; Unless otherwise specified, always install packages if they are absent.
- use-package-always-ensure t
  ;; Point custom-file at /dev/null so emacs does not write any settings to my dotfiles.
- custom-file "/dev/null"
+ ;; custom-file "/dev/null"
+ ;;
+ ;; list-package breaks on newer versions of emacs if custom-file is set to /dev/null
+ custom-file (expand-file-name "custom.el" user-emacs-directory)
  ;; Don't pop up a small window at the bottom of emacs at launch.
  inhibit-startup-screen t
  inhibit-startup-message t
@@ -95,8 +106,6 @@
                                                       "%b")))
  ;; Use 'y' or 'n' instead of 'yes' or 'no'
  use-short-answers t
- ;; Natively compile packages
- package-native-compile t
  ;; Confirm when opening a file that does not exist
  confirm-nonexistent-file-or-buffer t
  ;; Do not require double space to end a sentence.

nix/configuration/roles/emacs/files/emacs/elisp/common-lsp.el

@@ -1,4 +1,5 @@
 (use-package eglot
+  ;; This is an emacs built-in but we're pulling the latest version
   :pin gnu
   :commands (eglot eglot-ensure)
   :bind (:map eglot-mode-map

nix/configuration/roles/emacs/files/emacs/elisp/lang-org.el

@@ -1,3 +1,5 @@
+(require 'color)
+(let ((bg (face-attribute 'default :background)))
   (use-package org
     :ensure nil
     :commands org-mode
@@ -19,6 +21,10 @@
            (org-shiftdown-final . windmove-down)
            (org-shiftright-final . windmove-right)
            )
+    :custom-face
+    (org-block ((t (:inherit default :background ,(color-lighten-name bg 15) :extend ,t))))
+    (org-block-begin-line ((t (:inherit default :background ,"#472300" :extend ,t))))
+    (org-block-end-line ((t (:inherit default :background ,"#472300" :extend ,t))))
     :config
     (require 'org-tempo)
     (setq org-export-latex-listings t)
@@ -67,15 +73,7 @@
                                    (gnuplot    . t)
                                    (sqlite     . t)
                                    ))
-
+    )
-  (require 'color)
-
-  (let ((bg (face-attribute 'default :background)))
-    (custom-set-faces
-     `(org-block ((t (:inherit default :background ,(color-lighten-name bg 15) :extend ,t))))
-     `(org-block-begin-line ((t (:inherit default :background ,"#472300" :extend ,t))))
-     `(org-block-end-line ((t (:inherit default :background ,"#472300" :extend ,t))))
-     ))
   )
 
 (use-package org-bullets