init: simplify loading libraries

2 files changed, 17 insertions, 14 deletions

diff --git a/emacs/lisp/my-work.el b/emacs/elisp/my-work.el
index a9a4e39..bdd917c 100644
--- a/emacs/lisp/my-work.el
+++ b/emacs/elisp/my-work.el
@@ -2,7 +2,7 @@
 ;;; Commentary:
 ;;; Code:
 
-(defun fcuny/check-work-machine-p ()
+(defun my/check-work-machine-p ()
   "Return t if this is a work machine."
   (string-match "HQ\\.*" (system-name)))
 
diff --git a/emacs/init.el b/emacs/init.el
index e7a6db7..7802db9 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -38,21 +38,24 @@
 
 (advice-add 'package-install :before 'my/package-install-refresh-contents)
 
-(require 'my-settings (expand-file-name "custom/my-settings" user-emacs-directory))
-(require 'my-ui (expand-file-name "custom/my-ui" user-emacs-directory))
-(require 'my-navigation (expand-file-name "custom/my-navigation" user-emacs-directory))
-(require 'my-edit (expand-file-name "custom/my-edit" user-emacs-directory))
-(require 'my-text (expand-file-name "custom/my-text" user-emacs-directory))
-(require 'my-git (expand-file-name "custom/my-git" user-emacs-directory))
-(require 'my-org (expand-file-name "custom/my-org" user-emacs-directory))
-(require 'my-conf (expand-file-name "custom/my-conf" user-emacs-directory))
-(require 'my-prog (expand-file-name "custom/my-prog" user-emacs-directory))
-(require 'my-eshell (expand-file-name "custom/my-eshell" user-emacs-directory))
-(require 'my-tramp (expand-file-name "custom/my-tramp" user-emacs-directory))
-(require 'my-notmuch (expand-file-name "custom/my-notmuch" user-emacs-directory))
+(add-to-list 'load-path (expand-file-name "custom/" user-emacs-directory))
+(add-to-list 'load-path (expand-file-name "elisp/" user-emacs-directory))
+
+(require 'my-settings)
+(require 'my-ui)
+(require 'my-navigation)
+(require 'my-edit)
+(require 'my-text)
+(require 'my-git)
+(require 'my-org)
+(require 'my-conf)
+(require 'my-prog)
+(require 'my-eshell)
+(require 'my-tramp)
+(require 'my-notmuch)
 
 ;; ;; (require 'fcuny-defuns)
 ;; ;; (require 'fcuny-commands)
-;; ;; (require 'my-work)
+(require 'my-work)
 
 ;;; init.el ends here