2 files changed, 63 insertions, 117 deletions

@@ -4,24 +4,23 @@
 
 ;;; Code:
 
-;;; Remove when done bankrupting
-
-(defkeys t "C-x C-c" #'restart-emacs)
-
 ;;; My extras
 
 (push (expand-file-name (locate-user-emacs-file "lisp")) load-path)
 (require 'acdw)                         ; Omnibus fun stuff
 
+;;; Remove when done bankrupting
+
+(defkeys t "C-x C-c" #'restart-emacs)
+
 ;;; Basic defaults
 
 (use-package no-littering
-  :ensure t
-  :demand t
+  :ensure t :demand t
+  :preface
+  (setq no-littering-etc-directory etc/
+        no-littering-var-directory var/)
   :custom
-  (no-littering-etc-directory etc/)
-  (no-littering-var-directory var/)
-  (custom-file (etc/ "custom.el"))
   (auto-save-file-name-transforms `(("." ,(var/ "auto-save/") t)))
   (auto-save-list-file-prefix (var/ "auto-save/.saves-" t))
   (backup-directory-alist `(("." . ,(var/ "backup/" t)))))
@@ -82,30 +81,28 @@
 ;;; Completions
 
 (use-package vertico
-  :ensure t
+  :ensure t :demand t
   :custom
   (resize-mini-windows 'grow-only)
   (vertico-cycle t)
-  :init
+  :config
   (use-package vertico-directory
     :after vertico
-    :config
-    (add-hook 'rfn-eshadow-update-overlay-hook #'vertico-directory-tidy))
+    :hook (rfn-eshadow-update-overlay-hook . vertico-directory-tidy))
   (vertico-mode))
 
 (use-package marginalia
-  :ensure t
-  :demand t
+  :ensure t :demand t
   :config
   (add-hook 'minibuffer-setup-hook #'truncate-lines-local-mode)
   (marginalia-mode))
 
 (use-package orderless
-  :ensure t
-  :custom
-  (completion-styles '(orderless basic))
-  (completion-category-overrides
-   '((file (styles basic partial-completion)))))
+  :ensure t :demand t
+  :config
+  (setc completion-styles '(orderless basic)
+        completion-category-overrides
+        '((file (styles basic partial-completion)))))
 
 (use-package consult
   :ensure t
@@ -158,7 +155,7 @@
                  (window-parameters (mode-line-format . none)))))
 
 (use-package embark-consult
-  :ensure t
+  :ensure t :demand t
   :after (embark consult)
   :hook (embark-collect-mode-hook . consult-preview-at-point-mode))
 
@@ -217,8 +214,7 @@
   (advice-add 'text-scale-adjust :after #'visual-fill-column-adjust))
 
 (use-package cape
-  :ensure t
-  :demand t
+  :ensure t :demand t
   :init
   (dolist (fn '(cape-file cape-dabbrev))
     (add-hook 'completion-at-point-functions fn 90))
@@ -235,79 +231,27 @@
   :bind (:map grep-mode-map
               ("C-x C-q" . wgrep-change-to-wgrep-mode)))
 
-(progn
-  (use-package-statistics-gather :use-package 'mlscroll nil)
-  (use-package-ensure-elpa 'mlscroll
-                           '(t)
-                           'nil)
-  (use-package-statistics-gather :preface 'mlscroll nil)
-  (eval-and-compile
-    (defhook modus-themes-after-load-theme-hook :name modus-themes-load@mlscroll
-             (mlscroll-mode -1)
-             (when
-                 (or
-                  (memq 'modus-vivendi custom-enabled-themes)
-                  (memq 'modus-operandi custom-enabled-themes))
-               (modus-themes-with-colors
-                 (setf mlscroll-in-color fg-dim mlscroll-out-color bg-inactive)))
-             (eval-after 1
-               (mlscroll-mode 1))))
-  (defvar use-package--warning99
-    (function
-     (lambda
-       (keyword err)
-       (let
-           ((msg
-             (format "%s/%s: %s" 'mlscroll keyword
-                     (error-message-string err))))
-         (display-warning 'use-package msg :error)))))
-  (condition-case-unless-debug err
-      (progn
-        (use-package-statistics-gather :init 'mlscroll nil)
-        (condition-case-unless-debug err
-            (when
-                (daemonp)
-              (add-hook 'server-after-make-frame
-                        (function modus-themes-load@ml-scroll)))
-          (error
-           (funcall use-package--warning99 :init err)))
-        (run-with-idle-timer 1 nil
-                             (function require)
-                             'mlscroll nil t)
-        (eval-after-load 'mlscroll
-          '(progn
-             (use-package-statistics-gather :config 'mlscroll nil)
-             (let
-                 ((now
-                   (current-time)))
-               (message "%s..." "Configuring package mlscroll")
-               (prog1
-                   (condition-case-unless-debug err
-                       (progn
-                         (modus-themes-load@mlscroll)
-                         t)
-                     (error
-                      (funcall use-package--warning99 :config err)))
-                 (let
-                     ((elapsed
-                       (float-time
-                        (time-subtract
-                         (current-time)
-                         now))))
-                   (if
-                       (> elapsed 0.1)
-                       (message "%s...done (%.3fs)" "Configuring package mlscroll" elapsed)
-                     (message "%s...done" "Configuring package mlscroll")))))
-             (use-package-statistics-gather :config 'mlscroll t)))
-        (use-package-statistics-gather :init 'mlscroll t))
-    (error
-     (funcall use-package--warning99 :catch err)))
-  (use-package-statistics-gather :preface 'mlscroll t)
-  (use-package-statistics-gather :use-package 'mlscroll t))
+(use-package mlscroll
+  :ensure t :defer 1
+  :preface
+  (defhook modus-themes-after-load-theme-hook
+    :name modus-themes-load@mlscroll
+    (mlscroll-mode -1)
+    (when
+        (or
+         (memq 'modus-vivendi custom-enabled-themes)
+         (memq 'modus-operandi custom-enabled-themes))
+      (modus-themes-with-colors
+        (setf mlscroll-in-color fg-dim mlscroll-out-color bg-inactive)))
+    (eval-after 1
+      (mlscroll-mode 1)))
+  :init
+  (when (daemonp)
+    (add-hook 'server-after-make-frame #'modus-themes-load@mlscroll))
+  :config (modus-themes-load@mlscroll))
 
 (use-package avy
-  :ensure t
-  :demand t
+  :ensure t :demand t
   :custom
   (avy-background t)
   (avy-keys (string-to-list "asdfghjklqwertyuiopzxcvbnm"))
@@ -762,8 +706,7 @@
 ;;; The INTERNET
 
 (use-package link-hint
-  :ensure t
-  :demand t
+  :ensure t :demand t
   :preface
   (global-set-key (kbd "M-l") nil)
   :custom
@@ -104,43 +104,46 @@
                         ))
   (funcall disable-mode -1))
 
+(deftheme use-package)
+(enable-theme 'use-package)
+
 ;;; Internal packages
 
 (when (require 'abbrev nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(abbrev-file-name (sync/ "abbrev.el"))
    '(save-abbrevs 'silently)))
 
 (when (require 'autorevert nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(auto-revert-verbose nil)
    '(global-auto-revert-non-file-buffers t))
   (global-auto-revert-mode +1))
 
 (when (require 'comp nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(native-comp-async-report-warnings-errors 'silent)
    '(native-comp-deferred-compilation t)))
 
 (when (require 'custom nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(custom-file (etc/ "custom.el"))))
 
 (when (require 'ediff nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(ediff-window-setup-function #'ediff-setup-windows-plain)))
 
 (when (require 'eldoc nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(eldoc-echo-area-use-multiline-p nil)
    '(eldoc-idle-delay 0.1)))
 
 (when (require 'executable nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(executable-prefix-env t)))
 
 (when (require 'files nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(auto-save-default nil)
    '(auto-save-interval 1)
    '(auto-save-no-message t)
@@ -163,7 +166,7 @@
   (auto-save-visited-mode))
 
 (when (require 'frame nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(blink-cursor-blinks 1)
    '(blink-cursor-interval 0.25)
    '(blink-cursor-delay 0.25))
@@ -179,21 +182,21 @@
   (add-hook 'ibuffer-mode-hook #'hl-line-mode))
 
 (when (require 'image nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(image-use-external-converter
      (seq-some #'executable-find '("convert" "gm" "ffmpeg")))))
 
 (when (require 'imenu nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(imenu-auto-rescan t)))
 
 (when (require 'isearch nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(regexp-search-ring-max default-ring-max)
    '(search-ring-max default-ring-max)))
 
 (when (require 'minibuffer nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(completion-category-defaults nil)
    '(completion-category-overrides '((file (styles partial-completion))))
    '(completion-ignore-case t)
@@ -209,13 +212,13 @@
   (minibuffer-electric-default-mode))
 
 (when (require 'mouse nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(mouse-drag-copy-region t)
    '(mouse-wheel-progressive-speed nil)
    '(mouse-yank-at-point t)))
 
 (when (require 'paren nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(show-paren-delay 0.01)
    '(show-paren-style 'parenthesis)
    '(show-paren-when-point-in-periphery t)
@@ -224,7 +227,7 @@
   (electric-pair-mode))
 
 (when (require 'recentf nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(recentf-save-file (var/ "recentf.el"))
    '(recentf-max-menu-items default-ring-max)
    '(recentf-max-saved-items nil)
@@ -236,7 +239,7 @@
   (recentf-mode +1))
 
 (when (require 'savehist nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(history-length 1024)
    '(history-delete-duplicates t)
    '(savehist-file (var/ "savehist.el"))
@@ -262,25 +265,25 @@
   (savehist-mode +1))
 
 (when (require 'saveplace nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(save-place-file (var/ "places.el"))
    '(save-place-forget-unreadable-files (eq system-type 'gnu/linux)))
   (save-place-mode 1))
 
 (when (require 'uniquify nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(uniquify-after-kill-buffer-p t)
    '(uniquify-buffer-name-style 'forward)
    '(uniquify-ignore-buffers-re "^\\*")
    '(uniquify-separator path-separator)))
 
 (when (require 'vc nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(vc-follow-symlinks t)
    '(vc-make-backup-files t)))
 
 (when (require 'window nil t)
-  (custom-set-variables
+  (custom-theme-set-variables 'use-package
    '(recenter-positions '(top 2 middle bottom))))
 
 ;;; New features