~estraw/.emacs.d

92f7268dfb55588b66ed9f67d0d8cce4258b1de6 — Evan Straw 6 months ago 832a408
Change config to use several packages from Guix instead of MELPA
3 files changed, 4 insertions(+), 9 deletions(-)

M modules/module-lang-coq.el
M modules/module-lang-java.el
M modules/module-lang-ocaml.el
M modules/module-lang-coq.el => modules/module-lang-coq.el +1 -2
@@ 8,8 8,7 @@
  :hook ((coq-mode . proofgeneral)
	 (coq-mode . setup-pg-fonts)))

(use-package company-math
  :ensure t)
(use-package company-math)

(use-package company-coq
  :commands (company-coq-mode)

M modules/module-lang-java.el => modules/module-lang-java.el +2 -2
@@ 1,7 1,7 @@
;; ---------------
;; LSP Java Configuration
;; ---------------
(use-package lsp-java :ensure t :after lsp-mode
(use-package lsp-java :after lsp-mode
  :commands (lsp-java-lens-mode)
  :config
  (setq lsp-java-server-install-dir


@@ 26,7 26,7 @@
  :commands (flycheck-mode)
  :hook (java-mode . flycheck-mode))

(use-package dap-mode :ensure t :after lsp-mode
(use-package dap-mode :after lsp-mode
  :commands (dap-mode)
  :hook (java-mode . dap-mode)
  :config (dap-auto-configure-mode))

M modules/module-lang-ocaml.el => modules/module-lang-ocaml.el +1 -5
@@ 3,19 3,16 @@
;; ----------

(use-package tuareg
  :ensure t
  :commands (tuareg-mode)
  :mode (("\\.ml[ily]?$" . tuareg-mode)
	 ("\\.topml$" . tuareg-mode)))

(use-package merlin
  :ensure t
  :commands (merlin-mode)
  :config
  (setq merlin-use-auto-complete-mode t)
  (setq merlin-error-after-save nil)
  (use-package merlin-eldoc
    :ensure t)
  (use-package merlin-eldoc)
  :hook (tuareg-mode . merlin-mode))

(use-package ocp-indent


@@ 36,7 33,6 @@
	 (utop-mode . company-mode)))

(use-package dune
  :ensure t
  :commands (dune-mode)
  :mode ("dune" . dune-mode))