X-Git-Url: https://code.delx.au/dotemacs/blobdiff_plain/244ff8d24bb6178ceaed202759a2d4c7f3ac2570..68a8b20a5f540046b86174d73e6853a25753e153:/init.el

diff --git a/init.el b/init.el
index d8cedf2..04d01c6 100644
--- a/init.el
+++ b/init.el
@@ -1,18 +1,45 @@
-(add-to-list 'load-path "~/.emacs.d/lisp/")
+;;; -*- lexical-binding: t -*-
 
-(dolist (name (directory-files "~/.emacs.d/packages/"))
-  (let ((dirname (concat "~/.emacs.d/packages/" name)))
-    (if (not (equal "." (substring name 0 1)))
-        (if (file-accessible-directory-p dirname)
-            (add-to-list 'load-path dirname)))))
+(require 'seq)
+
+(defvar my/original-load-path load-path)
+
+(defun my/add-to-load-path (dirname)
+  (and (file-accessible-directory-p dirname)
+       (seq-filter (lambda (file)
+                     (string-match-p "\\.el$" file))
+                   (directory-files dirname))
+       (add-to-list 'load-path dirname)))
+
+(defun my/setup-load-path ()
+  (setq load-path my/original-load-path)
+
+  (my/add-to-load-path "~/.emacs.d/lisp")
+
+  (dolist (dirname (directory-files "~/.emacs.d/packages" 'full "^[^\\.]"))
+    (my/add-to-load-path dirname)
+    (my/add-to-load-path (concat dirname "/lisp")))
+
+  (message "Set load-path: %S" load-path))
+
+
+(my/setup-load-path)
 
 (load-library "my-backups")
-(load-library "my-defuns")
+(load-library "my-direx")
+(load-library "my-editing-defuns")
+(load-library "my-file-modes")
+(load-library "my-find-test-file")
+(load-library "my-flycheck")
+(load-library "my-frame-title")
 (load-library "my-gui")
+(load-library "my-ivy")
 (load-library "my-keys")
-(load-library "my-completion")
-(load-library "my-recentf")
-(load-library "my-flycheck")
-(load-library "my-other-modes")
+(load-library "my-kill-buffers")
 (load-library "my-minor-modes")
-(load-library "my-file-modes")
+(load-library "my-recentf")
+(load-library "my-scratch")
+(load-library "my-shackle")
+(load-library "my-vc")
+
+(message "Successfully loaded init.el")