Use elpaca for longer

lisp/icejam-base.el

@@ -9,6 +9,7 @@
 ;; pkg/base defines basic packages and environment.
 
 ;;; Code:
+(require 'icejam-keys-mode)
 
 ;;;;;;;; Other optimizations ;;;;;;;;;;;;;;;;;
 ;;;;;;;; Stolen from Doom Emacs. ;;;;;;;;;;;;;
@@ -40,20 +41,19 @@
 (global-set-key (kbd "RET") 'newline)
 
 ;;;;;;;;; Easy copying of data ;;;;;;;;;;;;;;;
-(use-package easy-kill :ensure t)
-(with-eval-after-load 'easy-kill
-  (global-set-key [remap kill-ring-save] 'easy-kill))
+(use-package easy-kill :ensure t
+  :bind ([remap kill-ring-save] . easy-kill))
 
 ;; Move buffers around with buffer keys
 (use-package buffer-move :ensure t :defer t)
 
 ;; Garbage collection magic hack
-(use-package gcmh :ensure t)
-(with-eval-after-load 'gcmh
-  (gcmh-mode 1)
-  (setq gcmh-verbose nil
-        gcmh-idle-delay 'auto
-        gcmh-auto-idle-delay-factor 10))
+(use-package gcmh :ensure t
+  :custom ((gcmh-verbose nil "Do not log GC messages.")
+           (gcmh-idle-delay 'auto "Compute GC delay based on gcmh-auto-idle-delay-factor")
+           (gcmh-auto-idle-delay-factor 10 "Original value was 10"))
+  :config
+  (gcmh-mode t))
 
 ;; #====================== Backup config #==============================
 (setq backup-directory-alist
@@ -97,16 +97,16 @@
 ;; Allow to execute path from shell
 (use-package exec-path-from-shell
   :if (memq window-system '(x mac ns))
-  :ensure t)
-
-(with-eval-after-load 'exec-path-from-shell
+  :ensure t
+  :config
   (add-to-list 'exec-path "/usr/local/bin")
-  (dolist (var '("DEFT_PATH" "LANG" "LC_CTYPE"))
-    (add-to-list 'exec-path-from-shell-variables var))
-  (exec-path-from-shell-initialize))
+    (dolist (var '("DEFT_PATH" "LANG" "LC_CTYPE"))
+      (add-to-list 'exec-path-from-shell-variables var))
+    (exec-path-from-shell-initialize))
 
-(use-package direnv :ensure t)
-(with-eval-after-load 'direnv
+(use-package direnv :ensure t
+  :config
+  (declare-function direnv-mode "direnv")
   (direnv-mode t))
 
 ;; Draw underline lower
@@ -119,30 +119,34 @@
       indicate-empty-lines nil)
 
 ;;;;;;;;;;;;;;;;; Treemacs
-(use-package treemacs :ensure t)
-(with-eval-after-load 'treemacs
+(use-package treemacs :ensure t
+  :commands (treemacs-follow-mode treemacs-project-follow-mode treemacs)
+  :bind (:map icejam-keys-mode-map
+              ([(hyper b)] . treemacs))
+  :config
   (treemacs-follow-mode t)
-  (treemacs-project-follow-mode t)
-  (define-key icejam-keys-mode-map [(hyper b)] 'treemacs))
+  (treemacs-project-follow-mode t))
 
-(use-package treemacs-all-the-icons :ensure t :requires (treemacs))
-(with-eval-after-load 'treemacs-all-the-icons
-  (treemacs-load-theme "all-the-icons"))
+(use-package treemacs-all-the-icons :ensure t :defer t
+  :requires (treemacs)
+  :commands (treemacs-load-theme)
+  :config (treemacs-load-theme "all-the-icons"))
 
 ;;;;;;;;;;;;;;;;; Record frequency of different commands. Review them later
-(use-package keyfreq :ensure t)
-(with-eval-after-load 'keyfreq
+(use-package keyfreq :ensure t
+  :config
+  (declare-function keyfreq-mode "keyfreq")
+  (declare-function keyfreq-autosave-mode "keyfreq")
   (keyfreq-mode t)
   (keyfreq-autosave-mode t))
 
 ;;;;;;;;;;;;;;;;; Show hints about key combinations
-(use-package which-key :ensure t)
-(with-eval-after-load 'which-key
-  (setq which-key-idle-delay 0.5)
-  (which-key-mode t))
+(use-package which-key :ensure t
+  :custom (which-key-idle-delay 0.5)
+  :config (which-key-mode t))
 
 ;;;;;;;;;;;;;;;;; Use C-n to create a new line
-(setq next-line-add-newlines t)
+(setopt next-line-add-newlines t)
 
 ;;;;;;;;;;;;;;;;; Speed up long line display by disabling bidirectional text
 (setq-default bidi-paragraph-direction 'left-to-right