PRAISE BE TO THE BYTE COMPILER FOR THY SHARP QUOTES
This commit is contained in:
Henrik Lissner
parent
ef88d30b73
commit
5ae94b765c
79 changed files with 798 additions and 795 deletions
|
|
@ -30,18 +30,18 @@
|
|||
(setq c-tab-always-indent nil
|
||||
c-electric-flag nil)
|
||||
|
||||
(add-hook 'c-mode-common-hook 'rainbow-delimiters-mode)
|
||||
(add-hook 'c-mode-common-hook #'rainbow-delimiters-mode)
|
||||
;; extra highlights for numbers in C (`modern-cpp-font-lock' offers something better for C++)
|
||||
(add-hook 'c-mode-hook 'highlight-numbers-mode)
|
||||
(add-hook 'c-mode-hook #'highlight-numbers-mode)
|
||||
;; Fontification of C++11 string literals
|
||||
(add-hook 'c++-mode-hook '+cc|extra-fontify-c++)
|
||||
(add-hook 'c++-mode-hook #'+cc|extra-fontify-c++)
|
||||
|
||||
(set! :electric '(c-mode c++-mode objc-mode java-mode)
|
||||
:chars '(?\n ?\}))
|
||||
|
||||
(set! :company-backend
|
||||
'(c-mode c++-mode objc-mode)
|
||||
'(company-irony-c-headers company-irony))
|
||||
#'(company-irony-c-headers company-irony))
|
||||
|
||||
(sp-with-modes '(c-mode c++-mode objc-mode java-mode)
|
||||
(sp-local-pair "<" ">" :when '(+cc-sp-point-is-template-p +cc-sp-point-after-include-p))
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
(sp-local-pair "/*!" "*/" :post-handlers '(("||\n[i]" "RET") ("[d-1]< | " "SPC"))))
|
||||
|
||||
;; Improve indentation of inline lambdas in C++11
|
||||
(advice-add 'c-lineup-arglist :around '+c-lineup-arglist)
|
||||
(advice-add #'c-lineup-arglist :around #'+c-lineup-arglist)
|
||||
|
||||
;; C/C++ style settings
|
||||
(c-toggle-electric-state -1)
|
||||
|
|
@ -73,23 +73,23 @@
|
|||
(looking-at "typedef struct"))
|
||||
'+
|
||||
'++))))
|
||||
(c-set-offset 'inclass '+cc--c-lineup-inclass)
|
||||
(c-set-offset 'inclass #'+cc--c-lineup-inclass)
|
||||
|
||||
|
||||
;; Certain mappings interfere with smartparens and custom bindings,
|
||||
;; so unbind them
|
||||
(map! :map c-mode-map
|
||||
"DEL" nil
|
||||
"#" 'self-insert-command
|
||||
"{" 'self-insert-command
|
||||
"}" 'self-insert-command
|
||||
"/" 'self-insert-command
|
||||
"*" 'self-insert-command
|
||||
";" 'self-insert-command
|
||||
"," 'self-insert-command
|
||||
":" 'self-insert-command
|
||||
"(" 'self-insert-command
|
||||
")" 'self-insert-command
|
||||
"#" #'self-insert-command
|
||||
"{" #'self-insert-command
|
||||
"}" #'self-insert-command
|
||||
"/" #'self-insert-command
|
||||
"*" #'self-insert-command
|
||||
";" #'self-insert-command
|
||||
"," #'self-insert-command
|
||||
":" #'self-insert-command
|
||||
"(" #'self-insert-command
|
||||
")" #'self-insert-command
|
||||
|
||||
:map c++-mode-map
|
||||
"}" nil
|
||||
|
|
@ -100,27 +100,27 @@
|
|||
;; ourselves.
|
||||
"<" nil
|
||||
:map (c-mode-base-map c++-mode-map)
|
||||
:i ">" '+cc/autoclose->-maybe))
|
||||
:i ">" #'+cc/autoclose->-maybe))
|
||||
|
||||
|
||||
(def-package! modern-cpp-font-lock
|
||||
:commands modern-c++-font-lock-mode
|
||||
:init (add-hook 'c++-mode-hook 'modern-c++-font-lock-mode))
|
||||
:init (add-hook 'c++-mode-hook #'modern-c++-font-lock-mode))
|
||||
|
||||
|
||||
(def-package! irony
|
||||
:after cc-mode
|
||||
:init (add-hook 'c-mode-common-hook 'irony-mode)
|
||||
:init (add-hook 'c-mode-common-hook #'irony-mode)
|
||||
:config
|
||||
(setq irony-server-install-prefix (concat doom-etc-dir "irony-server/"))
|
||||
(add-hook! 'irony-mode-hook '(irony-eldoc flycheck-mode))
|
||||
(add-hook! 'irony-mode-hook #'(irony-eldoc flycheck-mode))
|
||||
(add-hook! 'c++-mode-hook
|
||||
(make-local-variable 'irony-additional-clang-options)
|
||||
(push "-std=c++11" irony-additional-clang-options))
|
||||
|
||||
(map! :map irony-mode-map
|
||||
[remap completion-at-point] 'counsel-irony
|
||||
[remap complete-symbol] 'counsel-irony))
|
||||
[remap completion-at-point] #'counsel-irony
|
||||
[remap complete-symbol] #'counsel-irony))
|
||||
|
||||
(def-package! irony-eldoc :after irony)
|
||||
|
||||
|
|
@ -166,4 +166,4 @@
|
|||
|
||||
(def-package! demangle-mode
|
||||
:commands demangle-mode
|
||||
:init (add-hook 'llvm-mode-hook 'demangle-mode))
|
||||
:init (add-hook 'llvm-mode-hook #'demangle-mode))
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
(def-package! csharp-mode
|
||||
:mode "\\.cs$"
|
||||
:init (add-hook 'csharp-mode-hook 'flycheck-mode))
|
||||
:init (add-hook 'csharp-mode-hook #'flycheck-mode))
|
||||
|
||||
|
||||
(def-package! omnisharp
|
||||
|
|
@ -12,34 +12,34 @@
|
|||
omnisharp-server-executable-path (concat doom-local-dir "OmniSharp.exe"))
|
||||
:when (file-exists-p omnisharp-server-executable-path)
|
||||
:init
|
||||
(add-hook! csharp-mode '(eldoc-mode omnisharp-mode))
|
||||
(add-hook! csharp-mode #'(eldoc-mode omnisharp-mode))
|
||||
:config
|
||||
(set! :company-backend 'csharp-mode '(company-omnisharp))
|
||||
|
||||
;; Map all refactor commands (see emr)
|
||||
(map! :map omnisharp-mode-map
|
||||
:m "gd" 'omnisharp-go-to-definition
|
||||
:m "gd" #'omnisharp-go-to-definition
|
||||
|
||||
(:localleader
|
||||
:n "b" 'omnisharp-recompile
|
||||
:n "b" #'omnisharp-recompile
|
||||
|
||||
(:prefix "r"
|
||||
:n "i" 'omnisharp-fix-code-issue-at-point
|
||||
:n "u" 'omnisharp-fix-usings
|
||||
:n "r" 'omnisharp-rename
|
||||
:n "a" 'omnisharp-show-last-auto-complete-result
|
||||
:n "o" 'omnisharp-show-overloads-at-point)
|
||||
:n "i" #'omnisharp-fix-code-issue-at-point
|
||||
:n "u" #'omnisharp-fix-usings
|
||||
:n "r" #'omnisharp-rename
|
||||
:n "a" #'omnisharp-show-last-auto-complete-result
|
||||
:n "o" #'omnisharp-show-overloads-at-point)
|
||||
|
||||
(:prefix "f"
|
||||
:n "u" 'omnisharp-find-usages
|
||||
:n "i" 'omnisharp-find-implementations
|
||||
:n "f" 'omnisharp-navigate-to-current-file-member
|
||||
:n "m" 'omnisharp-navigate-to-solution-member
|
||||
:n "M" 'omnisharp-navigate-to-solution-file-then-file-member
|
||||
:n "F" 'omnisharp-navigate-to-solution-file
|
||||
:n "r" 'omnisharp-navigate-to-region
|
||||
:n "ti" 'omnisharp-current-type-information
|
||||
:n "td" 'omnisharp-current-type-documentation)
|
||||
:n "u" #'omnisharp-find-usages
|
||||
:n "i" #'omnisharp-find-implementations
|
||||
:n "f" #'omnisharp-navigate-to-current-file-member
|
||||
:n "m" #'omnisharp-navigate-to-solution-member
|
||||
:n "M" #'omnisharp-navigate-to-solution-file-then-file-member
|
||||
:n "F" #'omnisharp-navigate-to-solution-file
|
||||
:n "r" #'omnisharp-navigate-to-region
|
||||
:n "ti" #'omnisharp-current-type-information
|
||||
:n "td" #'omnisharp-current-type-documentation)
|
||||
|
||||
(:prefix "t"
|
||||
:n "r" (λ! (omnisharp-unit-test "fixture"))
|
||||
|
|
|
|||
|
|
@ -3,10 +3,10 @@
|
|||
(def-package! elisp-mode ; built-in
|
||||
:mode ("/Cask$" . emacs-lisp-mode)
|
||||
:init
|
||||
(add-hook 'emacs-lisp-mode-hook '+emacs-lisp|hook)
|
||||
(add-hook 'emacs-lisp-mode-hook #'+emacs-lisp|hook)
|
||||
|
||||
:config
|
||||
(set! :repl 'emacs-lisp-mode '+emacs-lisp/repl)
|
||||
(set! :repl 'emacs-lisp-mode #'+emacs-lisp/repl)
|
||||
(set! :rotate 'emacs-lisp-mode
|
||||
:symbols '(("t" "nil")
|
||||
("let" "let*")
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
(defun +emacs-lisp|hook ()
|
||||
(setq mode-name "Elisp") ; [pedantry intensifies]
|
||||
(add-hook 'before-save-hook 'delete-trailing-whitespace nil t)
|
||||
(add-hook 'before-save-hook #'delete-trailing-whitespace nil t)
|
||||
|
||||
(eldoc-mode +1)
|
||||
(highlight-quoted-mode +1)
|
||||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
(font-lock-add-keywords
|
||||
nil `(;; Display "lambda" as λ
|
||||
("(\\(lambda\\)" (1 (ignore (compose-region (match-beginning 1) (match-end 1) ?λ 'decompose-region))))
|
||||
("(\\(lambda\\)" (1 (ignore (compose-region (match-beginning 1) (match-end 1) ?λ #'decompose-region))))
|
||||
;; Highlight doom/module functions
|
||||
("\\(^\\|\\s-\\|,\\)(\\(\\(doom\\|\\+\\)[^) ]+\\)[) \n]" (2 font-lock-builtin-face))))
|
||||
|
||||
|
|
@ -67,7 +67,7 @@ version is loaded."
|
|||
(let ((buffer-path (file-truename buffer-file-name)))
|
||||
(when (assoc buffer-path load-history)
|
||||
(load-file buffer-path)))))
|
||||
(advice-add 'auto-compile-byte-compile :filter-return '+emacs-lisp*load-after-compile))
|
||||
(advice-add #'auto-compile-byte-compile :filter-return #'+emacs-lisp*load-after-compile))
|
||||
|
||||
|
||||
(def-package! highlight-quoted
|
||||
|
|
|
|||
|
|
@ -4,40 +4,40 @@
|
|||
:mode "\\.go$"
|
||||
:interpreter "go"
|
||||
:init
|
||||
(add-hook 'go-mode-hook 'flycheck-mode)
|
||||
(add-hook! go-mode (add-hook 'before-save-hook 'gofmt-before-save))
|
||||
(add-hook 'go-mode-hook #'flycheck-mode)
|
||||
(add-hook! go-mode (add-hook 'before-save-hook #'gofmt-before-save nil t))
|
||||
:config
|
||||
(set! :build 'go-build 'go-mode '+go/build)
|
||||
(set! :repl 'go-mode 'gorepl-run)
|
||||
(set! :build 'go-build 'go-mode #'+go/build)
|
||||
(set! :repl 'go-mode #'gorepl-run)
|
||||
|
||||
(map! :map go-mode-map
|
||||
:n "gd" 'go-guru-definition
|
||||
:n "gD" 'go-guru-referrers
|
||||
:n "gd" #'go-guru-definition
|
||||
:n "gD" #'go-guru-referrers
|
||||
(:localleader
|
||||
:n "gr" 'go-play-buffer
|
||||
:v "gr" 'go-play-region
|
||||
:n "gr" #'go-play-buffer
|
||||
:v "gr" #'go-play-region
|
||||
(:prefix "f"
|
||||
:n "i" 'go-goto-imports
|
||||
:n "h" 'godoc-at-point
|
||||
:n "d" 'go-guru-describe
|
||||
:n "v" 'go-guru-freevars
|
||||
:n "I" 'go-guru-implements
|
||||
:n "p" 'go-guru-peers
|
||||
:n "r" 'go-guru-referrers
|
||||
:n "t" 'go-guru-pointsto
|
||||
:n "s" 'go-guru-callstack
|
||||
:n "e" 'go-guru-whicherrs
|
||||
:n "c" 'go-guru-callers
|
||||
:n "C" 'go-guru-callees)
|
||||
:n "i" #'go-goto-imports
|
||||
:n "h" #'godoc-at-point
|
||||
:n "d" #'go-guru-describe
|
||||
:n "v" #'go-guru-freevars
|
||||
:n "I" #'go-guru-implements
|
||||
:n "p" #'go-guru-peers
|
||||
:n "r" #'go-guru-referrers
|
||||
:n "t" #'go-guru-pointsto
|
||||
:n "s" #'go-guru-callstack
|
||||
:n "e" #'go-guru-whicherrs
|
||||
:n "c" #'go-guru-callers
|
||||
:n "C" #'go-guru-callees)
|
||||
(:prefix "r"
|
||||
:n "a" 'go-import-add
|
||||
:n "i" 'go-remove-unused-imports
|
||||
:nv "f" 'gofmt)
|
||||
:n "a" #'go-import-add
|
||||
:n "i" #'go-remove-unused-imports
|
||||
:nv "f" #'gofmt)
|
||||
(:prefix "t"
|
||||
:n "r" '+go/test-rerun
|
||||
:n "a" '+go/test-all
|
||||
:n "s" '+go/test-single
|
||||
:n "n" '+go/test-nested))))
|
||||
:n "r" #'+go/test-rerun
|
||||
:n "a" #'+go/test-all
|
||||
:n "s" #'+go/test-single
|
||||
:n "n" #'+go/test-nested))))
|
||||
|
||||
|
||||
(def-package! go-guru
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
(def-package! go-eldoc
|
||||
:commands go-eldoc-setup
|
||||
:init (add-hook 'go-mode-hook 'go-eldoc-setup))
|
||||
:init (add-hook 'go-mode-hook #'go-eldoc-setup))
|
||||
|
||||
|
||||
(def-package! gorepl-mode
|
||||
|
|
|
|||
|
|
@ -12,12 +12,12 @@
|
|||
(load "haskell-mode-autoloads" nil t)
|
||||
|
||||
(set! :popup "*debug:haskell*" :size 20)
|
||||
(set! :repl 'haskell-mode 'switch-to-haskell)
|
||||
(set! :repl 'haskell-mode #'switch-to-haskell)
|
||||
(push ".hi" completion-ignored-extensions)
|
||||
|
||||
(autoload 'switch-to-haskell "inf-haskell" nil t)
|
||||
(after! inf-haskell
|
||||
(map! :map inf-haskell-mode-map "ESC ESC" 'doom/popup-close)))
|
||||
(map! :map inf-haskell-mode-map "ESC ESC" #'doom/popup-close)))
|
||||
|
||||
|
||||
(def-package! dante
|
||||
|
|
@ -25,5 +25,5 @@
|
|||
:config
|
||||
(when (executable-find "cabal")
|
||||
(add-hook! 'haskell-mode-hook
|
||||
'(flycheck-mode dante-mode interactive-haskell-mode))))
|
||||
#'(flycheck-mode dante-mode interactive-haskell-mode))))
|
||||
|
||||
|
|
|
|||
|
|
@ -3,23 +3,23 @@
|
|||
(def-package! meghanada
|
||||
:commands meghanada-mode
|
||||
:init
|
||||
(add-hook! java-mode '(meghanada-mode flycheck-mode))
|
||||
(add-hook! 'java-mode-hook #'(meghanada-mode flycheck-mode))
|
||||
:config
|
||||
(set! :build 'compile-file 'java-mode 'meghanada-compile-file)
|
||||
(set! :build 'compile-project 'java-mode 'meghanada-compile-project)
|
||||
(set! :build 'compile-file 'java-mode #'meghanada-compile-file)
|
||||
(set! :build 'compile-project 'java-mode #'meghanada-compile-project)
|
||||
|
||||
(setq meghanada-server-install-dir (concat doom-etc-dir "meghanada-server/")
|
||||
meghanada-use-company t
|
||||
meghanada-use-flycheck t
|
||||
meghanada-use-auto-start t)
|
||||
|
||||
(map! :map meghanada-mode-map :m "gd" 'meghanada-jump-declaration))
|
||||
(map! :map meghanada-mode-map :m "gd" #'meghanada-jump-declaration))
|
||||
|
||||
|
||||
(def-package! android-mode
|
||||
:commands android-mode
|
||||
:init
|
||||
(add-hook! (java-mode groovy-mode nxml-mode) '+java|android-mode-maybe)
|
||||
(add-hook! (java-mode groovy-mode nxml-mode) #'+java|android-mode-maybe)
|
||||
:config
|
||||
(set! :yas-minor-mode 'android-mode)
|
||||
(set! :company-dict-minor-mode 'android-mode))
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
js2-mode-show-parse-errors nil)
|
||||
|
||||
(add-hook! 'js2-mode-hook
|
||||
'(flycheck-mode highlight-indentation-mode rainbow-delimiters-mode))
|
||||
#'(flycheck-mode highlight-indentation-mode rainbow-delimiters-mode))
|
||||
|
||||
;; Conform switch-case indentation to editorconfig's config
|
||||
(add-hook! 'js2-mode-hook (setq js-switch-indent-offset js-indent-level))
|
||||
|
|
@ -86,11 +86,11 @@
|
|||
|
||||
(def-package! tern
|
||||
:commands tern-mode
|
||||
:init (add-hook 'js2-mode-hook 'tern-mode)
|
||||
:init (add-hook 'js2-mode-hook #'tern-mode)
|
||||
:config
|
||||
;; Fix project detection
|
||||
(defun +javascript*tern-project-dir (&rest _) (doom-project-root))
|
||||
(advice-add 'tern-project-dir :override '+javascript*tern-project-dir))
|
||||
(advice-add #'tern-project-dir :override #'+javascript*tern-project-dir))
|
||||
|
||||
|
||||
(def-package! company-tern
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
(def-package! web-beautify
|
||||
:commands web-beautify-js
|
||||
:init
|
||||
(map! :map* (json-mode js2-mode-map) :n "gQ" 'web-beautify-js))
|
||||
(map! :map* (json-mode js2-mode-map) :n "gQ" #'web-beautify-js))
|
||||
|
||||
|
||||
;;
|
||||
|
|
@ -148,26 +148,26 @@
|
|||
:config
|
||||
(map! :map skewer-mode-map
|
||||
:localleader
|
||||
:n "sE" 'skewer-eval-last-expression
|
||||
:n "se" 'skewer-eval-defun
|
||||
:n "sf" 'skewer-load-buffer))
|
||||
:n "sE" #'skewer-eval-last-expression
|
||||
:n "se" #'skewer-eval-defun
|
||||
:n "sf" #'skewer-load-buffer))
|
||||
|
||||
(def-package! skewer-css-mode ; in skewer-mode
|
||||
(def-package! skewer-css ; in skewer-mode
|
||||
:commands skewer-css-mode
|
||||
:config
|
||||
(map! :map skewer-css-mode-map
|
||||
:localleader
|
||||
:n "se" 'skewer-css-eval-current-declaration
|
||||
:n "sr" 'skewer-css-eval-current-rule
|
||||
:n "sb" 'skewer-css-eval-buffer
|
||||
:n "sc" 'skewer-css-clear-all))
|
||||
:n "se" #'skewer-css-eval-current-declaration
|
||||
:n "sr" #'skewer-css-eval-current-rule
|
||||
:n "sb" #'skewer-css-eval-buffer
|
||||
:n "sc" #'skewer-css-clear-all))
|
||||
|
||||
(def-package! skewer-html-mode ; in skewer-mode
|
||||
(def-package! skewer-html ; in skewer-mode
|
||||
:commands skewer-html-mode
|
||||
:config
|
||||
(map! :map skewer-html-mode-map
|
||||
:localleader
|
||||
:n "se" 'skewer-html-eval-tag))
|
||||
:n "se" #'skewer-html-eval-tag))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@
|
|||
:mode "\\.jl$"
|
||||
:interpreter "julia"
|
||||
:config
|
||||
(set! :repl 'julia-mode '+julia/repl))
|
||||
(set! :repl 'julia-mode #'+julia/repl))
|
||||
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@
|
|||
LaTeX-section-section
|
||||
LaTeX-section-label))
|
||||
|
||||
(add-hook! (latex-mode LaTeX-mode) 'turn-on-auto-fill)
|
||||
(add-hook! LaTeX-mode '(LaTeX-math-mode TeX-source-correlate-mode))
|
||||
(add-hook! (latex-mode LaTeX-mode) #'turn-on-auto-fill)
|
||||
(add-hook! 'LaTeX-mode-hook #'(LaTeX-math-mode TeX-source-correlate-mode))
|
||||
|
||||
(set! :popup " output\\*$" :regexp t :size 15 :noselect t :autoclose t :autokill t)
|
||||
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
reftex-default-bibliography (list +latex-bibtex-default-file)
|
||||
reftex-toc-split-windows-fraction 0.2)
|
||||
|
||||
(add-hook! (latex-mode LaTeX-mode) 'turn-on-reftex)
|
||||
(add-hook! (latex-mode LaTeX-mode) #'turn-on-reftex)
|
||||
|
||||
:config
|
||||
(map! :map reftex-mode-map
|
||||
|
|
@ -59,10 +59,10 @@
|
|||
(add-hook! 'reftex-toc-mode-hook
|
||||
(reftex-toc-rescan)
|
||||
(doom-hide-modeline-mode +1)
|
||||
(map! :Le "j" 'next-line
|
||||
:Le "k" 'previous-line
|
||||
:Le "q" 'kill-buffer-and-window
|
||||
:Le "ESC" 'kill-buffer-and-window)))
|
||||
(map! :Le "j" #'next-line
|
||||
:Le "k" #'previous-line
|
||||
:Le "q" #'kill-buffer-and-window
|
||||
:Le "ESC" #'kill-buffer-and-window)))
|
||||
|
||||
|
||||
(def-package! bibtex ; built-in
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
bibtex-text-indentation 20
|
||||
bibtex-completion-bibliography (list +latex-bibtex-default-file))
|
||||
|
||||
(map! :map bibtex-mode-map "C-c \\" 'bibtex-fill-entry))
|
||||
(map! :map bibtex-mode-map "C-c \\" #'bibtex-fill-entry))
|
||||
|
||||
(def-package! ivy-bibtex
|
||||
:when (featurep! :completion ivy)
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
:mode "\\.lua$"
|
||||
:interpreter "lua"
|
||||
:init
|
||||
(add-hook 'lua-mode-hook 'flycheck-mode)
|
||||
(add-hook 'lua-mode-hook #'flycheck-mode)
|
||||
:config
|
||||
(set! :electric 'lua-mode :words '("else" "end"))
|
||||
(set! :repl 'lua-mode '+lua/repl)
|
||||
(set! :repl 'lua-mode #'+lua/repl)
|
||||
|
||||
;; sp's lua-specific rules are obnoxious, so we disable them
|
||||
(setq sp-pairs (delete (assq 'lua-mode sp-pairs) sp-pairs)))
|
||||
|
|
|
|||
|
|
@ -21,35 +21,35 @@
|
|||
"\`\`\`" "\`\`\`" :post-handlers '(("||\n" "RET")))
|
||||
|
||||
(map! :map gfm-mode-map
|
||||
"`" 'self-insert-command
|
||||
"`" #'self-insert-command
|
||||
|
||||
:map markdown-mode-map
|
||||
"<backspace>" nil
|
||||
"<M-left>" nil
|
||||
"<M-right>" nil
|
||||
"M-*" 'markdown-insert-list-item
|
||||
"M-b" 'markdown-insert-bold
|
||||
"M-i" 'markdown-insert-italic
|
||||
"M-`" '+markdown/insert-del
|
||||
:m "gj" 'markdown-next-visible-heading
|
||||
:m "gk" 'markdown-previous-visible-heading
|
||||
"M-*" #'markdown-insert-list-item
|
||||
"M-b" #'markdown-insert-bold
|
||||
"M-i" #'markdown-insert-italic
|
||||
"M-`" #'+markdown/insert-del
|
||||
:m "gj" #'markdown-next-visible-heading
|
||||
:m "gk" #'markdown-previous-visible-heading
|
||||
;; Assumes you have a markdown renderer plugin in chrome
|
||||
:n "M-r" 'browse-url-of-file
|
||||
:n "M-r" #'browse-url-of-file
|
||||
;; TODO: Make context sensitive
|
||||
:n "[p" 'markdown-promote
|
||||
:n "]p" 'markdown-demote
|
||||
:n "[l" 'markdown-next-link
|
||||
:n "]l" 'markdown-previous-link
|
||||
:n "gf" 'markdown-follow-thing-at-point
|
||||
:i "M--" 'markdown-insert-hr
|
||||
:n "[p" #'markdown-promote
|
||||
:n "]p" #'markdown-demote
|
||||
:n "[l" #'markdown-next-link
|
||||
:n "]l" #'markdown-previous-link
|
||||
:n "gf" #'markdown-follow-thing-at-point
|
||||
:i "M--" #'markdown-insert-hr
|
||||
(:localleader
|
||||
:nv "o" 'markdown-open
|
||||
:nv "b" 'markdown-preview
|
||||
(:prefix "i"
|
||||
:nv "t" 'markdown-toc-generate-toc
|
||||
:nv "i" 'markdown-insert-image
|
||||
:nv "l" 'markdown-insert-link
|
||||
:nv "L" 'markdown-insert-reference-link-dwim))))
|
||||
:nv "o" #'markdown-open
|
||||
:nv "b" #'markdown-preview
|
||||
(:prefix "i"
|
||||
:nv "t" #'markdown-toc-generate-toc
|
||||
:nv "i" #'markdown-insert-image
|
||||
:nv "l" #'markdown-insert-link
|
||||
:nv "L" #'markdown-insert-reference-link-dwim))))
|
||||
|
||||
|
||||
(def-package! markdown-toc
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
(def-package! octave
|
||||
:mode (("\\.m$" . octave-mode))
|
||||
:commands (octave-mode run-octave)
|
||||
:config (set! :repl 'octave-mode 'run-octave))
|
||||
:config (set! :repl 'octave-mode #'run-octave))
|
||||
|
||||
;; (use-package ac-octave
|
||||
;; :config
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
(IS-LINUX "maim --opengl -s %s")))
|
||||
|
||||
;; Write download paths relative to current file
|
||||
(advice-add 'org-download--dir-2 :override 'ignore)
|
||||
(advice-add #'org-download--dir-2 :override #'ignore)
|
||||
(defun +org*download-fullname (path)
|
||||
(file-relative-name path (file-name-directory (buffer-file-name))))
|
||||
(advice-add 'org-download--fullname :filter-return '+org*download-fullname)
|
||||
(advice-add #'org-download--fullname :filter-return #'+org*download-fullname)
|
||||
|
||||
;; Add another drag-and-drop handler that will handle anything but image files
|
||||
(setq dnd-protocol-alist `(("^\\(https?\\|ftp\\|file\\|nfs\\):\\(//\\)?" . doom/org-download-dnd)
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@
|
|||
(when (equal "org-capture" (frame-parameter nil 'name))
|
||||
(setq mode-line-format nil)
|
||||
(delete-other-windows)))
|
||||
(advice-add 'org-capture :after '+org*capture-init)
|
||||
(advice-add #'org-capture :after #'+org*capture-init)
|
||||
|
||||
(defun +org|capture-finalize ()
|
||||
"Closes the frame once org-capture is done."
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
(unless (nth 2 args)
|
||||
(setq args (append args (list org-export-directory))))
|
||||
args)
|
||||
(advice-add 'org-export-output-file-name :filter-args '+org*export-output-file-name)
|
||||
(advice-add #'org-export-output-file-name :filter-args #'+org*export-output-file-name)
|
||||
|
||||
;; (require 'ox-pandoc)
|
||||
;; (setq org-pandoc-options '((standalone . t) (mathjax . t) (parse-raw . t)))
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
(defvar +org-init-hook nil
|
||||
"TODO")
|
||||
|
||||
(add-hook 'org-load-hook '+org|init)
|
||||
(add-hook 'org-mode-hook '+org|hook)
|
||||
(add-hook 'org-load-hook #'+org|init)
|
||||
(add-hook 'org-mode-hook #'+org|hook)
|
||||
|
||||
;; Custom variables
|
||||
(defvar +org-dir (expand-file-name "~/work/org/")
|
||||
|
|
@ -58,15 +58,15 @@
|
|||
(defun +org|realign-table-maybe ()
|
||||
(when (org-at-table-p)
|
||||
(org-table-align)))
|
||||
(add-hook 'evil-insert-state-exit-hook '+org|realign-table-maybe nil t)
|
||||
(add-hook 'evil-insert-state-exit-hook #'+org|realign-table-maybe nil t)
|
||||
|
||||
(defun +org|update-cookies ()
|
||||
"Update counts on headlines (\"cookies\")."
|
||||
(when (and buffer-file-name (file-exists-p buffer-file-name))
|
||||
(org-update-statistics-cookies t)))
|
||||
|
||||
(add-hook 'before-save-hook '+org|update-cookies nil t)
|
||||
(add-hook 'evil-insert-state-exit-hook '+org|update-cookies nil t))
|
||||
(add-hook 'before-save-hook #'+org|update-cookies nil t)
|
||||
(add-hook 'evil-insert-state-exit-hook #'+org|update-cookies nil t))
|
||||
|
||||
|
||||
(defun +org|init ()
|
||||
|
|
@ -199,44 +199,44 @@
|
|||
"RET" nil
|
||||
"C-j" nil
|
||||
"C-k" nil
|
||||
:i [remap doom/inflate-space-maybe] 'org-self-insert-command
|
||||
:i "RET" 'org-return-indent)
|
||||
:i [remap doom/inflate-space-maybe] #'org-self-insert-command
|
||||
:i "RET" #'org-return-indent)
|
||||
|
||||
(:map evil-org-mode-map
|
||||
:n "RET" '+org/dwim-at-point
|
||||
:n "RET" #'+org/dwim-at-point
|
||||
;;
|
||||
:ni "A-L" 'org-shiftmetaright
|
||||
:ni "A-H" 'org-shiftmetaleft
|
||||
:ni "A-K" 'org-shiftmetaup
|
||||
:ni "A-J" 'org-shiftmetadown
|
||||
:ni "A-L" #'org-shiftmetaright
|
||||
:ni "A-H" #'org-shiftmetaleft
|
||||
:ni "A-K" #'org-shiftmetaup
|
||||
:ni "A-J" #'org-shiftmetadown
|
||||
;; Expand tables (or shiftmeta move)
|
||||
:ni "C-S-l" '+org/table-append-field-or-shift-right
|
||||
:ni "C-S-h" '+org/table-prepend-field-or-shift-left
|
||||
:ni "C-S-k" '+org/table-prepend-row-or-shift-up
|
||||
:ni "C-S-j" '+org/table-append-row-or-shift-down
|
||||
:ni "C-S-l" #'+org/table-append-field-or-shift-right
|
||||
:ni "C-S-h" #'+org/table-prepend-field-or-shift-left
|
||||
:ni "C-S-k" #'+org/table-prepend-row-or-shift-up
|
||||
:ni "C-S-j" #'+org/table-append-row-or-shift-down
|
||||
;; Navigate table cells
|
||||
:i "C-L" '+org/table-next-field
|
||||
:i "C-H" '+org/table-previous-field
|
||||
:i "C-K" '+org/table-previous-row
|
||||
:i "C-J" '+org/table-next-row
|
||||
:i "C-L" #'+org/table-next-field
|
||||
:i "C-H" #'+org/table-previous-field
|
||||
:i "C-K" #'+org/table-previous-row
|
||||
:i "C-J" #'+org/table-next-row
|
||||
|
||||
:i "C-e" 'org-end-of-line
|
||||
:i "C-a" 'org-beginning-of-line
|
||||
:i "C-e" #'org-end-of-line
|
||||
:i "C-a" #'org-beginning-of-line
|
||||
|
||||
:i "<tab>" '+org/indent-or-next-field-or-yas-expand
|
||||
:i [S-iso-lefttab] '+org/dedent-or-prev-field ; for GNU Emacs
|
||||
:i [(shift tab)] '+org/dedent-or-prev-field
|
||||
:i [backtab] '+org/dedent-or-prev-field
|
||||
:i "<tab>" #'+org/indent-or-next-field-or-yas-expand
|
||||
:i [S-iso-lefttab] #'+org/dedent-or-prev-field ; for GNU Emacs
|
||||
:i [(shift tab)] #'+org/dedent-or-prev-field
|
||||
:i [backtab] #'+org/dedent-or-prev-field
|
||||
|
||||
:n "<tab>" '+org/toggle-fold
|
||||
:n "<tab>" #'+org/toggle-fold
|
||||
|
||||
:nv "j" 'evil-next-visual-line
|
||||
:nv "k" 'evil-previous-visual-line
|
||||
:v "<S-tab>" '+snippets/expand-on-region
|
||||
:nv "j" #'evil-next-visual-line
|
||||
:nv "k" #'evil-previous-visual-line
|
||||
:v "<S-tab>" #'+snippets/expand-on-region
|
||||
|
||||
:i "M-a" (λ! (evil-visual-state) (org-mark-element))
|
||||
:n "M-a" 'org-mark-element
|
||||
:v "M-a" 'mark-whole-buffer
|
||||
:n "M-a" #'org-mark-element
|
||||
:v "M-a" #'mark-whole-buffer
|
||||
|
||||
:ni "<M-return>" (λ! (+org/insert-item 'below))
|
||||
:ni "<S-M-return>" (λ! (+org/insert-item 'above))
|
||||
|
|
@ -253,75 +253,75 @@
|
|||
:v "M-`" "S+"
|
||||
|
||||
(:localleader
|
||||
:n "RET" 'org-archive-subtree
|
||||
:n "SPC" '+org/toggle-checkbox
|
||||
:n "/" 'org-sparse-tree
|
||||
:n "=" 'org-align-all-tags
|
||||
:n "?" 'org-tags-view
|
||||
:n "a" 'org-agenda
|
||||
:n "d" 'org-time-stamp
|
||||
:n "D" 'org-deadline
|
||||
:n "e" 'org-edit-special
|
||||
:n "E" '+org/edit-special-same-window
|
||||
:n "RET" #'org-archive-subtree
|
||||
:n "SPC" #'+org/toggle-checkbox
|
||||
:n "/" #'org-sparse-tree
|
||||
:n "=" #'org-align-all-tags
|
||||
:n "?" #'org-tags-view
|
||||
:n "a" #'org-agenda
|
||||
:n "d" #'org-time-stamp
|
||||
:n "D" #'org-deadline
|
||||
:n "e" #'org-edit-special
|
||||
:n "E" #'+org/edit-special-same-window
|
||||
:n "n" (λ! (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
|
||||
:n "r" 'org-refile
|
||||
:n "r" #'org-refile
|
||||
:n "R" (λ! (org-metaleft) (org-archive-to-archive-sibling)) ; archive to parent sibling
|
||||
:n "s" 'org-schedule
|
||||
:n "s" #'org-schedule
|
||||
:n "t" (λ! (org-todo (if (org-entry-is-todo-p) 'none 'todo)))
|
||||
:v "t" (λ! (evil-ex-normal evil-visual-beginning evil-visual-end "\\t"))
|
||||
:n "T" 'org-todo
|
||||
:n "v" 'variable-pitch-mode
|
||||
:nv "l" 'org-insert-link
|
||||
:nv "L" 'org-store-link
|
||||
:n "T" #'org-todo
|
||||
:n "v" #'variable-pitch-mode
|
||||
:nv "l" #'org-insert-link
|
||||
:nv "L" #'org-store-link
|
||||
;; :n "w" 'writing-mode
|
||||
;; :n "x" '+org/remove-link
|
||||
)
|
||||
|
||||
;; TODO Improve folding bindings
|
||||
:n "za" '+org/toggle-fold
|
||||
:n "zA" 'org-shifttab
|
||||
:n "zc" 'outline-hide-subtree
|
||||
:n "za" #'+org/toggle-fold
|
||||
:n "zA" #'org-shifttab
|
||||
:n "zc" #'outline-hide-subtree
|
||||
:n "zC" (λ! (outline-hide-sublevels 1))
|
||||
:n "zd" (lambda (&optional arg) (interactive "p") (outline-hide-sublevels (or arg 3)))
|
||||
:n "zm" (λ! (outline-hide-sublevels 1))
|
||||
:n "zo" 'outline-show-subtree
|
||||
:n "zO" 'outline-show-all
|
||||
:n "zr" 'outline-show-all
|
||||
:n "zo" #'outline-show-subtree
|
||||
:n "zO" #'outline-show-all
|
||||
:n "zr" #'outline-show-all
|
||||
|
||||
:m "]]" (λ! (call-interactively 'org-forward-heading-same-level) (org-beginning-of-line))
|
||||
:m "[[" (λ! (call-interactively 'org-backward-heading-same-level) (org-beginning-of-line))
|
||||
:m "]l" 'org-next-link
|
||||
:m "[l" 'org-previous-link
|
||||
:m "]]" (λ! (call-interactively #'org-forward-heading-same-level) (org-beginning-of-line))
|
||||
:m "[[" (λ! (call-interactively #'org-backward-heading-same-level) (org-beginning-of-line))
|
||||
:m "]l" #'org-next-link
|
||||
:m "[l" #'org-previous-link
|
||||
|
||||
:m "gh" 'outline-up-heading
|
||||
:m "gj" 'org-forward-heading-same-level
|
||||
:m "gk" 'org-backward-heading-same-level
|
||||
:m "gl" (λ! (call-interactively 'outline-next-visible-heading) (show-children))
|
||||
:m "gh" #'outline-up-heading
|
||||
:m "gj" #'org-forward-heading-same-level
|
||||
:m "gk" #'org-backward-heading-same-level
|
||||
:m "gl" (λ! (call-interactively #'outline-next-visible-heading) (show-children))
|
||||
|
||||
:n "go" 'org-open-at-point
|
||||
:n "go" #'org-open-at-point
|
||||
:n "gO" (λ! (let ((org-link-frame-setup (append '((file . find-file-other-window)) org-link-frame-setup))
|
||||
(org-file-apps '(("\\.org$" . emacs)
|
||||
(t . "open \"%s\""))))
|
||||
(call-interactively 'org-open-at-point)))
|
||||
(call-interactively #'org-open-at-point)))
|
||||
|
||||
:n "gQ" 'org-fill-paragraph
|
||||
:m "$" 'org-end-of-line
|
||||
:m "^" 'org-beginning-of-line
|
||||
:n "<" 'org-metaleft
|
||||
:n ">" 'org-metaright
|
||||
:n "gQ" #'org-fill-paragraph
|
||||
:m "$" #'org-end-of-line
|
||||
:m "^" #'org-beginning-of-line
|
||||
:n "<" #'org-metaleft
|
||||
:n ">" #'org-metaright
|
||||
:v "<" (λ! (org-metaleft) (evil-visual-restore))
|
||||
:v ">" (λ! (org-metaright) (evil-visual-restore))
|
||||
:n "-" 'org-cycle-list-bullet
|
||||
:m "<tab>" 'org-cycle)
|
||||
:n "-" #'org-cycle-list-bullet
|
||||
:m "<tab>" #'org-cycle)
|
||||
|
||||
(:after org-agenda
|
||||
(:map org-agenda-mode-map
|
||||
:e "<escape>" 'org-agenda-Quit
|
||||
:e "m" 'org-agenda-month-view
|
||||
:e "C-j" 'org-agenda-next-item
|
||||
:e "C-k" 'org-agenda-previous-item
|
||||
:e "C-n" 'org-agenda-next-item
|
||||
:e "C-p" 'org-agenda-previous-item)))
|
||||
:e "<escape>" #'org-agenda-Quit
|
||||
:e "m" #'org-agenda-month-view
|
||||
:e "C-j" #'org-agenda-next-item
|
||||
:e "C-k" #'org-agenda-previous-item
|
||||
:e "C-n" #'org-agenda-next-item
|
||||
:e "C-p" #'org-agenda-previous-item)))
|
||||
|
||||
;; Initialize everything else
|
||||
(run-hooks '+org-init-hook)
|
||||
|
|
@ -341,16 +341,17 @@
|
|||
|
||||
;; Don't clobber recentf with agenda files
|
||||
(defun +org-is-agenda-file (filename)
|
||||
(find (file-truename filename) org-agenda-files :key 'file-truename
|
||||
:test 'equal))
|
||||
(add-to-list 'recentf-exclude '+org-is-agenda-file)
|
||||
(cl-find (file-truename filename) org-agenda-files
|
||||
:key #'file-truename
|
||||
:test #'equal))
|
||||
(add-to-list 'recentf-exclude #'+org-is-agenda-file)
|
||||
|
||||
;; Remove highlights on ESC
|
||||
(defun +org*remove-occur-highlights (&rest args)
|
||||
(when (eq major-mode 'org-mode)
|
||||
(org-remove-occur-highlights)))
|
||||
(advice-add 'evil-force-normal-state :before '+org*remove-occur-highlights)
|
||||
(advice-add #'evil-force-normal-state :before #'+org*remove-occur-highlights)
|
||||
|
||||
;; Don't reset org-hide!
|
||||
(advice-add 'org-find-invisible-foreground :override 'ignore))
|
||||
(advice-add #'org-find-invisible-foreground :override #'ignore))
|
||||
|
||||
|
|
|
|||
|
|
@ -10,11 +10,11 @@
|
|||
:mode ("\\.php[s345]?$" "\\.inc$")
|
||||
:interpreter "php"
|
||||
:init
|
||||
(add-hook 'php-mode-hook 'flycheck-mode)
|
||||
(add-hook 'php-mode-hook #'flycheck-mode)
|
||||
:config
|
||||
(setq php-template-compatibility nil)
|
||||
|
||||
(set! :repl 'php-mode 'php-boris)
|
||||
(set! :repl 'php-mode #'php-boris)
|
||||
|
||||
;; default is 10; this optimizes `smartparens' performance, but limits sp
|
||||
;; pairs to 6 characters.
|
||||
|
|
@ -31,27 +31,27 @@
|
|||
(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)
|
||||
: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)))
|
||||
:n "r" #'phpunit-current-project
|
||||
:n "a" #'phpunit-current-class
|
||||
:n "s" #'phpunit-current-test)))
|
||||
|
||||
|
||||
(def-package! php-extras
|
||||
:after php-mode
|
||||
:init
|
||||
(add-hook 'php-mode-hook 'eldoc-mode)
|
||||
(add-hook 'php-mode-hook #'eldoc-mode)
|
||||
:config
|
||||
(setq php-extras-eldoc-functions-file (concat doom-etc-dir "php-extras-eldoc-functions"))
|
||||
|
||||
(set! :company-bakend 'php-mode '(php-extras-company company-yasnippet))
|
||||
|
||||
;; company will set up itself
|
||||
(advice-add 'php-extras-company-setup :override 'ignore)
|
||||
(advice-add #'php-extras-company-setup :override #'ignore)
|
||||
|
||||
;; Make expensive php-extras generation async
|
||||
(unless (file-exists-p (concat php-extras-eldoc-functions-file ".el"))
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
(def-package! php-refactor-mode
|
||||
:commands php-refactor-mode
|
||||
:init (add-hook 'php-mode-hook 'php-refactor-mode))
|
||||
:init (add-hook 'php-mode-hook #'php-refactor-mode))
|
||||
|
||||
|
||||
(def-package! phpunit
|
||||
|
|
|
|||
|
|
@ -4,9 +4,9 @@
|
|||
:commands (processing-mode processing-find-sketch)
|
||||
:mode "\\.pde$"
|
||||
:init
|
||||
(add-hook 'processing-compilation-mode-hook 'doom-hide-modeline-mode)
|
||||
(add-hook 'processing-compilation-mode-hook #'doom-hide-modeline-mode)
|
||||
:config
|
||||
(set! :build 'build-sketch 'processing-mode 'processing-sketch-build)
|
||||
(set! :build 'build-sketch 'processing-mode #'processing-sketch-build)
|
||||
(set! :popup "*processing-compilation*" :size 10 :noselect t)
|
||||
(set! :eval 'processing-mode
|
||||
'((:command . ,processing-location)
|
||||
|
|
@ -22,17 +22,17 @@
|
|||
processing-output-dir "/tmp")
|
||||
|
||||
(map! :map processing-mode-map
|
||||
:nv "M-r" 'processing-sketch-run
|
||||
:m "gd" 'processing-find-in-reference
|
||||
:nv "M-r" #'processing-sketch-run
|
||||
:m "gd" #'processing-find-in-reference
|
||||
|
||||
(:localleader
|
||||
:n "e" 'processing-export-application
|
||||
:n "h" 'processing-open-reference
|
||||
:n "e" 'processing-open-examples
|
||||
:n "o" 'processing-open-sketchbook
|
||||
:n "e" #'processing-export-application
|
||||
:n "h" #'processing-open-reference
|
||||
:n "e" #'processing-open-examples
|
||||
:n "o" #'processing-open-sketchbook
|
||||
|
||||
:prefix "f"
|
||||
:n "s" 'processing-find-sketch))
|
||||
:n "s" #'processing-find-sketch))
|
||||
|
||||
(after! company-keywords
|
||||
(nconc company-keywords-alist
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@
|
|||
python-shell-completion-string-code
|
||||
"';'.join(get_ipython().Completer.all_completions('''%s'''))\n")
|
||||
|
||||
(add-hook 'python-mode-hook 'flycheck-mode)
|
||||
(add-hook 'python-mode-hook #'flycheck-mode)
|
||||
|
||||
:config
|
||||
(set! :repl 'python-mode '+python/repl)
|
||||
(set! :repl 'python-mode #'+python/repl)
|
||||
(set! :electric 'python-mode :chars '(?:))
|
||||
(define-key python-mode-map (kbd "DEL") nil) ; interferes with smartparens
|
||||
|
||||
|
|
@ -29,17 +29,17 @@
|
|||
(def-package! anaconda-mode
|
||||
:after python
|
||||
:init
|
||||
(add-hook 'python-mode-hook 'anaconda-mode)
|
||||
(add-hook 'anaconda-mode-hook 'anaconda-eldoc-mode)
|
||||
(add-hook 'python-mode-hook #'anaconda-mode)
|
||||
(add-hook 'anaconda-mode-hook #'anaconda-eldoc-mode)
|
||||
(setq anaconda-mode-installation-directory (concat doom-etc-dir "anaconda/")
|
||||
anaconda-mode-eldoc-as-single-line t)
|
||||
|
||||
:config
|
||||
(set! :popup "*anaconda-mode*" :size 10 :noselect t :autoclose t :autokill t)
|
||||
|
||||
(map! :map anaconda-mode-map :m "gd" 'anaconda-mode-find-definitions)
|
||||
(map! :map anaconda-mode-map :m "gd" #'anaconda-mode-find-definitions)
|
||||
|
||||
(advice-add 'anaconda-mode-doc-buffer :after 'doom*anaconda-mode-doc-buffer))
|
||||
(advice-add #'anaconda-mode-doc-buffer :after #'doom*anaconda-mode-doc-buffer))
|
||||
|
||||
|
||||
(def-package! company-anaconda
|
||||
|
|
@ -48,15 +48,15 @@
|
|||
:config
|
||||
(set! :company-backend 'python-mode '(company-anaconda))
|
||||
(map! :map python-mode-map
|
||||
:m "gd" 'anaconda-mode-find-definitions
|
||||
:m "gD" 'anaconda-mode-find-references
|
||||
:m "gd" #'anaconda-mode-find-definitions
|
||||
:m "gD" #'anaconda-mode-find-references
|
||||
:localleader
|
||||
:prefix "f"
|
||||
:nv "d" 'anaconda-mode-find-definitions
|
||||
:nv "h" 'anaconda-mode-show-doc
|
||||
:nv "a" 'anaconda-mode-find-assignments
|
||||
:nv "f" 'anaconda-mode-find-file
|
||||
:nv "u" 'anaconda-mode-find-references))
|
||||
:nv "d" #'anaconda-mode-find-definitions
|
||||
:nv "h" #'anaconda-mode-show-doc
|
||||
:nv "a" #'anaconda-mode-find-assignments
|
||||
:nv "f" #'anaconda-mode-find-file
|
||||
:nv "u" #'anaconda-mode-find-references))
|
||||
|
||||
|
||||
(def-package! pip-requirements
|
||||
|
|
@ -75,11 +75,11 @@
|
|||
(map! :map nose-mode-map
|
||||
:localleader
|
||||
:prefix "t"
|
||||
:n "r" 'nosetests-again
|
||||
:n "a" 'nosetests-all
|
||||
:n "s" 'nosetests-one
|
||||
:n "v" 'nosetests-module
|
||||
:n "A" 'nosetests-pdb-all
|
||||
:n "O" 'nosetests-pdb-one
|
||||
:n "V" 'nosetests-pdb-module))
|
||||
:n "r" #'nosetests-again
|
||||
:n "a" #'nosetests-all
|
||||
:n "s" #'nosetests-one
|
||||
:n "v" #'nosetests-module
|
||||
:n "A" #'nosetests-pdb-all
|
||||
:n "O" #'nosetests-pdb-one
|
||||
:n "V" #'nosetests-pdb-module))
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
"/\\(Gem\\|Cap\\|Vagrant\\|Rake\\|Pod\\|Puppet\\|Berks\\)file$")
|
||||
:interpreter "ruby"
|
||||
:init
|
||||
(add-hook 'ruby-mode-hook 'flycheck-mode)
|
||||
(add-hook 'ruby-mode-hook #'flycheck-mode)
|
||||
:config
|
||||
(set! :company-backend 'ruby-mode '(company-dabbrev-code))
|
||||
(set! :electric 'ruby-mode :words '("else" "end" "elseif"))
|
||||
|
|
@ -16,13 +16,13 @@
|
|||
(map! :map ruby-mode-map
|
||||
:localleader
|
||||
:prefix "r"
|
||||
:nv "b" 'ruby-toggle-block
|
||||
:nv "ec" 'ruby-refactor-extract-constant
|
||||
:nv "el" 'ruby-refactor-extract-to-let
|
||||
:nv "em" 'ruby-refactor-extract-to-method
|
||||
:nv "ev" 'ruby-refactor-extract-local-variable
|
||||
:nv "ad" 'ruby-refactor-add-parameter
|
||||
:nv "cc" 'ruby-refactor-convert-post-conditional))
|
||||
:nv "b" #'ruby-toggle-block
|
||||
:nv "ec" #'ruby-refactor-extract-constant
|
||||
:nv "el" #'ruby-refactor-extract-to-let
|
||||
:nv "em" #'ruby-refactor-extract-to-method
|
||||
:nv "ev" #'ruby-refactor-extract-local-variable
|
||||
:nv "ad" #'ruby-refactor-add-parameter
|
||||
:nv "cc" #'ruby-refactor-convert-post-conditional))
|
||||
|
||||
|
||||
(def-package! ruby-refactor
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
;; Highlight doc comments
|
||||
(def-package! yard-mode
|
||||
:commands yard-mode
|
||||
:init (add-hook 'ruby-mode-hook 'yard-mode))
|
||||
:init (add-hook 'ruby-mode-hook #'yard-mode))
|
||||
|
||||
|
||||
(def-package! rspec-mode
|
||||
|
|
@ -55,10 +55,10 @@
|
|||
(map! :map rspec-mode-map
|
||||
:localleader
|
||||
:prefix "t"
|
||||
:n "r" 'rspec-rerun
|
||||
:n "a" 'rspec-verify-all
|
||||
:n "s" 'rspec-verify-single
|
||||
:n "v" 'rspec-verify))
|
||||
:n "r" #'rspec-rerun
|
||||
:n "a" #'rspec-verify-all
|
||||
:n "s" #'rspec-verify-single
|
||||
:n "v" #'rspec-verify))
|
||||
|
||||
|
||||
(def-package! inf-ruby
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
(def-package! rust-mode
|
||||
:mode "\\.rs$"
|
||||
:init
|
||||
(add-hook 'rust-mode-hook 'flycheck-mode)
|
||||
(add-hook 'rust-mode-hook #'flycheck-mode)
|
||||
:config
|
||||
(set! :build 'run-cargo '(rust-mode toml-mode) '+rust/run-cargo
|
||||
:when '+rust-cargo-project-p))
|
||||
(set! :build 'run-cargo '(rust-mode toml-mode) #'+rust/run-cargo
|
||||
:when #'+rust-cargo-project-p))
|
||||
|
||||
|
||||
(def-package! racer
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
racer-rust-src-path (expand-file-name "rust/src/" +rust-ext-dir))
|
||||
|
||||
;; TODO Unit test keybinds
|
||||
(map! :map rust-mode-map :m "gd" 'racer-find-definition))
|
||||
(map! :map rust-mode-map :m "gd" #'racer-find-definition))
|
||||
|
||||
|
||||
(def-package! company-racer
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
(def-package! scala-mode
|
||||
:mode "\\.s\\(cala\\|bt\\)$"
|
||||
:init
|
||||
(add-hook 'scala-mode-hook 'eldoc-mode)
|
||||
(add-hook 'scala-mode-hook #'eldoc-mode)
|
||||
:config
|
||||
(set! :company-backend 'scala-mode '(ensime-company (company-yasnippet))))
|
||||
|
||||
|
|
@ -14,5 +14,5 @@
|
|||
(def-package! ensime
|
||||
:commands (ensime ensime-mode ensime-scala-mode-hook)
|
||||
:init
|
||||
(add-hook 'scala-mode-hook 'ensime-scala-mode-hook))
|
||||
(add-hook 'scala-mode-hook #'ensime-scala-mode-hook))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
:mode (("\\.zsh$" . sh-mode)
|
||||
("/bspwmrc$" . sh-mode))
|
||||
:init
|
||||
(add-hook! sh-mode '(flycheck-mode highlight-numbers-mode +sh|extra-fontify))
|
||||
(add-hook! sh-mode #'(flycheck-mode highlight-numbers-mode +sh|extra-fontify))
|
||||
:config
|
||||
(set! :electric 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
|
||||
(set! :repl 'sh-mode '+sh/repl)
|
||||
(set! :repl 'sh-mode #'+sh/repl)
|
||||
(setq sh-indent-after-continuation 'always)
|
||||
|
||||
;; [pedantry intensifies]
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
(defun +sh|detect-zsh ()
|
||||
(when (and buffer-file-name (string-match-p "\\.zsh\\'" buffer-file-name))
|
||||
(sh-set-shell "zsh")))
|
||||
(add-hook 'sh-mode-hook '+sh|detect-zsh))
|
||||
(add-hook 'sh-mode-hook #'+sh|detect-zsh))
|
||||
|
||||
|
||||
(def-package! company-shell
|
||||
|
|
|
|||
|
|
@ -5,9 +5,9 @@
|
|||
(def-package! swift-mode
|
||||
:mode "\\.swift$"
|
||||
:init
|
||||
(add-hook 'swift-mode-hook 'flycheck-mode)
|
||||
(add-hook 'swift-mode-hook #'flycheck-mode)
|
||||
:config
|
||||
(set! :repl 'swift-mode 'swift-mode-run-repl) ; TODO test this
|
||||
(set! :repl 'swift-mode #'swift-mode-run-repl) ; TODO test this
|
||||
(push 'swift flycheck-checkers))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
(def-package! typescript-mode
|
||||
:mode "\\.ts$"
|
||||
:init
|
||||
(add-hook 'typescript-mode-hook 'rainbow-delimiters-mode)
|
||||
(add-hook 'typescript-mode-hook #'rainbow-delimiters-mode)
|
||||
:config
|
||||
(set! :electric 'typescript-mode :chars '(?\} ?\)) :words '("||" "&&"))
|
||||
|
||||
|
|
@ -25,14 +25,14 @@
|
|||
(tide-setup)
|
||||
(flycheck-mode +1)
|
||||
(eldoc-mode +1)))
|
||||
(add-hook! (typescript-mode web-mode) '+typescript|tide-setup)
|
||||
(add-hook! (typescript-mode web-mode) #'+typescript|tide-setup)
|
||||
|
||||
(advice-add 'tide-project-root :override 'doom-project-root)
|
||||
(advice-add #'tide-project-root :override #'doom-project-root)
|
||||
|
||||
(map! :map typescript-mode-map
|
||||
:m "gd" 'tide-jump-to-definition
|
||||
:m "gd" #'tide-jump-to-definition
|
||||
:localleader
|
||||
:m "fh" 'tide-documentation-at-point))
|
||||
:m "fh" #'tide-documentation-at-point))
|
||||
|
||||
|
||||
(def-package! tide
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; lang/web/+css.el
|
||||
|
||||
;; css-mode hooks apply to scss and less-css modes
|
||||
(add-hook 'css-mode-hook 'rainbow-delimiters-mode)
|
||||
(add-hook 'css-mode-hook #'rainbow-delimiters-mode)
|
||||
(add-hook! (css-mode sass-mode)
|
||||
'(yas-minor-mode-on flycheck-mode highlight-numbers-mode))
|
||||
#'(yas-minor-mode-on flycheck-mode highlight-numbers-mode))
|
||||
|
||||
(sp-with-modes '(css-mode scss-mode less-css-mode stylus-mode)
|
||||
(sp-local-pair "/*" "*/" :post-handlers '(("[d-3]||\n[i]" "RET") ("| " "SPC"))))
|
||||
|
||||
(map! :map* (css-mode-map scss-mode-map less-css-mode-map)
|
||||
:n "M-R" '+css/web-refresh-browser
|
||||
:n "M-R" #'+css/web-refresh-browser
|
||||
(:localleader
|
||||
:n "rb" '+css/toggle-inline-or-block))
|
||||
:n "rb" #'+css/toggle-inline-or-block))
|
||||
|
||||
;;
|
||||
;; Packages
|
||||
|
|
@ -21,14 +21,14 @@
|
|||
:when (featurep! :completion ivy)
|
||||
:commands (counsel-css counsel-css-imenu-setup)
|
||||
:init
|
||||
(add-hook 'css-mode-hook 'counsel-css-imenu-setup)
|
||||
(add-hook 'css-mode-hook #'counsel-css-imenu-setup)
|
||||
(map! :map* (css-mode-map scss-mode-map less-css-mode-map)
|
||||
:leader :n ";" 'counsel-css))
|
||||
:leader :n ";" #'counsel-css))
|
||||
|
||||
|
||||
(def-package! rainbow-mode
|
||||
:commands rainbow-mode
|
||||
:init (add-hook! (css-mode sass-mode) 'rainbow-mode))
|
||||
:init (add-hook! (css-mode sass-mode) #'rainbow-mode))
|
||||
|
||||
|
||||
(def-package! css-mode
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
:mode ("\\.scss$" . scss-mode)
|
||||
:config
|
||||
(set! :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
|
||||
(set! :build 'compile-to-css 'scss-mode '+css/scss-build))
|
||||
(set! :build 'compile-to-css 'scss-mode #'+css/scss-build))
|
||||
|
||||
|
||||
(def-package! sass-mode
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
:config
|
||||
(setq sass-command-options '("--style compressed"))
|
||||
(set! :company-backend 'sass-mode '(company-css company-yasnippet))
|
||||
(set! :build 'compile-to-css 'sass-mode '+css/sass-build))
|
||||
(set! :build 'compile-to-css 'sass-mode #'+css/sass-build))
|
||||
|
||||
|
||||
(def-package! less-css-mode
|
||||
|
|
|
|||
|
|
@ -10,26 +10,26 @@
|
|||
"\\.tsx$"
|
||||
"wp-content/themes/.+/.+\\.php$")
|
||||
:init
|
||||
(add-hook 'web-mode-hook 'turn-off-smartparens-mode)
|
||||
(add-hook 'web-mode-hook #'turn-off-smartparens-mode)
|
||||
:config
|
||||
(set! :company-backend 'web-mode '(company-web-html company-yasnippet))
|
||||
(setq web-mode-enable-html-entities-fontification t)
|
||||
|
||||
;; Fix blank line numbers after unfolding
|
||||
(advice-add 'web-mode-fold-or-unfold :after 'nlinum--flush)
|
||||
(advice-add #'web-mode-fold-or-unfold :after #'nlinum--flush)
|
||||
|
||||
(map! :map web-mode-map
|
||||
(:localleader :n "rt" 'web-mode-element-rename)
|
||||
"M-/" 'web-mode-comment-or-uncomment
|
||||
:i "SPC" 'self-insert-command
|
||||
:n "M-r" 'doom/web-refresh-browser
|
||||
:n "za" 'web-mode-fold-or-unfold
|
||||
:nv "]a" 'web-mode-attribute-next
|
||||
:nv "[a" 'web-mode-attribute-previous
|
||||
:nv "]t" 'web-mode-tag-next
|
||||
:nv "[t" 'web-mode-tag-previous
|
||||
:nv "]T" 'web-mode-element-child
|
||||
:nv "[T" 'web-mode-element-parent))
|
||||
(:localleader :n "rt" #'web-mode-element-rename)
|
||||
"M-/" #'web-mode-comment-or-uncomment
|
||||
:i "SPC" #'self-insert-command
|
||||
:n "M-r" #'doom/web-refresh-browser
|
||||
:n "za" #'web-mode-fold-or-unfold
|
||||
:nv "]a" #'web-mode-attribute-next
|
||||
:nv "[a" #'web-mode-attribute-previous
|
||||
:nv "]t" #'web-mode-tag-next
|
||||
:nv "[t" #'web-mode-tag-previous
|
||||
:nv "]T" #'web-mode-element-child
|
||||
:nv "[T" #'web-mode-element-parent))
|
||||
|
||||
|
||||
(def-package! company-web
|
||||
|
|
@ -45,5 +45,5 @@
|
|||
:config
|
||||
(set! :company-backend 'pug-mode '(company-yasnippet))
|
||||
(map! :map pug-mode-map
|
||||
:i [tab] 'doom/dumb-indent
|
||||
:i [backtab] 'doom/dumb-dedent))
|
||||
:i [tab] #'doom/dumb-indent
|
||||
:i [backtab] #'doom/dumb-dedent))
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
:commands (web-beautify-html web-beautify-css)
|
||||
:init
|
||||
(map! (:map* (css-mode-map scss-mode-map less-css-mode-map)
|
||||
:n "gQ" 'web-beautify-css)
|
||||
:n "gQ" #'web-beautify-css)
|
||||
(:map* web-mode-map
|
||||
:n "gQ" 'web-beautify-html)))
|
||||
:n "gQ" #'web-beautify-html)))
|
||||
|
||||
|
||||
(def-package! emmet-mode
|
||||
|
|
@ -22,9 +22,9 @@
|
|||
:config
|
||||
(setq emmet-move-cursor-between-quotes t)
|
||||
(map! :map emmet-mode-keymap
|
||||
:v "M-e" 'emmet-wrap-with-markup
|
||||
:i "M-e" 'emmet-expand-yas
|
||||
:i "M-E" 'emmet-expand-line))
|
||||
:v "M-e" #'emmet-wrap-with-markup
|
||||
:i "M-e" #'emmet-expand-yas
|
||||
:i "M-E" #'emmet-expand-line))
|
||||
|
||||
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue