diff --git a/config-ext.org b/config-ext.org index 4142187..a45686b 100644 --- a/config-ext.org +++ b/config-ext.org @@ -805,7 +805,7 @@ #+end_src ** ivy-posframe #+begin_src emacs-lisp - (unless my/at-ti + (unless my-ec/at-ti (use-package ivy-posframe :config (setq ivy-posframe-display-functions-alist diff --git a/config-exwm.org b/config-exwm.org index d374271..947ad6c 100644 --- a/config-exwm.org +++ b/config-exwm.org @@ -3,7 +3,7 @@ * exwm #+begin_src emacs-lisp ;; This will be the hardest to write :/ - (when my/enable-exwm + (when my-ec/enable-exwm (use-exwm :load-path "~/.emacs.d/submodule/exwm/" :config diff --git a/config-min.org b/config-min.org index 9ed45a8..be40d58 100644 --- a/config-min.org +++ b/config-min.org @@ -497,7 +497,7 @@ :bind (("M-E" . #'er/expand-region))) ;; Banner comments - (unless my/at-ti + (unless my-ec/at-ti (use-package banner-comment :commands banner-comment :bind (("C-c h" . #'banner-comment)))) diff --git a/init.el b/init.el index 4ca1bc4..4810e45 100644 --- a/init.el +++ b/init.el @@ -45,20 +45,20 @@ (require 'libs) (require 'emacs-custom-load-or-ask) -(ec/load-or-ask-pred 'my/is-wsl "Are you running Emacs in WSL?") -(ec/load-or-ask-pred 'my/enable-exwm "Do you want to load EXMW?") -(ec/load-or-ask-pred 'my/at-ti "Are you at TI for work?") -(defvar is-windows (or my/is-wsl +(ec/load-or-ask-pred 'my-ec/is-wsl "Are you running Emacs in WSL?") +(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/add-info-dir "Do you want an auxiliary info dir? ") +(ec/load-or-ask-pred 'my-ec/add-info-dir "Do you want an auxiliary info dir? ") -(when my/add-info-dir - (ec/load-or-ask-dir 'my/info-dir "Info Directory? ") - (add-to-list 'Info-directory-list my/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/enable-exwm (and my/enable-exwm (eq 'x window-system))) +(setq my-ec/enable-exwm (and my-ec/enable-exwm (eq 'x window-system))) (require 'keymap) @@ -67,8 +67,8 @@ 'face-new-frame-defaults 'face--new-frame-defaults "28.1")) -(ec/load-or-ask-pred 'my/load-full-config "Do you want to load full config for emacs?") -(ec/load-or-ask-pred 'my/load-org-config "Do you want to load org config?") +(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?") ;; It is imperative that this be loaded for a nice emacs ;; experience. Only SUPER stable stuff goes in this file, and should @@ -77,7 +77,7 @@ (expand-file-name "config-min.org" user-emacs-directory)) -(when my/load-full-config +(when my-ec/load-full-config ;; Load additional exwm stuff that changes constantly (use-exwm @@ -91,10 +91,10 @@ user-emacs-directory)) ;; Load work stuff when at work. - (when my/at-ti + (when my-ec/at-ti (require 'work-config)) - (when (and (not my/at-ti) my/load-org-config) + (when (and (not my-ec/at-ti) my-ec/load-org-config) (org-babel-load-file (expand-file-name "config-org.org" user-emacs-directory))) @@ -103,7 +103,7 @@ (expand-file-name "my-redefs.org" user-emacs-directory)) - (when my/enable-exwm + (when my-ec/enable-exwm (require 'exwm))) (setq my/finished t)