fix problem with lispy not loading

lisp/icejam-base.el

@@ -73,9 +73,11 @@
 (setopt create-lockfiles nil)
 
 ;; Enable line numbers and show cursors position
-(add-hook 'prog-mode-hook 'display-line-numbers-mode)
-(add-hook 'text-mode-hook 'display-line-numbers-mode)
-(add-hook 'conf-mode-hook 'display-line-numbers-mode)
+(dolist (mode '(prog-mode-hook
+                text-mode-hook
+                conf-mode-hook))
+  (add-hook mode 'display-line-numbers-mode))
+
 ;; (global-display-line-numbers-mode t)
 (column-number-mode t)
 

lisp/icejam-complete-at-point.el

@@ -38,31 +38,26 @@
 
 ;; Allow corfu to work in terminal
 (use-package corfu-terminal :ensure t :defer t
-  :unless (display-graphic-p)
+  :if (not (display-graphic-p))
   :hook ((elpaca-after-init . corfu-terminal-mode)))
 
 ;; These are actual completions
 (use-package cape :ensure t :after corfu
-  :commands (cape-dabbrev cape-file cape-elisp-symbol)
-  :init
-  (add-hook 'prog-mode-hook
-            (lambda ()
-              (progn
-                (add-hook 'completion-at-point-functions #'cape-dabbrev)
-                (add-hook 'completion-at-point-functions #'cape-file)
-                (add-hook 'completion-at-point-functions #'cape-elisp-symbol)))))
+  :config
+  ;; Set default completion values:
+  (set-default 'completion-at-point-functions
+               (list (cape-capf-super #'lsp-completion-at-point
+                                      #'yasnippet-capf)
+                     #'cape-dabbrev
+                     #'cape-file)))
 
-(use-package yasnippet-capf :ensure t
-  :after corfu
-  :commands (yasnippet-capf)
-  :config (setopt yasnippet-capf-lookup-by 'name)
-  :init
-  (add-hook 'prog-mode-hook
-            (lambda () (add-hook 'completion-at-point-functions #'yasnippet-capf))))
+(use-package yasnippet-capf :ensure t :after corfu
+  :config (setopt yasnippet-capf-lookup-by 'name))
 
 (use-package nerd-icons-corfu :ensure t
   :after corfu
   :config
+  (declare-function nerd-icons-corfu-formatter 'nerd-icons-corfu)
   (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
 
 (provide 'icejam-complete-at-point)

lisp/icejam-custom-init.el

@@ -85,60 +85,59 @@
 (defgroup :icejam nil "My customisation group.")
 
 ;; General configuration files.
-(require 'icejam-keys-mode)
-(require 'icejam-blocking)
-(require 'icejam-base)
-(require 'icejam-sys-specific)
-(require 'icejam-tree-sitter)
-(require 'icejam-completing-read)
-(require 'icejam-avy)
-(require 'icejam-transient)
-(require 'icejam-prog-mode)
-(require 'icejam-complete-at-point)
-(require 'icejam-copilot)
-(require 'icejam-flycheck)
-(require 'icejam-ispell)
-(require 'icejam-deft)
-(require 'icejam-lsp)
-(require 'icejam-dashboard)
-(require 'icejam-magit)
-(require 'icejam-vundo)
-(require 'icejam-speed-type)
+(use-package icejam-keys-mode :ensure nil)
+(use-package icejam-blocking :ensure nil)
+(use-package icejam-base :ensure nil)
+(use-package icejam-sys-specific :ensure nil)
+(use-package icejam-tree-sitter :ensure nil)
+(use-package icejam-completing-read :ensure nil)
+(use-package icejam-avy :ensure nil)
+(use-package icejam-transient :ensure nil)
+(use-package icejam-prog-mode :ensure nil)
+(use-package icejam-complete-at-point :ensure nil)
+(use-package icejam-copilot :ensure nil)
+(use-package icejam-flycheck :ensure nil)
+(use-package icejam-ispell :ensure nil)
+(use-package icejam-deft :ensure nil)
+(use-package icejam-lsp :ensure nil)
+(use-package icejam-dashboard :ensure nil)
+(use-package icejam-magit :ensure nil)
+(use-package icejam-vundo :ensure nil)
+(use-package icejam-speed-type :ensure nil)
 
 ;; Themes
-(require 'icejam-themes)
-(require 'icejam-fonts)
+(use-package icejam-themes :ensure nil)
+(use-package icejam-fonts :ensure nil)
 
 ;; Actual supported languages and file syntax.
-(require 'icejam-lang-clang)
-(require 'icejam-lang-clojure)
-;; (require 'icejam-lang-common-lisp)
-(require 'icejam-lang-dart)
-(require 'icejam-lang-dhall)
-(require 'icejam-lang-elisp)
-(require 'icejam-lang-elixir)
-(require 'icejam-lang-erlang)
-(require 'icejam-lang-fsharp)
-(require 'icejam-lang-gleam)
-(require 'icejam-lang-golang)
-(require 'icejam-lang-haskell)
-(require 'icejam-lang-javascript)
-(require 'icejam-lang-kotlin)
-(require 'icejam-lang-lean)
-(require 'icejam-lang-markdown)
-(require 'icejam-lang-ocaml)
-(require 'icejam-lang-other)
-(require 'icejam-lang-php)
-(require 'icejam-lang-purescript)
-(require 'icejam-lang-python)
-(require 'icejam-lang-ruby)
-(require 'icejam-lang-rust)
-(require 'icejam-lang-sh)
-(require 'icejam-lang-web)
-(require 'icejam-lang-ziglang)
+(use-package icejam-lang-clang :ensure nil)
+(use-package icejam-lang-clojure :ensure nil)
+(use-package icejam-lang-dart :ensure nil)
+(use-package icejam-lang-dhall :ensure nil)
+(use-package icejam-lang-elisp :ensure nil)
+(use-package icejam-lang-elixir :ensure nil)
+(use-package icejam-lang-erlang :ensure nil)
+(use-package icejam-lang-fsharp :ensure nil)
+(use-package icejam-lang-gleam :ensure nil)
+(use-package icejam-lang-golang :ensure nil)
+(use-package icejam-lang-haskell :ensure nil)
+(use-package icejam-lang-javascript :ensure nil)
+(use-package icejam-lang-kotlin :ensure nil)
+(use-package icejam-lang-lean :ensure nil)
+(use-package icejam-lang-markdown :ensure nil)
+(use-package icejam-lang-ocaml :ensure nil)
+(use-package icejam-lang-other :ensure nil)
+(use-package icejam-lang-php :ensure nil)
+(use-package icejam-lang-purescript :ensure nil)
+(use-package icejam-lang-python :ensure nil)
+(use-package icejam-lang-ruby :ensure nil)
+(use-package icejam-lang-rust :ensure nil)
+(use-package icejam-lang-sh :ensure nil)
+(use-package icejam-lang-web :ensure nil)
+(use-package icejam-lang-ziglang :ensure nil)
 
 ;; Diminish modeline litter
-(require 'icejam-diminish)
+(use-package icejam-diminish :ensure nil)
 
 ;; Restore GC to normal, but still high
 (setopt gc-cons-threshold 204800000)

lisp/icejam-diminish.el

@@ -17,7 +17,6 @@
                               (flycheck flycheck-mode)
                               (rainbow-mode rainbow-mode)
                               (undo-tree undo-tree-mode)
-                              (company company-mode)
                               (which-key which-key-mode)
                               (eldoc eldoc-mode)
                               (yasnippet yas-minor-mode)

lisp/icejam-fonts.el

@@ -26,6 +26,7 @@
 ;; (defconst icejam-font "Iosevka Term" "Default font.")
 
 (defconst icejam-font-family "Iosevka Comfy Motion" "Default font.")
+(defconst icejam-variable-font-family "Lexica Ultralegible" "Variable pitch font.")
 (defconst icejam-markdown-font-family "Iosevka Term" "Font used to render code blocks in markdown.")
 
 ;; Require dash functions to be included:
@@ -41,6 +42,11 @@ in `icejam-set-font-to-screen`.")
   "Current font, defaults to the one loaded in the beginning."
   :type 'string
   :group 'icejam)
+(defcustom icejam-mut-variable-font-family
+  icejam-font-family
+  "Current variable-pitch font.  Defaults to `icejam-variable-font-family`."
+  :type 'string
+  :group 'icejam)
 (defcustom icejam-mut-markdown-font-family
   icejam-markdown-font-family
   "Current markdown font family, defaults to the one loaded in the beginning."
@@ -78,6 +84,7 @@ two points smaller."
   (interactive "sNew font: \nnEnter height for %s: ")
   (setopt icejam-mut-font-family family)
   (setopt icejam-mut-font-height height)
+  (setopt icejam-mut-variable-font-family icejam-variable-font-family)
 
   ;; Set default font.
   (set-face-attribute 'default nil
@@ -85,6 +92,12 @@ two points smaller."
                       :height (-> height
                                   (* 10)))
 
+  ;; Set variable-pitch font
+  (set-face-attribute 'variable-pitch nil
+                      :family icejam-mut-variable-font-family
+                      :height (-> height
+                                  (* 10)))
+
   ;; Some font faces look better when they are 1 point smaller.
   (dolist (face '(tooltip))
     (set-face-attribute face nil :height (-> height

lisp/langs/icejam-lang-elisp.el

@@ -7,6 +7,8 @@
 (declare-function column-enforce-n "column-enforce-mode" (number))
 (add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))
 
+(use-package lispy :ensure t :defer t)
+
 (transient-define-prefix icejam-elisp-lang-menu ()
   "Elisp Buffer Commands."
   [""
@@ -24,17 +26,13 @@
 (defun icejam-activate-emacs-lisp-mode ()
   "Goodies for editing Emacs files."
 
-  ;; Default indentation of 2 characters
-  (icejam-set-indent 2)
-
-  ;; Use 80 char limit.
-  (column-enforce-n 80)
-
-  ;; Parents
-  (smartparens-mode t)
+  (icejam-set-indent 2) ;; Default indentation of 2 characters
+  (column-enforce-n 80) ;; Use 80 char limit.
+  (lispy-mode t)        ;; Modal editing for Lisp
 
   (setq-local completion-at-point-functions
-              (list (cape-capf-super #'elisp-completion-at-point #'yasnippet-capf)
+              (list (cape-capf-super #'elisp-completion-at-point
+                                     #'yasnippet-capf)
                     #'cape-dabbrev
                     #'cape-file
                     #'cape-elisp-symbol)))

lisp/langs/icejam-lang-elixir.el

@@ -43,7 +43,11 @@
 
   (setq-local lsp-eldoc-enable-hover nil)
   (setq-local lsp-completion-enable-additional-text-edit nil)
-  (setq-local company-minimum-prefix-length 3))
+  (setq-local completion-at-point-functions
+              (list (cape-capf-super #'lsp-completion-at-point
+                                     #'yasnippet-capf)
+                    #'cape-dabbrev
+                    #'cape-file)))
 
 (add-hook 'heex-ts-mode-hook 'icejam-activate-elixir-ts-mode)
 (add-hook 'elixir-ts-mode-hook 'icejam-activate-elixir-ts-mode)

lisp/langs/icejam-lang-purescript.el

@@ -25,8 +25,7 @@
   (purescript-indentation-mode t)
 
   ;; Company list override
-  (add-to-list (make-local-variable 'company-backends)
-               '(company-capf company-yasnippet)))
+  )
 
 (add-hook 'purescript-mode-hook 'icejam-activate-purescript-mode)