From 9f73e90317dab62b269fec06d255c67d6520acb6 Mon Sep 17 00:00:00 2001
From: Maciej Szlosarczyk <maciej@sosek.net>
Date: Mon, 22 Jul 2024 07:43:42 +0300
Subject: [PATCH] Add missing requires to use-package macros

---
 lang/dart.el                                  |  2 +-
 lang/dhall.el                                 |  2 +-
 lang/elixir.el                                |  4 +--
 lang/gleam.el                                 |  4 +--
 lang/lean.el                                  |  1 +
 lang/other.el                                 |  2 +-
 lang/rust.el                                  |  2 +-
 lang/ziglang.el                               |  2 +-
 pkg/base.el                                   | 29 +++++++++---------
 pkg/company-yasnippet.el                      |  7 +++--
 pkg/dashboard.el                              | 20 ++++++-------
 pkg/ivy.el                                    | 14 +++++----
 pkg/keys-mode.el                              |  2 +-
 pkg/lsp.el                                    | 30 +++++++++----------
 pkg/prog-mode.el                              |  3 +-
 pkg/undo-tree.el                              |  2 +-
 themes/base16-harmonic-light-modified.el      |  2 +-
 ...base16-summerfruit-light-modified-theme.el |  2 +-
 themes/themes-base16-not-harmonic.el          |  2 +-
 19 files changed, 67 insertions(+), 65 deletions(-)

diff --git a/lang/dart.el b/lang/dart.el
index 5797e00..d7aff77 100644
--- a/lang/dart.el
+++ b/lang/dart.el
@@ -5,7 +5,7 @@
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
 
 (use-package dart-mode :straight t :defer t)
-(use-package lsp-dart :defer t :straight t)
+(use-package lsp-dart :defer t :straight t :requires (dart-mode lsp))
 
 (defun +custom-lang-dart/activate-dart-mode ()
   "Reconfigure dart mode for your own purposes."
diff --git a/lang/dhall.el b/lang/dhall.el
index d57766e..6199e1d 100644
--- a/lang/dhall.el
+++ b/lang/dhall.el
@@ -4,7 +4,7 @@
 
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
 
-(use-package dhall-mode :straight t :defer t)
+(use-package dhall-mode :straight t :defer t :requires (lsp))
 
 (defun +custom-lang-dhall/activate-dhall-mode ()
   "Reconfigure dhall mode for your own purposes."
diff --git a/lang/elixir.el b/lang/elixir.el
index 24884f1..609a3c6 100644
--- a/lang/elixir.el
+++ b/lang/elixir.el
@@ -6,8 +6,8 @@
 (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
 (require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
 
-(use-package elixir-mode :requires (lsp-mode lsp-ui) :straight t)
-(use-package elixir-ts-mode :requires (lsp-mode lsp-ui) :straight t)
+(use-package elixir-mode :defer t :straight t)
+(use-package elixir-ts-mode :requires (elixir-mode lsp-mode lsp-ui) :straight t)
 
 (add-to-list 'auto-mode-alist '("\\.exs\\'" . elixir-ts-mode))
 (add-to-list 'auto-mode-alist '("\\.ex\\'" . elixir-ts-mode))
diff --git a/lang/gleam.el b/lang/gleam.el
index b23c1d5..b0d15b7 100644
--- a/lang/gleam.el
+++ b/lang/gleam.el
@@ -14,10 +14,8 @@
 (require '+custom-pkg-flycheck "$HOME/.emacs.d/pkg/flycheck.el")
 (require '+custom-pkg-transient "$HOME/.emacs.d/pkg/transient.el")
 
-(use-package tree-sitter-indent :straight t)
-
 (use-package gleam-mode
-  :requires (tree-sitter-indent)
+  :requires (tree-sitter-indent lsp column-enforce-mode)
   :straight '(:type git
               :host github
               :repo "gleam-lang/gleam-mode"
diff --git a/lang/lean.el b/lang/lean.el
index 297f8dd..be688d3 100644
--- a/lang/lean.el
+++ b/lang/lean.el
@@ -11,6 +11,7 @@
 	           :host github
 	           :repo "leanprover/lean4-mode"
 	           :files ("*.el" "data"))
+  :requires (lsp)
   :defer t)
 
 (defun activate-lean-mode ()
diff --git a/lang/other.el b/lang/other.el
index d586f39..b20f12a 100644
--- a/lang/other.el
+++ b/lang/other.el
@@ -22,7 +22,7 @@
 (add-to-list 'auto-mode-alist '("\\.graphqls\\'" . graphql-mode))
 
 ;; Yaml
-(use-package yaml-mode :straight t :defer t)
+(use-package yaml-mode :straight t :defer t :requires (lsp))
 
 (defun +custom-lang-yaml/activate-yaml-mode ()
   "Activate yaml-mode."
diff --git a/lang/rust.el b/lang/rust.el
index 26e0361..f4cb61d 100644
--- a/lang/rust.el
+++ b/lang/rust.el
@@ -12,7 +12,7 @@
 (use-package flycheck-rust
   :straight t
   :defer t
-  :requires (rust-mode))
+  :requires (rust-mode lsp))
 
 (defun activate-rust-mode ()
   "All things for Rust mode."
diff --git a/lang/ziglang.el b/lang/ziglang.el
index 5acac9c..0aa30ba 100644
--- a/lang/ziglang.el
+++ b/lang/ziglang.el
@@ -14,7 +14,7 @@
 (require '+custom-pkg-ctags "$HOME/.emacs.d/pkg/ctags.el")
 (require '+custom-pkg-prog-mode "$HOME/.emacs.d/pkg/prog-mode.el")
 
-(use-package zig-mode :straight t :defer t)
+(use-package zig-mode :straight t :defer t :requires (lsp))
 
 (defun activate-zig-mode ()
   "Goodies for editing zig files."
diff --git a/pkg/base.el b/pkg/base.el
index bae9667..4378b46 100644
--- a/pkg/base.el
+++ b/pkg/base.el
@@ -54,9 +54,9 @@
 
 ;; #====================== Backup config #==============================
 (setq backup-directory-alist
-      `((".*" . "~/.emacs/backups/auto-save-list")))
+      `((".*" . "~/.emacs.d/backups/auto-save-list")))
 (setq auto-save-file-name-transforms
-      `((".*", "~/.emacs/backups/auto-save-list" t)))
+      `((".*", "~/.emacs.d/backups/auto-save-list" t)))
 
 (setq backup-by-copying t)
 (setq delete-old-versions t
@@ -88,7 +88,9 @@
 
 ;;;;;;;;;;;;;;;;;;;;;; Tree sitter ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (use-package tree-sitter :straight t)
-(use-package tree-sitter-langs :straight t)
+(use-package tree-sitter-langs :straight t :requires (tree-sitter))
+(use-package tree-sitter-indent :straight t)
+
 (global-tree-sitter-mode)
 (add-hook 'tree-sitter-after-on-hook 'tree-sitter-hl-mode)
 
@@ -119,23 +121,24 @@
 
 ;;;;;;;;;;;;;;;;; Treemacs
 (use-package treemacs :straight t :defer t)
-(use-package treemacs-all-the-icons :straight t)
-
-(treemacs-load-theme "all-the-icons")
-(treemacs-project-follow-mode t)
+(use-package treemacs-all-the-icons :defer t :requires (treemacs) :straight t
+  :config
+  (treemacs-load-theme "all-the-icons")
+  (treemacs-project-follow-mode t))
 
 ;;;;;;;;;;;;;;;;; Record frequency of different commands. Review them later
 (use-package keyfreq
   :defer t
-  :straight t)
-
-(keyfreq-mode t)
-(keyfreq-autosave-mode t)
+  :straight t
+  :config
+  (keyfreq-mode t)
+  (keyfreq-autosave-mode t))
 
 ;;;;;;;;;;;;;;;;; Show hints about key combinations
 (use-package which-key
   :defer t
-  :straight t)
+  :straight t
+  :config (which-key-mode t))
 
 ;;;;;;;;;;;;;;;;; Use C-n to create a new line
 (setq next-line-add-newlines t)
@@ -144,7 +147,5 @@
 (setq-default bidi-paragraph-direction 'left-to-right
               bidi-inhibit-bpa t)
 
-(which-key-mode t)
-
 (provide '+custom-pkg-base)
 ;;; base.el ends here
diff --git a/pkg/company-yasnippet.el b/pkg/company-yasnippet.el
index 80a1e94..8ad2124 100644
--- a/pkg/company-yasnippet.el
+++ b/pkg/company-yasnippet.el
@@ -10,10 +10,12 @@
 (use-package yasnippet-snippets
   :straight t
   :defer t
+  :requires (yasnippet)
   :config
   (unbind-key "C-c & C-n" yas-minor-mode-map)
   (unbind-key "C-c & C-s" yas-minor-mode-map)
-  (unbind-key "C-c & C-v" yas-minor-mode-map))
+  (unbind-key "C-c & C-v" yas-minor-mode-map)
+  (yas-global-mode t))
 
 (use-package company
   :commands (company-indent-or-complete-common company-yasnippet)
@@ -25,11 +27,10 @@
 (use-package company-box
   :straight t
   :defer t
-  :after company
+  :requires (company)
   :hook (((company-mode) . company-box-mode)))
 
 (global-company-mode t)
-(yas-global-mode t)
 
 (setq-default
  company-minimum-prefix-length 3   ;; minimum prefix character number for auto complete.
diff --git a/pkg/dashboard.el b/pkg/dashboard.el
index 21a6c0e..6e534f1 100644
--- a/pkg/dashboard.el
+++ b/pkg/dashboard.el
@@ -13,19 +13,19 @@
 (use-package dashboard
   :straight t
   :config
-  (dashboard-setup-startup-hook))
+  (dashboard-setup-startup-hook)
 
-(setq dashboard-footer-messages
-      '("Happy coding!" "I showed you my source code, pls respond"))
+  (setq dashboard-footer-messages
+        '("Happy coding!" "I showed you my source code, pls respond"))
 
-(setq dashboard-startup-banner 'logo)
-(setq dashboard-projects-backend 'projectile)
+  (setq dashboard-startup-banner 'logo)
+  (setq dashboard-projects-backend 'projectile)
 
-(setq dashboard-items '((recents  . 5)
-                        ;; (bookmarks . 5)
-                        ;; (agenda . 5)
-                        ;; (registers . 5)
-                        (projects . 5)))
+  (setq dashboard-items '((recents  . 5)
+                          ;; (bookmarks . 5)
+                          ;; (agenda . 5)
+                          ;; (registers . 5)
+                          (projects . 5))))
 
 (provide '+custom-pkg-dashboard)
 ;;; dashboard.el ends here
diff --git a/pkg/ivy.el b/pkg/ivy.el
index 8cfbc0b..cd03ddb 100644
--- a/pkg/ivy.el
+++ b/pkg/ivy.el
@@ -5,9 +5,15 @@
 
 (require '+custom-pkg-keys-mode "$HOME/.emacs.d/pkg/keys-mode.el")
 
-(use-package counsel :straight t :defer t)
-(use-package swiper :straight t :defer t)
+
 (use-package helpful :straight t :defer t)
+(use-package counsel :straight t :defer t :requires (helpful)
+  :config
+  ;; Use helpful for showing Elisp documentation
+  (setq counsel-describe-function-function #'helpful-callable)
+  (setq counsel-describe-variable-function #'helpful-variable))
+
+(use-package swiper :straight t :defer t)
 
 (use-package ivy
   :requires (counsel swiper helpful)
@@ -19,10 +25,6 @@
                 ivy-display-style 'fancy ;; Formatting style
                 ))
 
-;; Use helpful for showing Elisp documentation
-(setq counsel-describe-function-function #'helpful-callable)
-(setq counsel-describe-variable-function #'helpful-variable)
-
 (define-key +custom-keys-mode-map (kbd "C-c a") 'counsel-rg)
 (define-key +custom-keys-mode-map (kbd "C-c t") 'counsel-find-file)
 (define-key +custom-keys-mode-map (kbd "C-c C-s") 'swiper) ;; Find things by regexp
diff --git a/pkg/keys-mode.el b/pkg/keys-mode.el
index 4203fc6..e388d75 100644
--- a/pkg/keys-mode.el
+++ b/pkg/keys-mode.el
@@ -11,7 +11,7 @@
 ;;; Code:
 
 (define-minor-mode +custom-keys-mode
-  "Minor mode for all of my personal key bindings"
+  "Minor mode for all of my personal key bindings."
   :global t
   :keymap (make-sparse-keymap))
 
diff --git a/pkg/lsp.el b/pkg/lsp.el
index 0565034..ea3bc6d 100644
--- a/pkg/lsp.el
+++ b/pkg/lsp.el
@@ -16,6 +16,14 @@
                 lsp-lens-enable nil
                 lsp-lens-mode nil
                 read-process-output-max (* 1024 1024 2)
+                ;; Disable the piece of shit vue LSP server. It activates itself in every
+                ;; project with .js, .ts or .json file due to something called 'takeover
+                ;; mode' or 'hybrid mode' or some such.
+                ;; It would be okay, but it also doesn't work 99% of the time.
+
+                ;; When needed, enable this hot garbage in dir-locals.el
+                lsp-disabled-clients '(vue-semantic-server)
+                lsp-log-io nil
                 lsp-enable-file-watchers nil)
   (unbind-key "s-l =" lsp-mode-map)
   (unbind-key "s-l G" lsp-mode-map)
@@ -58,21 +66,13 @@
 (use-package lsp-ui
   :straight t
   :requires (lsp-mode)
-  :defer t)
-
-(setq lsp-ui-doc-enable t
-      lsp-ui-header t
-      lsp-ui-delay 0.5 ;; Wait half a second to display documentation
-      lsp-ui-doc-position 'at-point
-      lsp-ui-doc-include-signature t
-      ;; Disable the piece of shit vue LSP server. It activates itself in every
-      ;; project with .js, .ts or .json file due to something called 'takeover
-      ;; mode' or 'hybrid mode' or some such.
-      ;; It would be okay, but it also doesn't work 99% of the time.
-
-      ;; When needed, enable this hot garbage in dir-locals.el
-      lsp-disabled-clients '(vue-semantic-server)
-      lsp-log-io nil)
+  :defer t
+  :config
+  (setq lsp-ui-doc-enable t
+        lsp-ui-header t
+        lsp-ui-delay 0.5 ;; Wait half a second to display documentation
+        lsp-ui-doc-position 'at-point
+        lsp-ui-doc-include-signature t))
 
 ;; Lsp debugger mode
 (use-package dap-mode
diff --git a/pkg/prog-mode.el b/pkg/prog-mode.el
index 40f464e..f4f95e4 100644
--- a/pkg/prog-mode.el
+++ b/pkg/prog-mode.el
@@ -63,7 +63,7 @@
 
 ;; Ensure indentation in steps:
 (defun set-indent (step)
-  "Set indentation to X STEPs."
+  "Set indentation to STEP."
   (interactive "NNumber of columns for one step: ")
   (setq-local tab-width step)
   (setq-local tab-stop-list (number-sequence step 200 step)))
@@ -79,6 +79,5 @@
 ;; Formatter for many files
 (use-package apheleia :straight t :defer t)
 
-
 (provide '+custom-pkg-prog-mode)
 ;;; prog-mode ends here
diff --git a/pkg/undo-tree.el b/pkg/undo-tree.el
index a00ed25..1ea4dcc 100644
--- a/pkg/undo-tree.el
+++ b/pkg/undo-tree.el
@@ -16,7 +16,7 @@
   :straight t
   :config (setq-default
            ;; Save history to a specific folder
-           undo-tree-history-directory-alist '(("." . "~/.emacs/backups/undo-tree"))
+           undo-tree-history-directory-alist '(("." . "~/.emacs.d/backups/undo-tree"))
            ;; Show diff
            undo-tree-visualizer-diff t
            ;; Show timestamps
diff --git a/themes/base16-harmonic-light-modified.el b/themes/base16-harmonic-light-modified.el
index 3797e4d..6c21eb8 100644
--- a/themes/base16-harmonic-light-modified.el
+++ b/themes/base16-harmonic-light-modified.el
@@ -7,7 +7,7 @@
 
 ;;; Code:
 
-(require 'base16-theme)
+(use-package base16-theme :straight t :defer t)
 
 (defvar base16-harmonic-light-modified-colors
   '(:base00 "#f7f9fb"
diff --git a/themes/base16-summerfruit-light-modified-theme.el b/themes/base16-summerfruit-light-modified-theme.el
index 86985d4..4c3818d 100644
--- a/themes/base16-summerfruit-light-modified-theme.el
+++ b/themes/base16-summerfruit-light-modified-theme.el
@@ -7,7 +7,7 @@
 
 ;;; Code:
 
-(require 'base16-theme)
+(use-package base16-theme :straight t :defer t)
 
 (defvar base16-summerfruit-light-modified-colors
   '(:base00 "#fdfcfa"
diff --git a/themes/themes-base16-not-harmonic.el b/themes/themes-base16-not-harmonic.el
index e66ffc3..d54ef6e 100644
--- a/themes/themes-base16-not-harmonic.el
+++ b/themes/themes-base16-not-harmonic.el
@@ -5,7 +5,7 @@
 ;; Based on harmonic-dark theme by Jannik Seibert (https://github.com/janniks)
 ;;; Code:
 
-(require 'base16-theme)
+(use-package base16-theme :straight t :defer t)
 
 (defvar base16-not-harmonic-colors
   '(:base00 "#102941"