emacs: update moduesl & fix multi-eshell

2 files changed, 31 insertions, 21 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index f6e6032..efb36c3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -18,26 +18,29 @@
 (define-prefix-command 'Create)
 (define-key thanos/applications-map (kbd "C-c") 'Create)
 
-;;(global-set-key (kbd "<escape>") 'keyboard-escape-quit) ;
-
-;; custom themes
-(add-to-list 'custom-theme-load-path (expand-file-name "~/.emacs.d/themes/"))
-
-(require 'cl-lib)
-
-(defun thanos/load-modules ()
-  "."
-  (let* ((modules-dir (concat user-emacs-directory "modules"))
-	 (modules (cl-remove-if-not
-		   (lambda (file) (string-suffix-p ".el" file))
-		   (directory-files modules-dir t))))
-    (dolist (module modules)
-      (when (not (string-match-p "#" module))
-        (load module)))))
-
-
-(thanos/load-modules)
-
-
+(global-set-key (kbd "<escape>") 'keyboard-escape-quit)
+
+
+(add-to-list 'load-path "~/.emacs.d/modules")
+
+(require 'thanos-packages)
+(require 'multi-eshell)
+(require 'thanos-eshell)
+(require 'thanos-aesthetics)
+(require 'thanos-dired)
+(require 'thanos-org-config)
+(require 'thanos-org-roam)
+(require 'thanos-org-themes)
+(require 'thanos-pass)
+(require 'thanos-commands)
+(require 'thanos-vm)
+(require 'thanos-ai)
+(require 'thanos-books)
+(require 'thanos-chat)
+(require 'thanos-dev)
+(require 'thanos-dired)
+(require 'thanos-markdown)
+(require 'thanos-mu4e)
+(require 'thanos-multimedia)
 
 ;;; init.el ends here
diff --git a/.emacs.d/modules/multi-eshell.el b/.emacs.d/modules/multi-eshell.el
index 4e6cc6b..23e1d97 100644
--- a/.emacs.d/modules/multi-eshell.el
+++ b/.emacs.d/modules/multi-eshell.el
@@ -23,6 +23,13 @@
 ;;
 
 ;;; Code:
+
+(defun if-void (arg default)
+  (if (boundp arg)
+      (eval arg)
+    default
+    ))
+
 (defgroup multi-eshell nil
   "Simple support for having multiple shells open."
   :group 'languages)