X-Git-Url: https://code.delx.au/dotemacs/blobdiff_plain/510ffe7b6f5e6bc9e96d4b2675bf55d5b5f84e75..307c8e477f17527ff7751aacbad44cd55ad0c5cc:/init.el

diff --git a/init.el b/init.el
index 23d4a92..04d01c6 100644
--- a/init.el
+++ b/init.el
@@ -1,15 +1,31 @@
 ;;; -*- lexical-binding: t -*-
 
-(add-to-list 'load-path "~/.emacs.d/lisp/")
+(require 'seq)
 
-(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)))))
+(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-completion")
 (load-library "my-direx")
 (load-library "my-editing-defuns")
 (load-library "my-file-modes")
@@ -17,6 +33,7 @@
 (load-library "my-flycheck")
 (load-library "my-frame-title")
 (load-library "my-gui")
+(load-library "my-ivy")
 (load-library "my-keys")
 (load-library "my-kill-buffers")
 (load-library "my-minor-modes")