Merge branch 'develop' of https://github.com/hlissner/doom-emacs into develop
This commit is contained in:
hackeryarn
commit
765a078685
62 changed files with 1072 additions and 3245 deletions
|
|
@ -66,7 +66,7 @@ compilation database is present in the project.")
|
|||
;; Custom style, based off of linux
|
||||
(unless (assoc "doom" c-style-alist)
|
||||
(push '("doom"
|
||||
(c-basic-offset . ,tab-width)
|
||||
(c-basic-offset . tab-width)
|
||||
(c-comment-only-line-offset . 0)
|
||||
(c-hanging-braces-alist (brace-list-open)
|
||||
(brace-entry-open)
|
||||
|
|
|
|||
|
|
@ -1,42 +1,39 @@
|
|||
;;; lang/clojure/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
;; `clojure-mode'
|
||||
(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
|
||||
(after! clojure-mode
|
||||
(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
|
||||
|
||||
(def-package! cider
|
||||
;; NOTE: if you don't have an org directory set (the dir doesn't exist),
|
||||
;; cider jack in won't work.
|
||||
:commands (cider-jack-in cider-jack-in-clojurescript)
|
||||
:hook (clojure-mode . cider-mode)
|
||||
:init
|
||||
(set-popup-rule! "^\\*cider-repl" :quit nil :select nil)
|
||||
(set-repl-handler! 'clojure-mode #'+clojure/repl)
|
||||
(set-eval-handler! 'clojure-mode #'cider-eval-region)
|
||||
(set-lookup-handlers! 'clojure-mode
|
||||
:definition #'cider-browse-ns-find-at-point
|
||||
:documentation #'cider-browse-ns-doc-at-point)
|
||||
:config
|
||||
(setq nrepl-hide-special-buffers t
|
||||
cider-stacktrace-default-filters '(tooling dup)
|
||||
cider-prompt-save-file-on-load nil
|
||||
cider-repl-use-clojure-font-lock t)
|
||||
(map! :map cider-mode-map
|
||||
:localleader
|
||||
:n "'" #'cider-jack-in
|
||||
:n "\"" #'cider-jack-in-clojurescript
|
||||
:n "B" #'cider-switch-to-repl-buffer
|
||||
:n "n" #'cider-repl-set-ns
|
||||
:n "j" #'cider-find-var
|
||||
:n "h" #'cider-doc
|
||||
:n "c" #'cider-repl-clear-buffer
|
||||
:n "p" #'cider-eval-sexp-at-point))
|
||||
|
||||
(def-package! clj-refactor
|
||||
:after clojure-mode
|
||||
:config
|
||||
(map! :map clj-refactor-map
|
||||
:localleader
|
||||
:desc "Refactor hydra" :n "." #'hydra-cljr-help-menu/body))
|
||||
|
||||
(def-package! cider
|
||||
;; NOTE: if you don't have an org directory set (the dir doesn't exist), cider
|
||||
;; jack in won't work.
|
||||
:commands (cider-jack-in cider-jack-in-clojurescript)
|
||||
:hook (clojure-mode . cider-mode)
|
||||
:config
|
||||
(setq nrepl-hide-special-buffers t
|
||||
cider-stacktrace-default-filters '(tooling dup)
|
||||
cider-prompt-save-file-on-load nil
|
||||
cider-repl-use-clojure-font-lock t)
|
||||
(set-popup-rule! "^\\*cider-repl" :quit nil :select nil)
|
||||
(set-repl-handler! 'clojure-mode #'+clojure/repl)
|
||||
(set-eval-handler! 'clojure-mode #'cider-eval-region)
|
||||
(set-lookup-handlers! 'clojure-mode
|
||||
:definition #'cider-browse-ns-find-at-point
|
||||
:documentation #'cider-browse-ns-doc-at-point)
|
||||
|
||||
(map! :map cider-mode-map
|
||||
:localleader
|
||||
:n "'" #'cider-jack-in
|
||||
:n "\"" #'cider-jack-in-clojurescript
|
||||
:n "B" #'cider-switch-to-repl-buffer
|
||||
:n "b" #'cider-eval-buffer
|
||||
:n "n" #'cider-repl-set-ns
|
||||
:n "j" #'cider-find-var
|
||||
:n "d" #'cider-doc
|
||||
:n "c" #'cider-repl-clear-buffer
|
||||
:n "p" #'cider-eval-sexp-at-point
|
||||
:n "r" #'cider-eval-region))
|
||||
(def-package! clj-refactor
|
||||
:config
|
||||
(map! :map clj-refactor-map
|
||||
:localleader
|
||||
:desc "Refactor hydra" :n "r" #'hydra-cljr-help-menu/body)))
|
||||
|
|
|
|||
3
modules/lang/coq/README.org
Normal file
3
modules/lang/coq/README.org
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
#+TITLE: :lang coq
|
||||
|
||||
This module adds [[https://coq.inria.fr][coq]] support, powered by [[https://proofgeneral.github.io][Proof General]], with code completion via [[https://github.com/cpitclaudel/company-coq][company-coq]].
|
||||
4
modules/lang/coq/autoload.el
Normal file
4
modules/lang/coq/autoload.el
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
;;; lang/coq/autoload.el -*- lexical-binding: t; -*-
|
||||
|
||||
;;;###autoload
|
||||
(add-hook 'coq-mode-hook #'company-coq-mode)
|
||||
6
modules/lang/coq/packages.el
Normal file
6
modules/lang/coq/packages.el
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/coq/packages.el
|
||||
|
||||
(package! proof-general :recipe (:fetcher github :repo "ProofGeneral/PG" :files ("*")))
|
||||
|
||||
(package! company-coq)
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,10 +1,5 @@
|
|||
;;; lang/emacs-lisp/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +emacs-lisp-enable-extra-fontification t
|
||||
"If non-nil, fontify built-in functions and variables especially (symbols
|
||||
defined by Emacs, not Doom or packages). This can help make typos stand out.")
|
||||
|
||||
|
||||
;;
|
||||
;; elisp-mode deferral hack
|
||||
;;
|
||||
|
|
@ -36,7 +31,9 @@ defined by Emacs, not Doom or packages). This can help make typos stand out.")
|
|||
(after! elisp-mode
|
||||
(set-repl-handler! 'emacs-lisp-mode #'+emacs-lisp/repl)
|
||||
(set-eval-handler! 'emacs-lisp-mode #'+emacs-lisp-eval)
|
||||
(set-lookup-handlers! 'emacs-lisp-mode :documentation 'info-lookup-symbol)
|
||||
(set-lookup-handlers! 'emacs-lisp-mode
|
||||
:definition #'elisp-def
|
||||
:documentation #'info-lookup-symbol)
|
||||
(set-docset! 'emacs-lisp-mode "Emacs Lisp")
|
||||
(set-pretty-symbols! 'emacs-lisp-mode :lambda "lambda")
|
||||
(set-rotate-patterns! 'emacs-lisp-mode
|
||||
|
|
@ -59,23 +56,44 @@ defined by Emacs, not Doom or packages). This can help make typos stand out.")
|
|||
;; initialization
|
||||
+emacs-lisp|init-imenu))
|
||||
|
||||
(defvar +emacs-lisp--face nil)
|
||||
(defun +emacs-lisp-highlight-vars-and-faces (end)
|
||||
"Match defined variables and functions.
|
||||
|
||||
Functions are differentiated into special forms, built-in functions and
|
||||
library/userland functions"
|
||||
(catch 'matcher
|
||||
(while (re-search-forward "\\_<.+?\\_>" end t)
|
||||
(let ((symbol (intern-soft (match-string-no-properties 0))))
|
||||
(and (cond ((null symbol) nil)
|
||||
((eq symbol t) nil)
|
||||
((special-variable-p symbol)
|
||||
(setq +emacs-lisp--face 'font-lock-variable-name-face))
|
||||
((and (fboundp symbol)
|
||||
(eq (char-before (match-beginning 0)) ?\())
|
||||
(let ((unaliased (indirect-function symbol t)))
|
||||
(unless (or (macrop unaliased)
|
||||
(special-form-p unaliased))
|
||||
(let (unadvised)
|
||||
(while (not (eq (setq unadvised (ad-get-orig-definition unaliased))
|
||||
(setq unaliased (indirect-function unadvised t)))))
|
||||
unaliased)
|
||||
(setq +emacs-lisp--face
|
||||
(if (subrp unaliased)
|
||||
'font-lock-constant-face
|
||||
'font-lock-function-name-face))))))
|
||||
(throw 'matcher t))))
|
||||
nil))
|
||||
(eval-when-compile
|
||||
(byte-compile #'+emacs-lisp-highlight-vars-and-faces))
|
||||
|
||||
;; Special fontification for doom
|
||||
(font-lock-add-keywords
|
||||
'emacs-lisp-mode
|
||||
`(;; custom Doom cookies
|
||||
("^;;;###\\(autodef\\|if\\)[ \n]" (1 font-lock-warning-face t))
|
||||
;; doom/module functions
|
||||
("\\(^\\|\\s-\\|,\\)(\\(\\(doom\\|\\+\\)[^) ]+\\|[^) ]+!\\)[) \n]" (2 'font-lock-keyword-face))))
|
||||
|
||||
;; Highlight symbols in standard library
|
||||
(when +emacs-lisp-enable-extra-fontification
|
||||
(load! "+symbols")
|
||||
(font-lock-add-keywords
|
||||
'emacs-lisp-mode
|
||||
`((,(concat "\\(?:(\\|#'\\)" (regexp-opt +emacs-lisp-function-list t) "\\_>") (1 'font-lock-function-name-face))
|
||||
(,(concat "\\(?:(\\|#'\\)" (regexp-opt +emacs-lisp-command-list t) "\\_>") (1 'font-lock-function-name-face))
|
||||
(,(regexp-opt +emacs-lisp-variable-list 'symbols) . font-lock-variable-name-face)
|
||||
(,(regexp-opt +emacs-lisp-option-list 'symbols) . font-lock-variable-name-face))))
|
||||
(append `(;; custom Doom cookies
|
||||
("^;;;###\\(autodef\\|if\\)[ \n]" (1 font-lock-warning-face t))
|
||||
;; highlight defined, special variables & functions
|
||||
(+emacs-lisp-highlight-vars-and-faces . +emacs-lisp--face))))
|
||||
|
||||
(defun +emacs-lisp|init-imenu ()
|
||||
"Improve imenu support with better expression regexps and Doom-specific forms."
|
||||
|
|
@ -92,8 +110,7 @@ defined by Emacs, not Doom or packages). This can help make typos stand out.")
|
|||
("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1)
|
||||
("Inline Functions" "\\s-*(\\(?:cl-\\)?defsubst +\\([^ )\n]+\\)" 1)
|
||||
("Functions" "^\\s-*(\\(?:cl-\\)?def\\(?:un\\|un\\*\\|method\\|generic\\|-memoized!\\) +\\([^ ,)\n]+\\)" 1)
|
||||
("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2)
|
||||
("Variables" "^\\s-*(defvar\\(?:-local\\)?\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)[[:space:]\n]+[^)]" 1)
|
||||
("Variables" "^\\s-*(\\(def\\(?:c\\(?:onst\\(?:ant\\)?\\|ustom\\)\\|ine-symbol-macro\\|parameter\\|var\\(?:-local\\)?\\)\\)\\s-+\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2)
|
||||
("Types" "^\\s-*(\\(cl-def\\(?:struct\\|type\\)\\|def\\(?:class\\|face\\|group\\|ine-\\(?:condition\\|error\\|widget\\)\\|package\\|struct\\|t\\(?:\\(?:hem\\|yp\\)e\\)\\)\\)\\s-+'?\\(\\(?:\\sw\\|\\s_\\|\\\\.\\)+\\)" 2))))
|
||||
|
||||
(defun +emacs-lisp|disable-flycheck-maybe ()
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
(package! highlight-quoted)
|
||||
(package! macrostep)
|
||||
(package! overseer)
|
||||
(package! elisp-def)
|
||||
|
||||
(when (featurep! :feature syntax-checker)
|
||||
(package! flycheck-cask))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; lang/ess/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(def-package! ess-site
|
||||
(def-package! ess-mode
|
||||
:commands (R stata julia SAS)
|
||||
:mode (("\\.sp\\'" . S-mode)
|
||||
("/R/.*\\.q\\'" . R-mode)
|
||||
|
|
@ -30,6 +30,7 @@
|
|||
("\\.[Jj][Oo][Gg]\\'" . ess-jags-mode)
|
||||
("\\.[Jj][Mm][Dd]\\'" . ess-jags-mode))
|
||||
:init
|
||||
(setq ess-smart-S-assign-key nil)
|
||||
(unless (featurep! :lang julia)
|
||||
(add-to-list 'auto-mode-alist '("\\.jl\\'" . ess-julia-mode)))
|
||||
:config
|
||||
|
|
@ -38,7 +39,6 @@
|
|||
ess-expression-offset 2
|
||||
ess-nuke-trailing-whitespace-p t
|
||||
ess-default-style 'DEFAULT)
|
||||
(ess-toggle-underscore t)
|
||||
(set-repl-handler! 'ess-mode #'+ess/r-repl)
|
||||
(set-lookup-handlers! 'ess-mode :documentation #'ess-display-help-on-object)
|
||||
(define-key! ess-doc-map
|
||||
|
|
@ -78,8 +78,3 @@
|
|||
:n "cm" #'ess-noweb-mark-chunk
|
||||
:n "cp" #'ess-noweb-previous-chunk
|
||||
:n "cn" #'ess-noweb-next-chunk))
|
||||
|
||||
|
||||
;; `ess-smart-equals-mode'
|
||||
(add-hook! '(ess-mode-hook inferior-ess-hook)
|
||||
#'ess-smart-equals-mode)
|
||||
|
|
|
|||
|
|
@ -2,5 +2,4 @@
|
|||
;;; lang/ess/packages.el
|
||||
|
||||
(package! ess)
|
||||
(package! ess-smart-equals)
|
||||
(package! ess-R-data-view)
|
||||
|
|
|
|||
|
|
@ -86,19 +86,15 @@ Run this for any buffer you want to skewer."
|
|||
|
||||
;;;###autoload
|
||||
(defun +javascript|add-node-modules-path ()
|
||||
"Search the current buffer's parent directories for `node_modules/.bin`.
|
||||
If it's found, then add it to the `exec-path'."
|
||||
(if-let* ((root (locate-dominating-file
|
||||
(or (buffer-file-name) default-directory)
|
||||
"node_modules"))
|
||||
(path (expand-file-name "node_modules/.bin/" root)))
|
||||
(progn
|
||||
(make-local-variable 'exec-path)
|
||||
(cl-pushnew path exec-path :test #'string=)
|
||||
(when doom-debug-mode
|
||||
(message "Added %s to exec-path" path)))
|
||||
(when doom-debug-mode
|
||||
(message "node_modules not found in %s" root))))
|
||||
"Add current project's `node_modules/.bin` to `exec-path', so js tools
|
||||
prioritize project-local packages over global ones."
|
||||
(make-local-variable 'exec-path)
|
||||
(cl-pushnew (expand-file-name "node_modules/.bin/"
|
||||
(or (locate-dominating-file
|
||||
(or (buffer-file-name) default-directory)
|
||||
"node_modules")
|
||||
(doom-project-root)))
|
||||
exec-path :test #'string=))
|
||||
|
||||
;;;###autoload
|
||||
(defun +javascript|cleanup-tide-processes ()
|
||||
|
|
@ -124,4 +120,4 @@ If it's found, then add it to the `exec-path'."
|
|||
(or tide-project-root
|
||||
(or (locate-dominating-file default-directory "tsconfig.json")
|
||||
(locate-dominating-file default-directory "jsconfig.json"))
|
||||
(doom-project-root 'nocache)))
|
||||
(doom-project-root)))
|
||||
|
|
|
|||
|
|
@ -23,6 +23,9 @@
|
|||
(`pdf-tools
|
||||
(when (featurep! :tools pdf)
|
||||
(add-to-list 'TeX-view-program-selection '(output-pdf "PDF Tools"))
|
||||
(when IS-MAC
|
||||
;; PDF Tools isn't in `TeX-view-program-list-builtin' on macs
|
||||
(add-to-list 'TeX-view-program-list '("PDF Tools" TeX-pdf-tools-sync-view)))
|
||||
;; Update PDF buffers after successful LaTeX runs
|
||||
(add-hook 'TeX-after-compilation-finished-function #'TeX-revert-document-buffer))))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
;;; lang/nix/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(after! nix-mode
|
||||
(def-package! nix-mode
|
||||
:mode "\\.nix\\'"
|
||||
:config
|
||||
(set-company-backend! 'nix-mode 'company-nixos-options)
|
||||
|
||||
|
||||
(map! :map nix-mode-map
|
||||
:localleader
|
||||
:n "f" #'nix-update-fetch
|
||||
|
|
@ -14,8 +16,11 @@
|
|||
(:when (featurep! :completion helm)
|
||||
:n "o" #'helm-nixos-options)))
|
||||
|
||||
(def-package! nix-drv-mode
|
||||
:mode "\\.drv\\'")
|
||||
|
||||
(def-package! nix-update
|
||||
:commands (nix-update-fetch))
|
||||
:commands nix-update-fetch)
|
||||
|
||||
(def-package! nix-repl
|
||||
:commands (nix-repl-show))
|
||||
:commands nix-repl-show)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
;;; lang/nix/packages.el
|
||||
|
||||
(package! nix-mode)
|
||||
|
||||
(package! nix-update)
|
||||
|
||||
(when (featurep! :completion company)
|
||||
|
|
|
|||
|
|
@ -12,22 +12,19 @@
|
|||
path too.")
|
||||
(define-obsolete-variable-alias 'org-export-directory '+org-export-dir "2.1.0")
|
||||
|
||||
(def-package! ox-pandoc
|
||||
:defer t
|
||||
:config
|
||||
(add-to-list 'org-export-backends 'pandoc nil #'eq)
|
||||
(setq org-pandoc-options
|
||||
'((standalone . t)
|
||||
(mathjax . t)
|
||||
(variable . "revealjs-url=https://cdn.jsdelivr.net/npm/reveal.js@3/"))))
|
||||
|
||||
;;
|
||||
(defun +org|init-export ()
|
||||
(setq org-export-backends '(ascii html latex md)
|
||||
org-publish-timestamp-directory (concat doom-cache-dir "org-timestamps/"))
|
||||
|
||||
(when (executable-find "pandoc")
|
||||
(require 'ox-pandoc))
|
||||
(when (and (executable-find "pandoc")
|
||||
(require 'ox-pandoc nil t))
|
||||
(add-to-list 'org-export-backends 'pandoc nil #'eq)
|
||||
(setq org-pandoc-options
|
||||
'((standalone . t)
|
||||
(mathjax . t)
|
||||
(variable . "revealjs-url=https://cdn.jsdelivr.net/npm/reveal.js@3/"))))
|
||||
|
||||
;; Export to a central location by default or if target isn't in
|
||||
;; `org-directory'.
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@
|
|||
(width . 70)
|
||||
(height . 25)
|
||||
(transient . t)
|
||||
(window-system . ,(cond (IS-MAC 'ns)
|
||||
(IS-LINUX 'x)
|
||||
(t 'w32)))
|
||||
,(if IS-LINUX '(display . ":0")))
|
||||
"TODO")
|
||||
|
||||
|
|
|
|||
|
|
@ -398,15 +398,16 @@ with `org-cycle')."
|
|||
(unless (eq this-command 'org-shifttab)
|
||||
(save-excursion
|
||||
(org-beginning-of-line)
|
||||
(when (and (org-at-heading-p)
|
||||
(or org-cycle-open-archived-trees
|
||||
(not (member org-archive-tag (org-get-tags))))
|
||||
(or (not arg)
|
||||
(outline-invisible-p (line-end-position))))
|
||||
(outline-toggle-children)
|
||||
(unless (outline-invisible-p (line-end-position))
|
||||
(org-cycle-hide-drawers 'subtree))
|
||||
t))))
|
||||
(let (invisible-p)
|
||||
(when (and (org-at-heading-p)
|
||||
(or org-cycle-open-archived-trees
|
||||
(not (member org-archive-tag (org-get-tags))))
|
||||
(or (not arg)
|
||||
(setq invisible-p (outline-invisible-p (line-end-position)))))
|
||||
(unless invisible-p
|
||||
(setq org-cycle-subtree-status 'subtree))
|
||||
(org-cycle-internal-local)
|
||||
t)))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +org|remove-occur-highlights ()
|
||||
|
|
|
|||
|
|
@ -2,6 +2,17 @@
|
|||
|
||||
(defvar +php-composer-conf (make-hash-table :test 'equal))
|
||||
|
||||
;;;###autoload
|
||||
(defun +php-company-backend (command &optional arg &rest _ignored)
|
||||
"A delegating company-backend that uses `company-phpactor' if phpactor is
|
||||
available and installed, or `php-extras-company' otherwise."
|
||||
(cond ((and (require 'company-phpactor nil t)
|
||||
(ignore-errors (phpactor-find-executable)))
|
||||
(company-phpactor command arg))
|
||||
((and (require 'php-extras nil t)
|
||||
(file-exists-p (concat php-extras-eldoc-functions-file ".el")))
|
||||
(php-extras-company command arg))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +php-composer-conf (&optional project-root refresh-p)
|
||||
"Retrieve the contents of composer.json as an alist. If REFRESH-P is non-nil
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
;;; lang/php/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defvar +php--company-backends nil)
|
||||
|
||||
(def-package! php-mode
|
||||
:mode "\\.inc\\'"
|
||||
:config
|
||||
|
|
@ -12,13 +10,12 @@
|
|||
(set-repl-handler! 'php-mode #'php-boris)
|
||||
(set-lookup-handlers! 'php-mode :documentation #'php-search-documentation)
|
||||
|
||||
;; ac-php provides custom autocompletion, php-extras provides autocompletion
|
||||
;; for built-in libraries
|
||||
(when +php--company-backends
|
||||
(set-company-backend! 'php-mode +php--company-backends))
|
||||
;; `+php-company-backend' uses `company-phpactor', `php-extras-company' or
|
||||
;; `company-dabbrev-code', in that order.
|
||||
(set-company-backend! 'php-mode '+php-company-backend 'company-dabbrev-code)
|
||||
|
||||
;; Use the smallest `sp-max-pair-length' for optimum `smartparens' performance
|
||||
(setq-hook! 'php-mode-hook sp-max-pair-length 6)
|
||||
(setq-hook! 'php-mode-hook sp-max-pair-length 5)
|
||||
|
||||
(sp-with-modes '(php-mode)
|
||||
(sp-local-pair "<?" "?>" :post-handlers '(("| " "SPC" "=") ("||\n[i]" "RET") ("[d2]" "p")))
|
||||
|
|
@ -26,34 +23,63 @@
|
|||
|
||||
(map! :map php-mode-map
|
||||
:localleader
|
||||
(:prefix "r"
|
||||
:n "cv" #'php-refactor--convert-local-to-instance-variable
|
||||
:n "u" #'php-refactor--optimize-use
|
||||
:v "xm" #'php-refactor--extract-method
|
||||
:n "rv" #'php-refactor--rename-local-variable)
|
||||
(:prefix "t"
|
||||
:n "r" #'phpunit-current-project
|
||||
:n "a" #'phpunit-current-class
|
||||
:n "s" #'phpunit-current-test)))
|
||||
:prefix "t"
|
||||
:n "r" #'phpunit-current-project
|
||||
:n "a" #'phpunit-current-class
|
||||
:n "s" #'phpunit-current-test))
|
||||
|
||||
|
||||
(def-package! hack-mode
|
||||
:when (featurep! +hack)
|
||||
:mode "\\.hh$")
|
||||
(def-package! phpactor
|
||||
:after php-mode
|
||||
:config
|
||||
(set-lookup-handlers! 'php-mode
|
||||
:definition #'phpactor-goto-definition)
|
||||
|
||||
;; TODO PR these for phpactor.el?
|
||||
;; company-phpactor breaks company if executable doesn't exist
|
||||
(defun +php*company-phpactor-fail-silently (orig-fn &rest args)
|
||||
(when (phpactor-find-executable)
|
||||
(apply orig-fn args)))
|
||||
(advice-add #'company-phpactor :around #'+php*company-phpactor-fail-silently)
|
||||
|
||||
;; `phpactor-get-working-dir' throws stringp errors if not in a project.
|
||||
(defun +php*project-root (&rest _)
|
||||
(setq phpactor-working-dir
|
||||
(or phpactor-working-dir
|
||||
(php-project-get-root-dir)
|
||||
(doom-project-root))))
|
||||
(advice-add #'phpactor-get-working-dir :before #'+php*project-root)
|
||||
|
||||
(map! :map php-mode-map
|
||||
:localleader
|
||||
:prefix "r"
|
||||
:n "cc" #'phpactor-copy-class
|
||||
:n "mc" #'phpactor-move-class
|
||||
:v "oi" #'phpactor-offset-info
|
||||
:n "t" #'phpactor-transform
|
||||
:n "ic" #'phpactor-import-class))
|
||||
|
||||
|
||||
(def-package! php-refactor-mode
|
||||
:hook php-mode)
|
||||
:hook php-mode
|
||||
:config
|
||||
(map! :map php-refactor-mode-map
|
||||
:localleader
|
||||
:prefix "r"
|
||||
:n "cv" #'php-refactor--convert-local-to-instance-variable
|
||||
:n "u" #'php-refactor--optimize-use
|
||||
:v "xm" #'php-refactor--extract-method
|
||||
:n "rv" #'php-refactor--rename-local-variable))
|
||||
|
||||
|
||||
(def-package! php-extras
|
||||
:after php-mode
|
||||
:preface (advice-add #'php-extras-company-setup :override #'ignore)
|
||||
:init (add-to-list '+php--company-backends 'php-extras-company nil #'eq)
|
||||
:preface
|
||||
;; We'll set up company support ourselves
|
||||
(advice-add #'php-extras-company-setup :override #'ignore)
|
||||
:config
|
||||
(setq php-extras-eldoc-functions-file
|
||||
(concat doom-etc-dir "php-extras-eldoc-functions"))
|
||||
|
||||
;; Make expensive php-extras generation async
|
||||
(unless (file-exists-p (concat php-extras-eldoc-functions-file ".el"))
|
||||
(message "Generating PHP eldoc files...")
|
||||
|
|
@ -67,13 +93,9 @@
|
|||
(message "PHP eldoc updated!")))))
|
||||
|
||||
|
||||
(def-package! company-php
|
||||
:when (featurep! :completion company)
|
||||
:commands (ac-php-remake-tags ac-php-remake-tags-all)
|
||||
:init
|
||||
(add-to-list '+php--company-backends 'company-ac-php-backend nil #'eq)
|
||||
(add-hook 'php-mode-hook #'+php|init-ac-php-core-eldoc)
|
||||
(setq ac-php-tags-path (concat doom-cache-dir "ac-php/")))
|
||||
(def-package! hack-mode
|
||||
:when (featurep! +hack)
|
||||
:mode "\\.hh$")
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,9 @@
|
|||
(package! php-extras :recipe (:fetcher github :repo "arnested/php-extras"))
|
||||
(package! php-mode)
|
||||
(package! php-refactor-mode)
|
||||
(package! phpactor :recipe (:fetcher github :repo "emacs-php/phpactor.el" :files ("*.el")))
|
||||
(package! phpunit)
|
||||
|
||||
(when (featurep! :completion company)
|
||||
(package! company-php))
|
||||
|
||||
(when (featurep! +hack)
|
||||
(package! hack-mode :recipe (:fetcher github :repo "hhvm/hack-mode")))
|
||||
|
||||
|
|
|
|||
|
|
@ -130,7 +130,11 @@
|
|||
|
||||
(def-package! pipenv
|
||||
:commands pipenv-project-p
|
||||
:hook (python-mode . pipenv-mode))
|
||||
:hook (python-mode . pipenv-mode)
|
||||
:init (setq pipenv-with-projectile nil)
|
||||
:config
|
||||
(advice-add #'pipenv-activate :after-while #'+python|update-version)
|
||||
(advice-add #'pipenv-deactivate :after-while #'+python|update-version))
|
||||
|
||||
|
||||
(def-package! pyenv-mode
|
||||
|
|
@ -152,7 +156,9 @@
|
|||
(defun +python-current-pyvenv () pyvenv-virtual-env-name)
|
||||
(add-hook 'pyvenv-post-activate-hooks #'+python|update-version)
|
||||
(add-hook 'pyvenv-post-deactivate-hooks #'+python|update-version)
|
||||
(add-to-list '+python-mode-line-indicator '(pyvenv-virtual-env-name (" venv:" pyvenv-virtual-env-name)) 'append))
|
||||
(add-to-list '+python-mode-line-indicator
|
||||
'(pyvenv-virtual-env-name (" venv:" pyvenv-virtual-env-name))
|
||||
'append))
|
||||
|
||||
|
||||
(def-package! conda
|
||||
|
|
@ -186,6 +192,5 @@
|
|||
(add-hook 'conda-postactivate-hook #'+python|update-version)
|
||||
(add-hook 'conda-postdeactivate-hook #'+python|update-version)
|
||||
(add-to-list '+python-mode-line-indicator
|
||||
'(conda-env-current-name
|
||||
(" conda:" conda-env-current-name))
|
||||
'(conda-env-current-name (" conda:" conda-env-current-name))
|
||||
'append))
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
;;; lang/racket/config.el -*- lexical-binding: t; -*-
|
||||
|
||||
(def-package! racket-mode
|
||||
:hook ((racket-mode racket-repl-mode) . racket-unicode-input-method-enable)
|
||||
:hook (racket-repl-mode . racket-unicode-input-method-enable)
|
||||
:config
|
||||
(set-popup-rule! "^\\*Racket REPL" :size 10 :select t)
|
||||
(set-repl-handler! 'racket-mode #'+racket/repl)
|
||||
(set-company-backend! 'racket-mode
|
||||
'(company-abbrev company-dabbrev-code company-dabbrev company-files))
|
||||
(set-lookup-handlers! 'racket-mode
|
||||
:definition #'racket-describe
|
||||
:documentation #'racket-doc)
|
||||
:definition #'racket-visit-definition
|
||||
:documentation #'racket-describe)
|
||||
(set-docset! 'racket-mode "Racket")
|
||||
(set-pretty-symbols! 'racket-mode
|
||||
:lambda "lambda"
|
||||
|
|
@ -29,39 +27,31 @@
|
|||
|
||||
(map! :map racket-mode-map
|
||||
:localleader
|
||||
:n "c" #'racket-run
|
||||
:n "z" #'racket-repl
|
||||
:n "C" #'racket-run-and-switch-to-repl
|
||||
:n "x" #'racket-racket
|
||||
:n "t" #'racket-test
|
||||
:n "a" #'racket-align
|
||||
:n "A" #'racket-unalign
|
||||
:n "f" #'racket-fold-all-tests
|
||||
:n "F" #'racket-unfold-all-tests
|
||||
:n "h" #'racket-doc
|
||||
:n "i" #'racket-unicode-input-method-enable
|
||||
:n "l" #'racket-logger
|
||||
:n "o" #'racket-profile
|
||||
(:desc "eval" :prefix "s"
|
||||
:n "d" #'racket-send-definition
|
||||
:n "l" #'racket-send-last-sexp
|
||||
:n "r" #'racket-send-region)
|
||||
(:desc "macro expand" :prefix "e"
|
||||
:n "p" #'racket-cycle-paren-shapes
|
||||
:n "r" #'racket-run
|
||||
:n "R" #'racket-run-and-switch-to-repl
|
||||
:n "t" #'racket-test
|
||||
:n "u" #'racket-backward-up-list
|
||||
:n "y" #'racket-insert-lambda
|
||||
(:prefix "e"
|
||||
:n "d" #'racket-expand-definition
|
||||
:n "l" #'racket-expand-last-sexp
|
||||
:n "r" #'racket-expand-region
|
||||
:n "a" #'racket-expand-again)
|
||||
:n "r" #'racket-open-require-path
|
||||
:n "TAB" #'indent-for-tab-command
|
||||
:n "u" #'racket-backward-up-list
|
||||
:n "[" #'racket-smart-open-bracket
|
||||
:n ")" #'racket-insert-closing
|
||||
:n "]" #'racket-insert-closing
|
||||
:n "}" #'racket-insert-closing
|
||||
:n "p" #'racket-cycle-paren-shapes
|
||||
:n "y" #'racket-insert-lambda
|
||||
:n "d" #'racket-doc
|
||||
:n "." #'racket-describe
|
||||
:n "M-." #'racket-visit-definition
|
||||
:n "C-." #'racket-visit-module
|
||||
:n "," #'racket-unvisit
|
||||
:n "f" #'racket-fold-all-tests
|
||||
:n "F" #'racket-unfold-all-tests
|
||||
:n "a" #'racket-align
|
||||
:n "A" #'racket-unalign
|
||||
:nv ";" #'comment-dwim
|
||||
:nv "\\" #'indent-region))
|
||||
(:prefix "g"
|
||||
:n "d" #'racket-visit-definition
|
||||
:n "m" #'racket-visit-module
|
||||
:n "r" #'racket-open-require-path
|
||||
:n "b" #'racket-unvisit)
|
||||
(:prefix "s"
|
||||
:n "d" #'racket-send-definition
|
||||
:n "l" #'racket-send-last-sexp
|
||||
:n "r" #'racket-send-region)))
|
||||
|
|
|
|||
28
modules/lang/rest/autoload.el
Normal file
28
modules/lang/rest/autoload.el
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
;;; lang/rest/autoload.el -*- lexical-binding: t; -*-
|
||||
|
||||
(defun +rest-request-at-point-p (&optional pos)
|
||||
(save-excursion
|
||||
(if pos (goto-char pos))
|
||||
(beginning-of-line)
|
||||
(and (re-search-forward restclient-method-url-regexp
|
||||
(line-end-position) t)
|
||||
(not (nth 4 (syntax-ppss))))))
|
||||
|
||||
;;;###autoload
|
||||
(defun +rest/dwim-at-point ()
|
||||
"TODO"
|
||||
(interactive)
|
||||
(when (+rest-request-at-point-p)
|
||||
(restclient-http-send-current-stay-in-window)))
|
||||
|
||||
;;;###autoload
|
||||
(defun +rest/fold-all ()
|
||||
"TODO"
|
||||
(interactive)
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
(let ((last (point)))
|
||||
(while (and (restclient-jump-next)
|
||||
(not (= last (setq last (point)))))
|
||||
(unless (overlays-at (line-end-position))
|
||||
(restclient-toggle-body-visibility))))))
|
||||
|
|
@ -4,12 +4,27 @@
|
|||
:mode ("\\.http\\'" . restclient-mode)
|
||||
:config
|
||||
(set-popup-rule! "^\\*HTTP Response" :size 0.4 :quit 'other)
|
||||
|
||||
;; line numbers aren't enabled by default in fundamental-mode-derived modes
|
||||
(add-hook 'restclient-mode-hook #'doom|enable-line-numbers)
|
||||
|
||||
;; Forces underlying SSL verification to prompt for self-signed or invalid
|
||||
;; certs, rather than silently reject them.
|
||||
(defun +rest*permit-self-signed-ssl (orig-fn &rest args)
|
||||
(let (gnutls-verify-error tls-checktrust)
|
||||
(apply orig-fn args)))
|
||||
(advice-add #'restclient-http-do :around #'+rest*permit-self-signed-ssl)
|
||||
|
||||
(map! :mode restclient-mode
|
||||
:n [M-return] 'restclient-http-send-current
|
||||
:n [return] #'+rest/dwim-at-point
|
||||
:n "za" #'restclient-toggle-body-visibility
|
||||
:n "zm" #'+rest/fold-all
|
||||
:n "zr" #'outline-show-all
|
||||
|
||||
:localleader
|
||||
:desc "Execute HTTP request" :n "e" 'restclient-http-send-current
|
||||
:desc "Execute raw HTTP request" :n "E" 'restclient-http-send-current-raw
|
||||
:desc "Copy curl command" :n "c" 'restclient-copy-curl-command))
|
||||
:desc "Execute HTTP request" :n "e" #'restclient-http-send-current
|
||||
:desc "Execute raw HTTP request" :n "E" #'restclient-http-send-current-raw
|
||||
:desc "Copy curl command" :n "c" #'restclient-copy-curl-command))
|
||||
|
||||
|
||||
(def-package! company-restclient
|
||||
|
|
|
|||
|
|
@ -78,8 +78,8 @@
|
|||
(("task" "namespace") () "end")))
|
||||
|
||||
(unless (featurep! :feature evil)
|
||||
(setq rspec-verifiable-mode-keymap (make-sparse-keymap) "TODO")
|
||||
(setq rspec-mode-keymap (make-sparse-keymap) "TODO"))
|
||||
(setq rspec-verifiable-mode-keymap (make-sparse-keymap)
|
||||
rspec-mode-keymap (make-sparse-keymap)))
|
||||
|
||||
(defun +ruby*init-appropriate-rspec-mode ()
|
||||
"TODO"
|
||||
|
|
|
|||
|
|
@ -38,7 +38,11 @@
|
|||
(cl-loop for pair in (cdr alist)
|
||||
unless (string-match-p "^[a-z-]" (cdr pair))
|
||||
collect (cons (car pair)
|
||||
(string-trim-right (cdr pair) "\\(?:>\\|]\\|}\\)+")))))
|
||||
;; TODO Replace with `string-trim-right' (Emacs 26+)
|
||||
(let ((string (cdr pair)))
|
||||
(if (string-match "\\(?:>\\|]\\|}\\)+\\'" string)
|
||||
(replace-match "" t t string)
|
||||
string))))))
|
||||
(setf (alist-get nil web-mode-engines-auto-pairs) nil))
|
||||
|
||||
(map! :map web-mode-map
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue