diff --git a/init.el b/init.el index 8bd1c8c..944bb90 100644 --- a/init.el +++ b/init.el @@ -44,22 +44,6 @@ (require 'emacs-custom-load-or-ask) (require 'my-predicates) -(ec/load-or-ask-pred 'my-ec/is-wsl "Are you running Emacs in WSL?") -(ec/load-or-ask-pred 'my/puppet-p "Are you running on Puppet's computer?") -(ec/load-or-ask-pred 'my-ec/enable-exwm "Do you want to load EXMW?") -(ec/load-or-ask-pred 'my-ec/at-ti "Are you at TI for work?") -(defvar is-windows (or my-ec/is-wsl - (eq system-type - 'windows-nt))) - -(ec/load-or-ask-pred 'my-ec/add-info-dir "Do you want an auxiliary info dir? ") - -(when my-ec/add-info-dir - (ec/load-or-ask-dir 'my-ec/info-dir "Info Directory? ") - (add-to-list 'Info-directory-list my-ec/info-dir)) - -(setq my-ec/enable-exwm (and my-ec/enable-exwm (eq 'x window-system))) - (require 'keymap) (when (boundp 'face--new-frame-defaults) @@ -67,9 +51,6 @@ 'face-new-frame-defaults 'face--new-frame-defaults "28.1")) -(ec/load-or-ask-pred 'my-ec/load-full-config "Do you want to load full config for emacs?") -(ec/load-or-ask-pred 'my-ec/load-org-config "Do you want to load org config?") - (when (not my-ec/is-wsl) (add-to-list 'default-frame-alist '(width . 200)) (add-to-list 'default-frame-alist '(height . 60))) diff --git a/lisp/my-predicates.el b/lisp/my-predicates.el index 633e7ab..71ee939 100644 --- a/lisp/my-predicates.el +++ b/lisp/my-predicates.el @@ -23,7 +23,26 @@ ;;; Commentary: ;;; Code: +(require 'emacs-custom-load-or-ask) +(ec/load-or-ask-pred 'my-ec/is-wsl "Are you running Emacs in WSL?") +(ec/load-or-ask-pred 'my/puppet-p "Are you running on Puppet's computer?") +(ec/load-or-ask-pred 'my-ec/enable-exwm "Do you want to load EXMW?") +(ec/load-or-ask-pred 'my-ec/at-ti "Are you at TI for work?") +(defvar is-windows (or my-ec/is-wsl + (eq system-type + 'windows-nt))) + +(ec/load-or-ask-pred 'my-ec/add-info-dir "Do you want an auxiliary info dir? ") + +(when my-ec/add-info-dir + (ec/load-or-ask-dir 'my-ec/info-dir "Info Directory? ") + (add-to-list 'Info-directory-list my-ec/info-dir)) + +(setq my-ec/enable-exwm (and my-ec/enable-exwm (eq 'x window-system))) + +(ec/load-or-ask-pred 'my-ec/load-full-config "Do you want to load full config for emacs?") +(ec/load-or-ask-pred 'my-ec/load-org-config "Do you want to load org config?") (provide 'my-predicates) ;;; my-predicates.el ends here