summaryrefslogtreecommitdiffhomepage
path: root/custom/jao-custom-programming.el
diff options
context:
space:
mode:
authorjao <jao@gnu.org>2026-11-14 14:44:51 +0000
committerjao <jao@gnu.org>2026-11-14 14:45:17 +0000
commitb27733acd4caadb399f889ba9fe5fe22de120f44 (patch)
treeed806aab75a8bbe8ba46c6a96386d554b3487059 /custom/jao-custom-programming.el
parent519aff06d86594e79af69faa34edeab5992a3df9 (diff)
downloadelibs-b27733acd4caadb399f889ba9fe5fe22de120f44.tar.gz
elibs-b27733acd4caadb399f889ba9fe5fe22de120f44.tar.bz2
nits
Diffstat (limited to 'custom/jao-custom-programming.el')
-rw-r--r--custom/jao-custom-programming.el78
1 files changed, 38 insertions, 40 deletions
diff --git a/custom/jao-custom-programming.el b/custom/jao-custom-programming.el
index 034bb63..532c3a5 100644
--- a/custom/jao-custom-programming.el
+++ b/custom/jao-custom-programming.el
@@ -300,7 +300,6 @@
:hook (rust-mode . jao-rust-mode-hook)
:config
(setq rust-mode-treesitter-derive t)
- (use-package smartparens-rust :demand t)
(defun jao-rust-mode-hook ()
;; (smartparens-mode 1)
@@ -477,21 +476,20 @@
(use-package haskell-mode
:ensure t
- :custom
- ((inferior-haskell-find-project-root t)
- (haskell-check-remember-last-command-p nil)
- (haskell-completing-read-function 'completing-read)
- (haskell-font-lock-symbols nil)
- (haskell-hoogle-command "hoogle")
- (haskell-interactive-popup-errors t)
- (haskell-process-auto-import-loaded-modules t)
- (haskell-process-log t)
- (haskell-process-suggest-remove-import-lines t)
- (haskell-process-suggest-hoogle-imports t)
- (haskell-process-type 'cabal-repl)
- (haskell-process-use-presentation-mode t)
- (haskell-stylish-on-save nil)
- (haskell-tags-on-save t))
+ :custom ((inferior-haskell-find-project-root t)
+ (haskell-check-remember-last-command-p nil)
+ (haskell-completing-read-function 'completing-read)
+ (haskell-font-lock-symbols nil)
+ (haskell-hoogle-command "hoogle")
+ (haskell-interactive-popup-errors t)
+ (haskell-process-auto-import-loaded-modules t)
+ (haskell-process-log t)
+ (haskell-process-suggest-remove-import-lines t)
+ (haskell-process-suggest-hoogle-imports t)
+ (haskell-process-type 'cabal-repl)
+ (haskell-process-use-presentation-mode t)
+ (haskell-stylish-on-save nil)
+ (haskell-tags-on-save t))
:init
;; For use with M-x align
@@ -530,19 +528,19 @@
(setq tags-revert-without-query t)
- (defun jao-haskell-mode ()
- (require 'haskell-doc)
- (setq-local eldoc-documentation-function 'eldoc-documentation-default
- eldoc-documentation-functions '(jao-haskell-eldoc))
- (eldoc-mode))
+ (defun jao-haskell-mode-hook ()
+ ;; (setq-local eldoc-documentation-function 'eldoc-documentation-default
+ ;; eldoc-documentation-functions '(jao-haskell-eldoc))
+ ;; (eldoc-mode)
+ ;; (interactive-haskell-mode)
+ (haskell-decl-scan-mode)
+ (haskell-indentation-mode)
+ (eglot-ensure))
- (dolist (h '(jao-haskell-mode
- haskell-decl-scan-mode
- haskell-indentation-mode
- interactive-haskell-mode))
- (add-hook 'haskell-mode-hook h))
+ (defun jao-haskell--no-ws () (whitespace-mode -1))
- (add-hook 'haskell-presentation-mode-hook (lambda () (whitespace-mode -1)))
+ :hook ((haskell-presentation-mode . jao-haskell--no-ws)
+ (haskell-mode . jao-haskell-mode-hook))
:bind (:map haskell-mode-map
(("C-c C-d" . jao-haskell-hoogle)
@@ -550,8 +548,8 @@
("C-c h" . haskell-hoogle)
("C-c t" . haskell-doc-show-type)
("C-c C-e" . haskell-command-insert-language-pragma)
- ("C-M-n" . flymake-goto-next-error)
- ("C-M-p" . flymake-goto-prev-error)
+ ("M-n" . flymake-goto-next-error)
+ ("M-p" . flymake-goto-prev-error)
("<f3>" . haskell-session-kill))))
(jao-when-linux
@@ -611,17 +609,17 @@
:disabled t
:ensure t
:commands (run-prolog prolog-mode mercury-mode)
- :init (progn
- (setq prolog-system 'swi)
- (add-to-list 'auto-mode-alist '("\\.pl$" . prolog-mode))
- (setq prolog-consult-string '((t "[%f].")))
- (setq prolog-program-name
- '(((getenv "EPROLOG") (eval (getenv "EPROLOG")))
- (eclipse "eclipse")
- (mercury nil)
- (sicstus "sicstus")
- (swi "swipl")
- (t "prolog")))))
+ :init
+ (setq prolog-system 'swi)
+ (setq prolog-consult-string '((t "[%f].")))
+ (setq prolog-program-name
+ '(((getenv "EPROLOG") (eval (getenv "EPROLOG")))
+ (eclipse "eclipse")
+ (mercury nil)
+ (sicstus "sicstus")
+ (swi "swipl")
+ (t "prolog")))
+ (add-to-list 'auto-mode-alist '("\\.pl$" . prolog-mode)))
;;;; Python
(use-package uv-mode