mirror of
https://github.com/pestctrl/emacs-config.git
synced 2026-02-16 16:24:18 +00:00
Most predicate configuration should live in a single file
This commit is contained in:
parent
84aabd8b89
commit
ba73a766fe
2 changed files with 19 additions and 19 deletions
19
init.el
19
init.el
|
|
@ -44,22 +44,6 @@
|
||||||
(require 'emacs-custom-load-or-ask)
|
(require 'emacs-custom-load-or-ask)
|
||||||
(require 'my-predicates)
|
(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)
|
(require 'keymap)
|
||||||
|
|
||||||
(when (boundp 'face--new-frame-defaults)
|
(when (boundp 'face--new-frame-defaults)
|
||||||
|
|
@ -67,9 +51,6 @@
|
||||||
'face-new-frame-defaults 'face--new-frame-defaults
|
'face-new-frame-defaults 'face--new-frame-defaults
|
||||||
"28.1"))
|
"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)
|
(when (not my-ec/is-wsl)
|
||||||
(add-to-list 'default-frame-alist '(width . 200))
|
(add-to-list 'default-frame-alist '(width . 200))
|
||||||
(add-to-list 'default-frame-alist '(height . 60)))
|
(add-to-list 'default-frame-alist '(height . 60)))
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,26 @@
|
||||||
;;; Commentary:
|
;;; Commentary:
|
||||||
|
|
||||||
;;; Code:
|
;;; 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)
|
(provide 'my-predicates)
|
||||||
;;; my-predicates.el ends here
|
;;; my-predicates.el ends here
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue