about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-01-28 08:13:31 -0600
committerCase Duckworth2021-01-28 08:13:31 -0600
commit887d87d6e05be297fec5674a798a6a2484100804 (patch)
tree5ebc313cc1d91bbd4a0cee784432f29ca4cee2a9
parentAdd a function to better sync with TTRSS (diff)
downloademacs-887d87d6e05be297fec5674a798a6a2484100804.tar.gz
emacs-887d87d6e05be297fec5674a798a6a2484100804.zip
Tweak expand-file-name calls and acdw/reload
-rw-r--r--config.org25
1 files changed, 13 insertions, 12 deletions
diff --git a/config.org b/config.org index 906eaad..88ca3bd 100644 --- a/config.org +++ b/config.org
@@ -2623,8 +2623,7 @@ my config here /logically/, while keeping the generated file organized
2623 (defun acdw/find-config () 2623 (defun acdw/find-config ()
2624 "Find `config.org'." 2624 "Find `config.org'."
2625 (interactive) 2625 (interactive)
2626 (find-file (expand-file-name "config.org" 2626 (find-file (locate-user-emacs-file "config.org")))
2627 user-emacs-directory)))
2628#+end_src 2627#+end_src
2629 2628
2630Bind it to =C-z i= because =C-z C-c= is taken for capture. 2629Bind it to =C-z i= because =C-z C-c= is taken for capture.
@@ -2642,19 +2641,22 @@ Bind it to =C-z i= because =C-z C-c= is taken for capture.
2642 (defun acdw/reload () 2641 (defun acdw/reload ()
2643 "Tangle and reload Emacs configuration." 2642 "Tangle and reload Emacs configuration."
2644 (interactive) 2643 (interactive)
2645 (let ((config (expand-file-name "config.org" 2644 (let ((config (locate-user-emacs-file "config.org")))
2646 user-emacs-directory)))
2647 ;; tangle 2645 ;; tangle
2648 (with-current-buffer (find-file-noselect config) 2646 (with-current-buffer (find-file-noselect config)
2649 (let ((prog-mode-hook nil)) 2647 (message "Tangling config.org...")
2650 (add-to-list 'load-path (expand-file-name "straight/build/org/" 2648 (let ((prog-mode-hook nil)
2651 user-emacs-directory)) 2649 (inhibit-redisplay t)
2650 (inhibit-message t))
2651 (add-to-list 'load-path (locate-user-emacs-file
2652 "straight/build/org/"))
2652 (require 'org) 2653 (require 'org)
2653 (org-babel-tangle))) 2654 (org-babel-tangle)))
2655 (message "Tangling config.org... Done.")
2654 ;; load init files 2656 ;; load init files
2655 (load (expand-file-name "early-init.el" user-emacs-directory)) 2657 (load (locate-user-emacs-file "early-init.el"))
2656 (byte-compile-file (expand-file-name "init.el" user-emacs-directory) :load) 2658 (byte-compile-file (locate-user-emacs-file "init.el") :load)
2657 (byte-compile-file (expand-file-name "config.el" user-emacs-directory) 2659 (byte-compile-file (locate-user-emacs-file "config.el")
2658 :load))) 2660 :load)))
2659#+end_src 2661#+end_src
2660 2662
@@ -2700,8 +2702,7 @@ the needed boolean expression to tangle config.org. Booleans, yall!
2700 user-emacs-directory)) 2702 user-emacs-directory))
2701 (config.el (concat config ".el")) 2703 (config.el (concat config ".el"))
2702 (config.org (concat config ".org")) 2704 (config.org (concat config ".org"))
2703 (straight-org-dir (expand-file-name "straight/build/org" 2705 (straight-org-dir (locate-user-emacs-file "straight/build/org")))
2704 user-emacs-directory)))
2705 ;; Okay, let's figure this out. 2706 ;; Okay, let's figure this out.
2706 ;; `and' evaluates each form, and returns nil on the first that 2707 ;; `and' evaluates each form, and returns nil on the first that
2707 ;; returns nil. `unless' only executes its body if the test 2708 ;; returns nil. `unless' only executes its body if the test