fiddlerwoaroof/dotfiles - Change XVTMOFGU6CHREORKDVHTTGSOTDT7B3NJXUKCSQSTIBTWSW54FVVAC

refactor(emacs): fix load-package-configuration

Created by Edward Langley on May 3, 2021

XVTMOFGU6CHREORKDVHTTGSOTDT7B3NJXUKCSQSTIBTWSW54FVVAC

Dependencies

In channels

main

Change contents

File deletion: dependencies, dependencies
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[3.1] → [4.129:152]
BFD:BFD[4.152] → [4.128:128]

Insertion in emacs.d/init.el at line 39 [7.136]

[5.10242]

[6.217]


(eval-and-compile
  (defvar *fwoar-git-repos*
    (file-name-as-directory
     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))
                       "~"))))
(eval-and-compile
  (defun fwoar-git-repo (name ssh-remote http-remote)
    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))
      (unless (file-exists-p dir-name)
        (ecase fwoar-git-mode
          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))
          (:http (magit-run-git-with-input "clone" http-remote dir-name))))
      dir-name)))
(defvar *dotfiles-repo*
  (fwoar-git-repo "dotfiles"
                  "git@git.fiddlerwoaroof.com:dotfiles.git"
                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

Replacement in emacs.d/init.el at line 60 [7.136]

B:BD[6.218] → [6.218:309]

(use-package keyfreq
  :ensure t
  :config
  (keyfreq-mode 1)
  (keyfreq-autosave-mode 1))

[6.218]

[8.243]

(defun fwoar/setup-load-path ()
  (let* ((new-load-path (cl-adjoin "~/.emacs.d/lisp/configurations/"
                                   load-path
                                   :test 'equal))
         (new-load-path (cl-adjoin (concat *dotfiles-repo*
                                           "emacs.d/lisp/configurations/")
                                   new-load-path
                                   :test 'equal))
         (new-load-path (cl-adjoin (concat *dotfiles-repo*
                                           "emacs.d/packages/")
                                   new-load-path
                                   :test 'equal)))
    (setq load-path new-load-path)))
(fwoar/setup-load-path)
(defun fwoar/package-configuration (package)
  (fwoar/setup-load-path)
  (let* ((local-configs)
         (git-configs (concat *dotfiles-repo*
                              "emacs.d/lisp/configurations/"))
         (conf-file (concat (symbol-name package) "-conf.el"))
         (load-path (list* local-configs git-configs load-path)))
    conf-file))
(defun load-package-configuration (package)
  (let ((conf-file (fwoar/package-configuration package)))
    (load conf-file)))
(defun fwoar/load-local-packages ()
  (interactive)
  (mapc 'package-install-file
        (directory-files (format "%s/%s" *dotfiles-repo* "emacs.d/packages/")
                         t ".*[.]el")))

Deletion in emacs.d/init.el at line 218 [7.136]

B:BD[9.7463] → [10.953:953]

∅:D[10.953] → [11.2836:3591]

∅:D[9.7463] → [11.2836:3591]

∅:D[12.7466] → [11.2836:3591]

B:BD[11.2836] → [11.2836:3591]


(eval-and-compile
  (defvar *fwoar-git-repos*
    (file-name-as-directory
     (expand-file-name (car (file-expand-wildcards "~/git*_repos"))
                       "~"))))
(eval-and-compile
  (defun fwoar-git-repo (name ssh-remote http-remote)
    (let ((dir-name (file-name-as-directory (expand-file-name name *fwoar-git-repos*))))
      (unless (file-exists-p dir-name)
        (ecase fwoar-git-mode
          (:ssh (magit-run-git-with-input "clone" ssh-remote dir-name))
          (:http (magit-run-git-with-input "clone" http-remote dir-name))))
      dir-name)))
(defvar *dotfiles-repo*
  (fwoar-git-repo "dotfiles"
                  "git@git.fiddlerwoaroof.com:dotfiles.git"
                  "https://git.fiddlerwoaroof.com/git/dotfiles.git"))

Deletion in emacs.d/init.el at line 219 [7.136]

B:BD[13.190] → [9.7464:7843]

B:BD[9.7843] → [10.955:955]

∅:D[10.955] → [12.7613:7722]

B:BD[12.7613] → [12.7613:7722]

B:BD[14.368] → [14.368:432]

∅:D[14.432] → [12.7797:7934]

B:BD[12.7797] → [12.7797:7934]

∅:D[13.190] → [11.3591:3592]

∅:D[9.7931] → [11.3591:3592]

∅:D[12.7934] → [11.3591:3592]

B:BD[11.3591] → [11.3591:3592]

B:BD[11.3592] → [9.7932:7956]

B:BD[9.7956] → [10.957:957]

∅:D[10.957] → [14.433:435]

B:BD[12.7959] → [14.433:435]

∅:D[14.435] → [12.7959:8055]

B:BD[12.7959] → [12.7959:8055]

∅:D[9.8052] → [15.291:529]

∅:D[12.8055] → [15.291:529]

B:BD[15.291] → [15.291:529]

B:BD[15.529] → [9.8053:8173]

B:BD[9.8173] → [10.959:959]

∅:D[10.959] → [15.529:553]

∅:D[9.8173] → [15.529:553]

∅:D[12.8176] → [15.529:553]

B:BD[15.529] → [15.529:553]

B:BD[15.553] → [16.5321:5522]

(defun fwoar/setup-load-path ()
  (let* ((new-load-path (cl-adjoin "~/.emacs.d/lisp/configurations/"
                                   load-path
                                   :test 'equal))
         (new-load-path (cl-adjoin (concat *dotfiles-repo*
                                           "emacs.d/lisp/configurations/")
                                   new-load-path
                                   :test 'equal))
         (new-load-path (cl-adjoin (concat *dotfiles-repo*
                                           "emacs.d/packages/")
                                   new-load-path
                                   :test 'equal)))
    (setq load-path new-load-path)))
(fwoar/setup-load-path)
(defun fwoar/package-configuration (package)
  (fwoar/setup-load-path)
  (let* ((local-configs)
         (git-configs (concat *dotfiles-repo*
                              "emacs.d/lisp/configurations/"))
         (conf-file (concat (symbol-name package) "-conf.el"))
         (load-path (list* local-configs git-configs load-path)))
    conf-file))
(defun load-package-configuration (package)
  (let ((conf-file (fwoar/package-configuration package)))
    (load conf-file)))
(defun fwoar/load-local-packages ()
  (interactive)
  (mapc 'package-install-file
        (directory-files (format "%s/%s" *dotfiles-repo* "emacs.d/packages/")
                         t ".*[.]el")))

Replacement in emacs.d/init.el at line 252 [7.136]
B:BD[15.625] → [15.625:661]
```
(load-package-configuration 'cider)
```
[15.625]
[17.188]
```
(comment (load-package-configuration 'cider))
```