Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewbauer committed Apr 30, 2024
1 parent 63b5488 commit 588c6de
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 64 deletions.
110 changes: 58 additions & 52 deletions README.org
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ The format of arguments to =set-defaults= is identical to the one used by
| compilation-ask-about-save | nil |
| compilation-scroll-output | 'first-error |
| compilation-skip-threshold | 2 |
| compilation-context-lines | t |
| completions-cycle-threshold | t |
| completions-detailed | t |
| completions-format | 'vertical |
Expand Down Expand Up @@ -1022,6 +1023,7 @@ Company provides completions in Emacs. Activate them by pressing =C-M-i=.

#+BEGIN_SRC emacs-lisp
(use-package company
:disabled
:delight
:defer 1
:custom (company-require-match nil)
Expand All @@ -1037,8 +1039,7 @@ Company provides completions in Emacs. Activate them by pressing =C-M-i=.
comint-previous-matching-input-from-input
comint-next-matching-input-from-input
completion-at-point))
:custom (company-backends '(company-elisp
company-css
:custom (company-backends '(company-css
company-cmake
company-nxml
(company-capf
Expand Down Expand Up @@ -2848,48 +2849,53 @@ Eglot is builtin to Emacs and can work with any language with an LSP backend.
**** Haskell

#+BEGIN_SRC emacs-lisp
(use-package haskell-mode
:custom (haskell-compile-cabal-build-command "cabal new-build")
:custom (haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s")
:mode (("\\.cabal\\'" . haskell-cabal-mode))
:hook ((haskell-mode . subword-mode)
;; (haskell-mode . flyspell-prog-mode)
;; (haskell-mode . haskell-indentation-mode)
;; (haskell-mode . haskell-auto-insert-module-template)
;; (haskell-mode . haskell-decl-scan-mode)
;; (haskell-mode . turn-on-haskell-indent)
;; (haskell-mode . imenu-add-menubar-index)
;; (haskell-mode .
;; (lambda ()
;; (autoload 'haskell-doc-current-info
;; "haskell-doc")
;; (setq-local eldoc-documentation-function
;; 'haskell-doc-current-info)))
(haskell-mode . (lambda () (whitespace-mode -1)))
)

:functions xref-push-marker-stack
:commands (haskell-session-maybe haskell-mode-find-def haskell-ident-at-point
haskell-mode-handle-generic-loc)
:bind (:map haskell-mode-map
("C-c h" . haskell-hoogle)
("C-c C-." . haskell-navigate-imports)
("C-`" . haskell-interactive-bring)
("C-c `" . haskell-interactive-bring)
("C-c C-t" . haskell-process-do-type)
("C-c C-i" . haskell-process-do-info)
("C-c C-k" . haskell-interactive-mode-clear)
("C-c c" . haskell-process-cabal)
;; ("M-." . haskell-mode-jump-to-def)
:map haskell-cabal-mode-map
("C-`" . haskell-interactive-bring)
("C-c C-k" . haskell-interactive-mode-clear)
("C-c c" . haskell-process-cabal))
:init
(add-to-list 'completion-ignored-extensions ".hi")
:config
;; (setq flymake-allowed-file-name-masks (delete '("\\.l?hs\\'" haskell-flymake-init) flymake-allowed-file-name-masks))
)
(use-package haskell-mode
:custom (haskell-compile-cabal-build-command "cabal new-build")
:custom (haskell-hoogle-url "https://hoogle.haskell.org/?hoogle=%s")
:mode (("\\.cabal\\'" . haskell-cabal-mode))
:hook ((haskell-mode . subword-mode)
;; (haskell-mode . flyspell-prog-mode)
;; (haskell-mode . haskell-indentation-mode)
;; (haskell-mode . haskell-auto-insert-module-template)
;; (haskell-mode . haskell-decl-scan-mode)
;; (haskell-mode . turn-on-haskell-indent)
;; (haskell-mode . imenu-add-menubar-index)
;; (haskell-mode .
;; (lambda ()
;; (autoload 'haskell-doc-current-info
;; "haskell-doc")
;; (setq-local eldoc-documentation-function
;; 'haskell-doc-current-info)))
(haskell-mode . (lambda () (whitespace-mode -1)))
(compilation-start . (lambda (proc)
(when (file-exists-p (expand-file-name "cabal.project" compilation-directory))
(setq-local compilation-error-regexp-alist haskell-compilation-error-regexp-alist)
(add-hook 'compilation-filter-hook 'haskell-compilation-filter-hook nil t))))
)

:functions xref-push-marker-stack
:commands (haskell-session-maybe haskell-mode-find-def haskell-ident-at-point
haskell-mode-handle-generic-loc)
:bind (:map haskell-mode-map
("C-c h" . haskell-hoogle)
("C-c C-." . haskell-navigate-imports)
("C-`" . haskell-interactive-bring)
("C-c `" . haskell-interactive-bring)
("C-c C-t" . haskell-process-do-type)
("C-c C-i" . haskell-process-do-info)
("C-c C-k" . haskell-interactive-mode-clear)
("C-c c" . haskell-process-cabal)
;; ("M-." . haskell-mode-jump-to-def)
:map haskell-cabal-mode-map
("C-`" . haskell-interactive-bring)
("C-c C-k" . haskell-interactive-mode-clear)
("C-c c" . haskell-process-cabal))
:init
(add-to-list 'completion-ignored-extensions ".hi")
(require 'haskell-compile)
:config
;; (setq flymake-allowed-file-name-masks (delete '("\\.l?hs\\'" haskell-flymake-init) flymake-allowed-file-name-masks))
)
#+END_SRC

**** JavaScript
Expand Down Expand Up @@ -4442,14 +4448,14 @@ Cross-platform script to execute the app. Uses =open= on macOS to get the
graphical version of Emacs.

#+BEGIN_SRC shell :padline no
case $(uname) in
Darwin)
open @emacs@/Applications/Emacs.app
;;
*)
@emacs@/bin/emacs
;;
esac
case $(uname) in
# Darwin)
# open @emacs@/Applications/Emacs.app
# ;;
,*)
@emacs@/bin/emacs
;;
esac
#+END_SRC
* Building
:PROPERTIES:
Expand Down
24 changes: 12 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 588c6de

Please sign in to comment.