fix(use-package): better checking for disabled packages

core/me-use-package-extra.el

@@ -43,7 +43,13 @@
   (advice-add
    'use-package :around
    (defun +use-package--check-if-disabled-a (origfn package &rest args)
-     (unless (+package-disabled-p package)
+     (when (and (not (+package-disabled-p package))
+                (or (not (memq :if args))
+                    (and (memq :if args) (eval (plist-get args :if))))
+                (or (not (memq :when args))
+                    (and (memq :when args) (eval (plist-get args :when))))
+                (or (not (memq :unless args))
+                    (and (memq :unless args) (not (eval (plist-get args :unless))))))
        (add-to-list 'minemacs-configured-packages package t)
        (apply origfn package args))))
 

modules/me-biblio.el

@@ -8,10 +8,10 @@
 
 ;;; Code:
 
+(defconst +zotero-available-p (executable-find "zotero"))
+
 (use-package zotxt
   :straight t
-  :preface
-  (defconst +zotero-available-p (executable-find "zotero"))
   :when +zotero-available-p
   :init
   (+map-local! :keymaps 'org-mode-map

modules/me-debug.el

@@ -29,10 +29,10 @@
   :straight t
   :commands (ipdb realgud:ipdb))
 
+(defconst +objdump-available-p (executable-find "objdump"))
+
 (use-package disaster
   :straight t
-  :preface
-  (defconst +objdump-available-p (executable-find "objdump"))
   :when +objdump-available-p
   :init
   (+map-local! :keymaps '(c-mode-map c++-mode-map fortran-mode-map)

modules/me-docs.el

@@ -79,11 +79,11 @@
                            '(:eval (doom-modeline-segment--major-mode))))))))))
        (:eval (doom-modeline-segment--major-mode))))))
 
+(defconst +tuntox-available-p (executable-find "tuntox"))
+(defconst +stunnel-available-p (executable-find "stunnel"))
+
 (use-package crdt
   :straight t
-  :preface
-  (defconst +tuntox-available-p (executable-find "tuntox"))
-  (defconst +stunnel-available-p (executable-find "stunnel"))
   :when (or +tuntox-available-p +stunnel-available-p)
   :init
   (cond (+tuntox-available-p

modules/me-media.el

@@ -25,10 +25,10 @@
         `((,(rx (seq "http" (? ?s) "://" (? "www.") (or "youtube.com" "youtu.be"))) . +browse-url-mpv)
           ("." . browse-url-default-browser))))
 
+(defconst +mpv-available-p (executable-find +mpv-command))
+
 (use-package empv
   :straight (:host github :repo "isamert/empv.el")
-  :preface
-  (defconst +mpv-available-p (executable-find +mpv-command))
   :when +mpv-available-p
   :init
   (+map! :infix "o"

modules/me-natural-langs.el

@@ -8,10 +8,10 @@
 
 ;;; Code:
 
+(defconst +aspell-available-p (executable-find "aspell"))
+
 (use-package spell-fu
   :straight t
-  :preface
-  (defconst +aspell-available-p (executable-find "aspell"))
   :when +aspell-available-p
   :hook (text-mode . spell-fu-mode)
   :hook (spell-fu-mode . +spell-fu--init-excluded-faces-h)
@@ -166,10 +166,10 @@
 (use-package reverso
   :straight (:host github :repo "SqrtMinusOne/reverso.el"))
 
+(defconst +sdcv-available-p (executable-find "sdcv"))
+
 (use-package lexic
   :straight t
-  :preface
-  (defconst +sdcv-available-p (executable-find "sdcv"))
   :when +sdcv-available-p
   :init
   (+map! :infix "s"

modules/me-tools.el

@@ -125,10 +125,10 @@
   (logview-views-file (concat minemacs-local-dir "logview-views.el"))
   (logview-cache-filename (concat minemacs-cache-dir "logview-cache.el")))
 
+(defconst +bitwarden-available-p (executable-find "bw"))
+
 (use-package bitwarden
   :straight (:host github :repo "seanfarley/emacs-bitwarden")
-  :preface
-  (defconst +bitwarden-available-p (executable-find "bw"))
   :when +bitwarden-available-p
   :custom
   (bitwarden-automatic-unlock

modules/me-vc.el

@@ -174,10 +174,10 @@
   :init
   :mode ("/.dockerignore\\'" . gitignore-mode))
 
+(defconst +repo-available-p (executable-find "repo"))
+
 (use-package repo
   :straight t
-  :preface
-  (defconst +repo-available-p (executable-find "repo"))
   :when +repo-available-p
   :init
   (+map! "gr" #'repo-status))