more use-package

home.org

@@ -1945,6 +1945,7 @@ for completion. That makes it really annoying to use; don't use yasnippet with e
   (setopt completion-styles '(orderless basic))
 
   (use-package marginalia
+    :config
     (marginalia-mode))
 
   (use-package corfu

modules/home/default.nix

@@ -510,7 +510,6 @@
             org-modern
             org-present
             org-roam
-            ox-slack
             verb
             visual-fill-column
           ];
@@ -527,6 +526,7 @@
         programs.emacs = {
           extraPackages = epkgs: with epkgs; [
             slack
+            ox-slack
           ];
           extraConfig = builtins.readFile ./slack.el;
         };

modules/home/emacs.el

@@ -722,21 +722,31 @@ Check if a node type is available, then return the right indent rules."
 
 (setopt consult-narrow-key "<") ;; "C-+"
 
-(setopt vertico-count 25)
+(use-package vertico
-(vertico-mode)
+  :custom
+  (vertico-count 25)
+  :config
+  (vertico-mode))
 
 (setopt completion-styles '(orderless basic))
 
-(marginalia-mode)
+(use-package marginalia
+  :config
+  (marginalia-mode))
 
-(setopt corfu-cycle t)
+(use-package corfu
-(setopt corfu-popupinfo-mode nil)
+  :custom
-(setopt corfu-quit-at-boundary nil)
+  (corfu-cycle t)
-(setopt corfu-on-exact-match 'show)
+  (corfu-popupinfo-mode nil)
-(global-corfu-mode)
+  (corfu-quit-at-boundary nil)
+  (corfu-on-exact-match 'show)
+  :config
+  (global-corfu-mode))
 ;; (setq completion-in-region-function #'consult-completion-in-region)
 
-(add-hook 'completion-at-point-functions 'cape-file)
+(use-package cape
+  :custom
+  (add-hook 'completion-at-point-functions 'cape-file))
 
 (use-package org
   :bind (("C-c A" . org-agenda)
@@ -781,7 +791,8 @@ Check if a node type is available, then return the right indent rules."
   (set-face-attribute 'org-level-8 nil :font "Iosevka Aile"))
 
 (defvar-local my/org-present-face-remapping-cookies nil)
-(with-eval-after-load 'org-present
+(use-package org-present
+  :config
   (require 'face-remap)
   (require 'visual-fill-column)
 
@@ -849,8 +860,7 @@ Check if a node type is available, then return the right indent rules."
 ;; (org-roam-db-autosync-mode)
 
 (use-package org-modern
-  :after org
+  :hook org-mode)
-  :hook org-mode-hook)
 
 ;; (define-key org-mode-map (kbd "C-c C-r") verb-command-map)