More config changes

lisp/langs/icejam-lang-clojure.el

@@ -40,8 +40,7 @@
   (column-enforce-n 80)
   (cider-mode 1)
 
-  (define-key
-    clojure-mode-map (kbd "C-c l") 'icejam-lang-cider-context-menu)
+  (define-key clojure-mode-map (kbd "C-c l") 'icejam-lang-cider-context-menu)
 
   ;; Do not enable paredit for clojure
   ;; (paredit-mode 1)

lisp/langs/icejam-lang-elisp.el

@@ -1,9 +1,11 @@
 ;;; languages/elisp -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
-(declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-elisp-capfs 'icejam-complete-at-point)
-(declare-function icejam-set-indent 'icejam-prog-mode)
+
+(eval-when-compile
+  (declare-function column-enforce-n 'column-enforce-mode (number))
+  (declare-function icejam-set-elisp-capfs 'icejam-complete-at-point)
+  (declare-function icejam-set-indent 'icejam-prog-mode))
 
 (add-to-list 'auto-mode-alist '("/Eask\\'" . emacs-lisp-mode))
 

lisp/langs/icejam-lang-elixir.el

@@ -2,15 +2,15 @@
 ;;; Commentary:
 ;;; Code:
 
-(declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function -> 'dash)
-(declare-function lsp 'lsp-mode)
-(declare-function yas--table-get-create 'yasnippet)
-(declare-function yas--remove-template-by-uuid 'yasnippet)
-
-(declare-function icejam-set-indent 'icejam-prog-mode)
-(declare-function icejam-set-lsp-capfs 'icejam-complete-at-point)
-(eval-when-compile (defvar icejam-language-transient-alist))
+(eval-when-compile
+  (declare-function column-enforce-n 'column-enforce-mode (number))
+  (declare-function -> 'dash)
+  (declare-function lsp 'lsp-mode)
+  (declare-function yas--table-get-create 'yasnippet)
+  (declare-function yas--remove-template-by-uuid 'yasnippet)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-lsp-capfs 'icejam-complete-at-point)
+  (defvar icejam-language-transient-alist))
 
 ;; Only load the elixir-format from elixir mode.
 (use-package elixir-format :defer t

lisp/langs/icejam-lang-markdown.el

@@ -2,32 +2,35 @@
 ;;; Commentary:
 ;;; Code:
 
-(declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function icejam-set-indent 'icejam-prog-mode)
+(eval-when-compile
+  (declare-function elpaca-installed-p "elpaca")
+  (declare-function column-enforce-n 'column-enforce-mode (number))
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function rxt--re-builder-switch-pcre-mode "pcre2el"))
 
 ;; Markdown is a dependency of LSP mode. By wrapping it in unless we silence
 ;; a warning from the byte compiler.
-(declare-function elpaca-installed-p "elpaca")
 (unless (elpaca-installed-p 'markdown-mode)
-  (use-package markdown-mode :ensure t :defer t))
+  (use-package markdown-mode :ensure t :defer t
+    :commands (markdown-preview)
+    :config
+    ;; Render preview and open it in browser.
+    (keymap-set markdown-mode-map "C-c C-v" #'markdown-preview)
 
-(with-eval-after-load 'markdown-mode
-  (setq-default markdown-command "pandoc"))
-
-(declare-function rxt--re-builder-switch-pcre-mode "pcre2el")
-(declare-function markdown-preview 'markdown-mode)
+    ;; Render HTML preview with pandoc
+    (setq-default markdown-command '("pandoc"
+                                     "-f"
+                                     "markdown"
+                                     "-t"
+                                     "html5"
+                                     "--template"
+                                     "github.html5"
+                                     "--highlight-style"
+                                     "pygments"))))
 
 (defun icejam-lang-activate-markdown-mode ()
   "Reconfigure markdown mode for your own purposes."
-  (icejam-set-indent 2)
-  (column-enforce-n 10000)
-
-  ;; Markdown mode reuses my bindings, remove them.
-  (keymap-set markdown-mode-map "C-c <left>" nil)
-  (keymap-set markdown-mode-map "C-c <right>" nil)
-  (keymap-set markdown-mode-map "C-c <up>" nil)
-  (keymap-set markdown-mode-map "C-c <down>" nil)
-  (keymap-set markdown-mode-map "C-c C-v" #'markdown-preview))
+  (icejam-set-indent 2))
 
 (add-hook 'markdown-mode-hook 'icejam-lang-activate-markdown-mode)
 (add-hook 'markdown-mode-hook 'display-line-numbers-mode)

lisp/langs/icejam-lang-rust.el

@@ -1,23 +1,27 @@
 ;;; rust -- summary -*- lexical-binding: t; -*-
 ;;; Commentary:
 ;;; Code:
-
-(declare-function column-enforce-n 'column-enforce-mode (number))
-(declare-function lsp-deferred 'lsp-mode)
-
-(declare-function icejam-set-indent 'icejam-prog-mode)
-(declare-function icejam-set-lsp-capfs 'icejam-complete-at-point)
+(eval-when-compile
+  (declare-function column-enforce-n 'column-enforce-mode (number))
+  (declare-function lsp-deferred 'lsp-mode)
+  (declare-function icejam-set-indent 'icejam-prog-mode)
+  (declare-function icejam-set-lsp-capfs 'icejam-complete-at-point))
 
 (use-package rust-mode
   :ensure t
   :defer t
-  :config
-  (setq rust-mode-treesitter-derive t))
+  :config (setopt rust-mode-treesitter-derive t))
+
+(use-package rustic
+  :ensure t
+  :defer t
+  :after (rust-mode)
+  :config (setopt rustic-format-on-save nil))
 
 (use-package flycheck-rust
   :ensure t
   :defer t
-  :requires (rust-mode lsp))
+  :after (rust-mode lsp))
 
 (defun icejam-activate-rust-mode ()
   "All things for Rust mode."