Revert macros to ...! name convention (elisp doesn't like @...)
This commit is contained in:
Henrik Lissner
parent
b64d5554e3
commit
33c88d4f82
125 changed files with 877 additions and 880 deletions
|
|
@ -1,8 +1,8 @@
|
|||
;;; lang/assembly/config.el
|
||||
|
||||
(@def-package mips-mode :mode "\\.mips$")
|
||||
(def-package! mips-mode :mode "\\.mips$")
|
||||
|
||||
(@def-package haxor-mode :mode "\\.hax$")
|
||||
(def-package! haxor-mode :mode "\\.hax$")
|
||||
|
||||
(@def-package nasm-mode :commands nasm-mode)
|
||||
(def-package! nasm-mode :commands nasm-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/assembly/packages.el
|
||||
|
||||
(@package mips-mode)
|
||||
(@package haxor-mode)
|
||||
(@package nasm-mode)
|
||||
(package! mips-mode)
|
||||
(package! haxor-mode)
|
||||
(package! nasm-mode)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; lang/cc/config.el --- C, C++, and Objective-C
|
||||
|
||||
(@def-package cc-mode
|
||||
(def-package! cc-mode
|
||||
:commands (c-mode c++-mode objc-mode java-mode)
|
||||
:mode ("\\.mm" . objc-mode)
|
||||
:init
|
||||
|
|
@ -32,10 +32,10 @@
|
|||
;; Fontification of C++11 string literals
|
||||
(add-hook 'c++-mode-hook '+cc|extra-fontify-c++)
|
||||
|
||||
(@set :electric '(c-mode c++-mode objc-mode java-mode)
|
||||
(set! :electric '(c-mode c++-mode objc-mode java-mode)
|
||||
:chars '(?\n ?\}))
|
||||
|
||||
(@set :company-backend
|
||||
(set! :company-backend
|
||||
'(c-mode c++-mode objc-mode)
|
||||
'(company-irony-c-headers company-irony))
|
||||
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
|
||||
;; Certain mappings interfere with smartparens and custom bindings,
|
||||
;; so unbind them
|
||||
(@map :map c-mode-map
|
||||
(map! :map c-mode-map
|
||||
"DEL" nil
|
||||
"#" 'self-insert-command
|
||||
"{" 'self-insert-command
|
||||
|
|
@ -99,58 +99,58 @@
|
|||
:i ">" '+cc/autoclose->-maybe))
|
||||
|
||||
|
||||
(@def-package modern-cpp-font-lock
|
||||
(def-package! modern-cpp-font-lock
|
||||
:commands modern-c++-font-lock-mode
|
||||
:init (add-hook 'c++-mode-hook 'modern-c++-font-lock-mode))
|
||||
|
||||
|
||||
(@def-package irony
|
||||
(def-package! irony
|
||||
:after cc-mode
|
||||
:config
|
||||
(setq irony-server-install-prefix (concat doom-cache-dir "irony-server/"))
|
||||
(@add-hook 'irony-mode-hook '(irony-eldoc flycheck-mode))
|
||||
(@add-hook 'c++-mode-hook
|
||||
(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)))
|
||||
|
||||
(@def-package irony-eldoc :after irony)
|
||||
(def-package! irony-eldoc :after irony)
|
||||
|
||||
(@def-package flycheck-irony :after irony :config (flycheck-irony-setup))
|
||||
(def-package! flycheck-irony :after irony :config (flycheck-irony-setup))
|
||||
|
||||
|
||||
;;
|
||||
;; Tools
|
||||
;;
|
||||
|
||||
(@def-package disaster :commands disaster)
|
||||
(def-package! disaster :commands disaster)
|
||||
|
||||
|
||||
;;
|
||||
;; Plugins
|
||||
;;
|
||||
|
||||
(@def-package company-cmake :after cmake-mode)
|
||||
(def-package! company-cmake :after cmake-mode)
|
||||
|
||||
(@def-package company-irony :after irony)
|
||||
(def-package! company-irony :after irony)
|
||||
|
||||
(@def-package company-irony-c-headers :after company-irony)
|
||||
(def-package! company-irony-c-headers :after company-irony)
|
||||
|
||||
|
||||
;;
|
||||
;; Major modes
|
||||
;;
|
||||
|
||||
(@def-package cmake-mode
|
||||
(def-package! cmake-mode
|
||||
:mode "CMakeLists\\.txt$"
|
||||
:config
|
||||
(@set :company-backend 'cmake-mode '(company-cmake company-yasnippet)))
|
||||
(set! :company-backend 'cmake-mode '(company-cmake company-yasnippet)))
|
||||
|
||||
(@def-package glsl-mode :mode ("\\.glsl\\'" "\\.vert\\'" "\\.frag\\'" "\\.geom\\'"))
|
||||
(def-package! glsl-mode :mode ("\\.glsl\\'" "\\.vert\\'" "\\.frag\\'" "\\.geom\\'"))
|
||||
|
||||
(@def-package cuda-mode :mode "\\.cuh?$")
|
||||
(def-package! cuda-mode :mode "\\.cuh?$")
|
||||
|
||||
(@def-package opencl-mode :mode "\\.cl$")
|
||||
(def-package! opencl-mode :mode "\\.cl$")
|
||||
|
||||
(@def-package demangle-mode
|
||||
(def-package! demangle-mode
|
||||
:commands demangle-mode
|
||||
:init (add-hook 'llvm-mode-hook 'demangle-mode))
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/cc/packages.el
|
||||
|
||||
(@package cmake-mode)
|
||||
(@package cuda-mode)
|
||||
(@package demangle-mode)
|
||||
(@package disaster)
|
||||
(@package glsl-mode)
|
||||
(@package irony)
|
||||
(@package irony-eldoc)
|
||||
(@package opencl-mode)
|
||||
(@package modern-cpp-font-lock)
|
||||
(package! cmake-mode)
|
||||
(package! cuda-mode)
|
||||
(package! demangle-mode)
|
||||
(package! disaster)
|
||||
(package! glsl-mode)
|
||||
(package! irony)
|
||||
(package! irony-eldoc)
|
||||
(package! opencl-mode)
|
||||
(package! modern-cpp-font-lock)
|
||||
|
||||
(when (@featurep :feature syntax-checker)
|
||||
(@package flycheck-irony))
|
||||
(when (featurep! :feature syntax-checker)
|
||||
(package! flycheck-irony))
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-irony)
|
||||
(@package company-irony-c-headers))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-irony)
|
||||
(package! company-irony-c-headers))
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
;;; module-crystal.el
|
||||
|
||||
(@def-package crystal-mode
|
||||
(def-package! crystal-mode
|
||||
:mode "\\.cr$"
|
||||
:interpreter "crystal"
|
||||
:config
|
||||
(@set :eval 'crystal-mode
|
||||
(set! :eval 'crystal-mode
|
||||
'((:command . "crystal")
|
||||
(:exec . "%c %s")
|
||||
(:description . "Run Crystal script"))))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/crystal/packages.el
|
||||
|
||||
(@package crystal-mode :recipe (:fetcher github :repo "dotmilk/emacs-crystal-mode"))
|
||||
(package! crystal-mode :recipe (:fetcher github :repo "dotmilk/emacs-crystal-mode"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,23 +1,23 @@
|
|||
;;; module-csharp.el
|
||||
|
||||
(@def-package csharp-mode
|
||||
(def-package! csharp-mode
|
||||
:mode "\\.cs$"
|
||||
:init (add-hook 'csharp-mode-hook 'flycheck-mode))
|
||||
|
||||
|
||||
(@def-package omnisharp
|
||||
(def-package! omnisharp
|
||||
:commands omnisharp-mode
|
||||
:preface
|
||||
(setq omnisharp-auto-complete-want-documentation nil
|
||||
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))
|
||||
(set! :company-backend 'csharp-mode '(company-omnisharp))
|
||||
|
||||
;; Map all refactor commands (see emr)
|
||||
(@map :map omnisharp-mode-map
|
||||
(map! :map omnisharp-mode-map
|
||||
:n "gd" 'omnisharp-go-to-definition
|
||||
|
||||
:localleader
|
||||
|
|
@ -40,10 +40,10 @@
|
|||
:n "o" 'omnisharp-show-overloads-at-point
|
||||
|
||||
:prefix "t"
|
||||
:n "tr" (@λ (omnisharp-unit-test "fixture"))
|
||||
:n "ts" (@λ (omnisharp-unit-test "single"))
|
||||
:n "ta" (@λ (omnisharp-unit-test "all"))))
|
||||
:n "tr" (λ! (omnisharp-unit-test "fixture"))
|
||||
:n "ts" (λ! (omnisharp-unit-test "single"))
|
||||
:n "ta" (λ! (omnisharp-unit-test "all"))))
|
||||
|
||||
|
||||
(@def-package shader-mode :mode "\\.shader$") ; unity shaders
|
||||
(def-package! shader-mode :mode "\\.shader$") ; unity shaders
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/csharp/packages.el
|
||||
|
||||
(@package csharp-mode)
|
||||
(@package omnisharp)
|
||||
(@package shader-mode)
|
||||
(package! csharp-mode)
|
||||
(package! omnisharp)
|
||||
(package! shader-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,41 +1,41 @@
|
|||
;;; module-data.el
|
||||
|
||||
(@associate conf-mode :match "/sxhkdrc$")
|
||||
(associate! conf-mode :match "/sxhkdrc$")
|
||||
|
||||
|
||||
(@def-package nxml-mode
|
||||
(def-package! nxml-mode
|
||||
:mode "\\.plist$"
|
||||
:config
|
||||
(@set :company-backend 'nxml-mode '(company-nxml company-yasnippet)))
|
||||
(set! :company-backend 'nxml-mode '(company-nxml company-yasnippet)))
|
||||
|
||||
|
||||
(@def-package toml-mode :mode "\\.toml$")
|
||||
(def-package! toml-mode :mode "\\.toml$")
|
||||
|
||||
|
||||
(@def-package yaml-mode
|
||||
(def-package! yaml-mode
|
||||
:mode "\\.ya?ml$"
|
||||
:config
|
||||
(@set :electric 'yaml-mode :chars '(?\n ?\: ?\-)))
|
||||
(set! :electric 'yaml-mode :chars '(?\n ?\: ?\-)))
|
||||
|
||||
|
||||
(@def-package json-mode :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$"
|
||||
(def-package! json-mode :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$"
|
||||
:config
|
||||
(@set :electric 'json-mode :chars '(?\n ?: ?{ ?})))
|
||||
(set! :electric 'json-mode :chars '(?\n ?: ?{ ?})))
|
||||
|
||||
|
||||
(@def-package vimrc-mode
|
||||
(def-package! vimrc-mode
|
||||
:mode ("/\\.?g?vimrc$" "\\.vim$" "/\\.?vimperatorrc$" "\\.vimp$"))
|
||||
|
||||
|
||||
(@def-package dockerfile-mode
|
||||
(def-package! dockerfile-mode
|
||||
:mode "/Dockerfile$"
|
||||
:config
|
||||
;; TODO
|
||||
(@set :build 'docker 'dockerfile-mode '+data-dockerfile-p '+data/dockerfile-build))
|
||||
(set! :build 'docker 'dockerfile-mode '+data-dockerfile-p '+data/dockerfile-build))
|
||||
|
||||
|
||||
;; For ROM hacking or debugging
|
||||
(@def-package hexl-mode
|
||||
(def-package! hexl-mode
|
||||
:mode ("\\.hex$" "\\.nes$"))
|
||||
|
||||
|
||||
|
|
@ -43,10 +43,10 @@
|
|||
;; Frameworks
|
||||
;;
|
||||
|
||||
;; (@def-project ansible-mode "ans"
|
||||
;; (def-project! ansible-mode "ans"
|
||||
;; :modes (yaml-mode)
|
||||
;; :files ("roles/"))
|
||||
|
||||
;; (@def-project vagrant "vagrant"
|
||||
;; (def-project! vagrant "vagrant"
|
||||
;; :files ("Vagrantfile"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/data/packages.el
|
||||
|
||||
(@package dockerfile-mode)
|
||||
(@package json-mode)
|
||||
(@package toml-mode)
|
||||
(@package vimrc-mode)
|
||||
(@package yaml-mode)
|
||||
(package! dockerfile-mode)
|
||||
(package! json-mode)
|
||||
(package! toml-mode)
|
||||
(package! vimrc-mode)
|
||||
(package! yaml-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
;;; lang/emacs-lisp/config.el
|
||||
|
||||
(@def-package elisp-mode ; built-in
|
||||
(def-package! elisp-mode ; built-in
|
||||
:mode ("/Cask$" . emacs-lisp-mode)
|
||||
:init
|
||||
(add-hook 'emacs-lisp-mode-hook '+emacs-lisp|hook)
|
||||
|
||||
:config
|
||||
(@map :map emacs-lisp-mode-map
|
||||
(map! :map emacs-lisp-mode-map
|
||||
:m "gd" '+emacs-lisp/find-function
|
||||
:leader :m "gd" '+emacs-lisp/find-function-in-other-window)
|
||||
|
||||
(@set :rotate 'emacs-lisp-mode
|
||||
(set! :rotate 'emacs-lisp-mode
|
||||
:symbols '(("t" "nil")
|
||||
("let" "let*")
|
||||
("when" "unless")
|
||||
|
|
@ -35,17 +35,14 @@
|
|||
nil `(;; Display "lambda" as λ
|
||||
("(\\(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))
|
||||
;; Highlight doom macros (no need, macros are fontified in emacs 25+)
|
||||
;; ("\\(^\\|\\s-\\)(\\(@[^) ]+\\)[) \n]" (2 font-lock-preprocessor-face append))
|
||||
))
|
||||
("\\(^\\|\\s-\\|,\\)(\\(\\(doom\\|\\+\\)[^) ]+\\)[) \n]" (2 font-lock-builtin-face))))
|
||||
|
||||
(setq imenu-generic-expression
|
||||
'(("Evil Commands" "^\\s-*(evil-define-\\(?:command\\|operator\\|motion\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
||||
("Package" "^\\s-*(@\\(?:use-package\\|package\\) +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
||||
("Settings" "^\\s-*(@def-setting +\\([^ ()\n]+\\)" 1)
|
||||
("Modelines" "^\\s-*(@def-modeline +\\([^ ()\n]+\\)" 1)
|
||||
("Modeline Segments" "^\\s-*(@def-modeline-segment +\\([^ ()\n]+\\)" 1)
|
||||
("Package" "^\\s-*(\\(?:def-\\)?package! +\\(\\_<[^ ()\n]+\\_>\\)" 1)
|
||||
("Settings" "^\\s-*(def-setting! +\\([^ ()\n]+\\)" 1)
|
||||
("Modelines" "^\\s-*(def-modeline! +\\([^ ()\n]+\\)" 1)
|
||||
("Modeline Segments" "^\\s-*(def-modeline-segment! +\\([^ ()\n]+\\)" 1)
|
||||
("Advice" "^\\s-*(def\\(?:\\(?:ine-\\)?advice\\))")
|
||||
("Modes" "^\\s-*(define-\\(?:global\\(?:ized\\)?-minor\\|generic\\|minor\\)-mode +\\([^ ()\n]+\\)" 1)
|
||||
("Macros" "^\\s-*(\\(?:cl-\\)?def\\(?:ine-compile-macro\\|macro\\) +\\([^ )\n]+\\)" 1)
|
||||
|
|
@ -61,17 +58,17 @@
|
|||
;; Plugins
|
||||
;;
|
||||
|
||||
(@def-package auto-compile
|
||||
(def-package! auto-compile
|
||||
:commands auto-compile-on-save-mode
|
||||
:config
|
||||
(setq auto-compile-display-buffer nil
|
||||
auto-compile-use-mode-line nil))
|
||||
|
||||
|
||||
(@def-package highlight-quoted
|
||||
(def-package! highlight-quoted
|
||||
:commands highlight-quoted-mode)
|
||||
|
||||
|
||||
(@def-package slime
|
||||
(def-package! slime
|
||||
:config (setq inferior-lisp-program "clisp"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/emacs-lisp/packages.el
|
||||
|
||||
(@package auto-compile)
|
||||
(@package highlight-quoted)
|
||||
(@package slime)
|
||||
(package! auto-compile)
|
||||
(package! highlight-quoted)
|
||||
(package! slime)
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; lang/go/config.el
|
||||
|
||||
(@def-package go-mode
|
||||
(def-package! go-mode
|
||||
: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 (add-hook 'before-save-hook 'gofmt-before-save))
|
||||
:config
|
||||
(@set :build 'go-build 'go-mode '+go/build)
|
||||
(@set :company-backend 'go-mode '(company-go company-yasnippet))
|
||||
(@set :repl 'go-mode 'gorepl-run)
|
||||
(set! :build 'go-build 'go-mode '+go/build)
|
||||
(set! :company-backend 'go-mode '(company-go company-yasnippet))
|
||||
(set! :repl 'go-mode 'gorepl-run)
|
||||
|
||||
(@map :map go-mode-map
|
||||
(map! :map go-mode-map
|
||||
:n "gd" 'godef-jump
|
||||
(:localleader
|
||||
:n "k" 'godef-describe
|
||||
|
|
@ -24,14 +24,14 @@
|
|||
:n "s" '+go/test-run-package)))
|
||||
|
||||
|
||||
(@def-package company-go :after go-mode)
|
||||
(def-package! company-go :after go-mode)
|
||||
|
||||
|
||||
(@def-package go-eldoc
|
||||
(def-package! go-eldoc
|
||||
:after go-mode
|
||||
:init (add-hook 'go-mode-hook 'go-eldoc-setup))
|
||||
|
||||
|
||||
(@def-package gorepl-mode
|
||||
(def-package! gorepl-mode
|
||||
:commands (gorepl-run gorepl-run-load-current-file))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/go/packages.el
|
||||
|
||||
(@package go-eldoc)
|
||||
(@package go-mode)
|
||||
(@package gorepl-mode)
|
||||
(when (@featurep :completion company)
|
||||
(@package company-go))
|
||||
(package! go-eldoc)
|
||||
(package! go-mode)
|
||||
(package! gorepl-mode)
|
||||
(when (featurep! :completion company)
|
||||
(package! company-go))
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
;;; module-haskell.el
|
||||
|
||||
(@def-package haskell
|
||||
(def-package! haskell
|
||||
:mode (("\\.hs$" . haskell-mode)
|
||||
("\\.ghci$" . ghci-script-mode)
|
||||
("\\.cabal$" . haskell-cabal-mode))
|
||||
:interpreter (("runghc" . haskell-mode)
|
||||
("runhaskell" . haskell-mode))
|
||||
:init
|
||||
(@add-hook haskell-mode '(interactive-haskell-mode flycheck-mode))
|
||||
(add-hook! haskell-mode '(interactive-haskell-mode flycheck-mode))
|
||||
:config
|
||||
(@set :popup "*debug:haskell*" :size 20)
|
||||
(@set :repl 'haskell-mode 'switch-to-haskell)
|
||||
(set! :popup "*debug:haskell*" :size 20)
|
||||
(set! :repl 'haskell-mode 'switch-to-haskell)
|
||||
(push ".hi" completion-ignored-extensions))
|
||||
|
||||
|
||||
(@def-package inf-haskell ; part of haskell
|
||||
(def-package! inf-haskell ; part of haskell
|
||||
:commands (inferior-haskell-mode inf-haskell-mode switch-to-haskell)
|
||||
:config (@map :map inf-haskell-mode-map "ESC ESC" 'doom/popup-close))
|
||||
:config (map! :map inf-haskell-mode-map "ESC ESC" 'doom/popup-close))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/haskell/packages.el
|
||||
|
||||
(@package haskell-mode)
|
||||
(package! haskell-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
;;; lang/java/config.el
|
||||
|
||||
(@def-package meghanada
|
||||
(def-package! meghanada
|
||||
:commands meghanada-mode
|
||||
:init
|
||||
(@add-hook java-mode '(meghanada-mode flycheck-mode))
|
||||
(add-hook! java-mode '(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 (expand-file-name "meghanada-server" doom-cache-dir)
|
||||
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)
|
||||
|
||||
(unless (file-exists-p (meghanada--locate-server-jar))
|
||||
(meghanada-install-server)))
|
||||
|
||||
|
||||
(@def-package android-mode
|
||||
(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))
|
||||
(set! :yas-minor-mode 'android-mode)
|
||||
(set! :company-dict-minor-mode 'android-mode))
|
||||
|
||||
|
||||
(@def-package groovy-mode
|
||||
(def-package! groovy-mode
|
||||
:mode "\\.g\\(radle\\|roovy\\)$"
|
||||
:config
|
||||
(@set :eval 'groovy-mode "groovy"))
|
||||
(set! :eval 'groovy-mode "groovy"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/java/packages.el
|
||||
|
||||
(@package meghanada)
|
||||
(@package android-mode)
|
||||
(@package groovy-mode)
|
||||
(package! meghanada)
|
||||
(package! android-mode)
|
||||
(package! groovy-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -166,11 +166,11 @@
|
|||
"REACTIONS" "BODYPARTS_ALL" "RESOURCES_ALL" "COLORS_ALL"))
|
||||
|
||||
;; TODO
|
||||
;; (@def-project screeps "screeps"
|
||||
;; (def-project! screeps "screeps"
|
||||
;; :match "/screeps/.+$"
|
||||
;; :modes (nodejs-project-mode))
|
||||
|
||||
;; (@add-hook screeps-project-mode
|
||||
;; (add-hook! screeps-project-mode
|
||||
;; (when (eq major-mode 'js2-mode)
|
||||
;; (add-to-list 'flycheck-disabled-checkers 'javascript-jshint)
|
||||
;; (setq js2-additional-externs (append '("_") screeps-objects screeps-constants))))
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
;; lang/javascript/config.el
|
||||
|
||||
;; TODO (@load +screeps)
|
||||
;; TODO (load! +screeps)
|
||||
|
||||
(@def-package js2-mode
|
||||
(def-package! js2-mode
|
||||
:mode "\\.js$"
|
||||
:interpreter "node"
|
||||
:config
|
||||
|
|
@ -10,19 +10,19 @@
|
|||
js2-highlight-external-variables nil
|
||||
js2-mode-show-parse-errors nil)
|
||||
|
||||
(@add-hook js2-mode '(tern-mode flycheck-mode highlight-indent-guides-mode))
|
||||
(add-hook! js2-mode '(tern-mode flycheck-mode highlight-indent-guides-mode))
|
||||
;; Conform switch-case indentation to editorconfig's config
|
||||
(@add-hook js2-mode (setq js-switch-indent-offset js-indent-level))
|
||||
(add-hook! js2-mode (setq js-switch-indent-offset js-indent-level))
|
||||
|
||||
(@set :repl 'js2-mode 'nodejs-repl)
|
||||
(set! :repl 'js2-mode 'nodejs-repl)
|
||||
|
||||
(@set :company-backend 'js2-mode '(company-tern))
|
||||
(set! :company-backend 'js2-mode '(company-tern))
|
||||
|
||||
(@set :electric 'js2-mode
|
||||
(set! :electric 'js2-mode
|
||||
:chars ?\} ?\) ?.
|
||||
:words "||" "&&")
|
||||
|
||||
(@map :map js2-mode-map
|
||||
(map! :map js2-mode-map
|
||||
:localleader
|
||||
:nv ";" 'doom/append-semicolon
|
||||
|
||||
|
|
@ -55,10 +55,10 @@
|
|||
:n "ii" 'js2r-wrap-buffer-in-iife))
|
||||
|
||||
|
||||
(@def-package nodejs-repl :commands nodejs-repl)
|
||||
(def-package! nodejs-repl :commands nodejs-repl)
|
||||
|
||||
|
||||
(@def-package js2-refactor
|
||||
(def-package! js2-refactor
|
||||
:commands
|
||||
(js2r-extract-function js2r-extract-method js2r-introduce-parameter
|
||||
js2r-localize-parameter js2r-expand-object js2r-contract-object
|
||||
|
|
@ -70,16 +70,16 @@
|
|||
js2r-debug-this js2r-forward-slurp js2r-forward-barf))
|
||||
|
||||
|
||||
(@def-package company-tern
|
||||
(def-package! company-tern
|
||||
:when (featurep 'company)
|
||||
:commands company-tern
|
||||
:after tern)
|
||||
|
||||
|
||||
(@def-package jsx-mode :mode "\\.jsx$")
|
||||
(def-package! jsx-mode :mode "\\.jsx$")
|
||||
|
||||
|
||||
(@def-package coffee-mode
|
||||
(def-package! coffee-mode
|
||||
:mode "\\.coffee$"
|
||||
:init (setq coffee-indent-like-python-mode t))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/javascript/packages.el
|
||||
|
||||
(@package coffee-mode)
|
||||
(@package js2-mode)
|
||||
(@package js2-refactor)
|
||||
(@package jsx-mode)
|
||||
(@package nodejs-repl)
|
||||
(@package tern)
|
||||
(package! coffee-mode)
|
||||
(package! js2-mode)
|
||||
(package! js2-refactor)
|
||||
(package! jsx-mode)
|
||||
(package! nodejs-repl)
|
||||
(package! tern)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-tern))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-tern))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@
|
|||
:mode "\\.jl$"
|
||||
:interpreter "julia"
|
||||
:config
|
||||
(@set :repl 'julia-mode '+julia/repl))
|
||||
(set! :repl 'julia-mode '+julia/repl))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/julia/packages.el
|
||||
|
||||
(@package julia-mode)
|
||||
(package! julia-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
;; Plugins
|
||||
;;
|
||||
|
||||
(@def-package auctex
|
||||
(def-package! auctex
|
||||
:mode ("\\.tex$" . LaTeX-mode)
|
||||
:init
|
||||
(add-hook 'LaTeX-mode-hook 'turn-on-auto-fill)
|
||||
|
|
@ -23,25 +23,25 @@
|
|||
TeX-source-correlate-start-server nil
|
||||
LaTeX-fill-break-at-separators nil)
|
||||
|
||||
(@add-hook LaTeX-mode '(LaTeX-math-mode TeX-source-correlate-mode))
|
||||
(add-hook! LaTeX-mode '(LaTeX-math-mode TeX-source-correlate-mode))
|
||||
|
||||
(@set :company-backend 'LaTeX-mode '(company-auctex)))
|
||||
(set! :company-backend 'LaTeX-mode '(company-auctex)))
|
||||
|
||||
(@def-package company-auctex)
|
||||
(def-package! company-auctex)
|
||||
|
||||
|
||||
(@def-package bibtex ; built-in
|
||||
(def-package! bibtex ; built-in
|
||||
:config
|
||||
(setq bibtex-dialect 'biblatex
|
||||
bibtex-align-at-equal-sign t
|
||||
bibtex-text-indentation 20
|
||||
bibtex-completion-bibliography (list +latex-bibtex-default-file))
|
||||
|
||||
(@map :map bibtex-mode-map
|
||||
(map! :map bibtex-mode-map
|
||||
"C-c \\" 'bibtex-fill-entry))
|
||||
|
||||
|
||||
(@def-package reftex ; built-in
|
||||
(def-package! reftex ; built-in
|
||||
:commands turn-on-reftex
|
||||
:init
|
||||
(add-hook 'LaTeX-mode-hook 'turn-on-reftex)
|
||||
|
|
@ -49,13 +49,13 @@
|
|||
(setq reftex-plug-into-AUCTeX t
|
||||
reftex-default-bibliography (list +latex-bibtex-default-file))
|
||||
|
||||
(@map :map reftex-mode-map
|
||||
(map! :map reftex-mode-map
|
||||
:leader :n ";" 'reftex-toc))
|
||||
|
||||
|
||||
(@def-package ivy-bibtex
|
||||
(def-package! ivy-bibtex
|
||||
:commands ivy-bibtex)
|
||||
|
||||
(@def-package helm-bibtex
|
||||
(def-package! helm-bibtex
|
||||
:commands helm-bibtex)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/latex/packages.el
|
||||
|
||||
(@package auctex)
|
||||
;; (@package auctex-latexmk)
|
||||
(package! auctex)
|
||||
;; (package! auctex-latexmk)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-auctex))
|
||||
(when (@featurep :completion ivy)
|
||||
(@package ivy-bibtex))
|
||||
(when (@featurep :completion helm)
|
||||
(@package helm-bibtex))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-auctex))
|
||||
(when (featurep! :completion ivy)
|
||||
(package! ivy-bibtex))
|
||||
(when (featurep! :completion helm)
|
||||
(package! helm-bibtex))
|
||||
|
|
|
|||
|
|
@ -1,24 +1,24 @@
|
|||
;;; lang/lua/config.el --- lua + Love2D
|
||||
|
||||
(@def-package lua-mode
|
||||
(def-package! lua-mode
|
||||
:mode "\\.lua$"
|
||||
:interpreter "lua"
|
||||
:init
|
||||
(add-hook 'lua-mode-hook 'flycheck-mode)
|
||||
:config
|
||||
(@set :company-backend 'lua-mode '(company-lua company-yasnippet))
|
||||
(@set :electric 'lua-mode :words '("else" "end"))
|
||||
(@set :repl 'lua-mode '+lua/repl)
|
||||
(set! :company-backend 'lua-mode '(company-lua company-yasnippet))
|
||||
(set! :electric 'lua-mode :words '("else" "end"))
|
||||
(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)))
|
||||
|
||||
|
||||
(@def-package company-lua
|
||||
(def-package! company-lua
|
||||
:after lua-mode)
|
||||
|
||||
|
||||
(@def-package moonscript
|
||||
(def-package! moonscript
|
||||
:mode ("\\.moon$" . moonscript-mode)
|
||||
:config
|
||||
(push '(moonscript-mode moonscript-indent-offset) editorconfig-indentation-alist))
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/lua/packages.el
|
||||
|
||||
(@package lua-mode)
|
||||
(@package moonscript)
|
||||
(package! lua-mode)
|
||||
(package! moonscript)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-lua))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-lua))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; lang/markdown/config.el
|
||||
|
||||
(@def-package markdown-mode
|
||||
(def-package! markdown-mode
|
||||
:mode ("\\.m\\(d\\|arkdown\\)$" "/README$"
|
||||
("/README\\.md$" . gfm-mode))
|
||||
:init
|
||||
|
|
@ -11,9 +11,9 @@
|
|||
markdown-gfm-additional-languages '("sh"))
|
||||
|
||||
:config
|
||||
(@set :electric 'markdown-mode :chars '(?+ ?#))
|
||||
(set! :electric 'markdown-mode :chars '(?+ ?#))
|
||||
|
||||
(@add-hook markdown-mode
|
||||
(add-hook! markdown-mode
|
||||
(auto-fill-mode +1)
|
||||
(setq line-spacing 2
|
||||
fill-column 70))
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
'(markdown-mode gfm-mode)
|
||||
"\`\`\`" "\`\`\`" :post-handlers '(("||\n" "RET")))
|
||||
|
||||
(@map :map gfm-mode-map
|
||||
(map! :map gfm-mode-map
|
||||
"`" 'self-insert-command
|
||||
|
||||
:map markdown-mode-map
|
||||
|
|
@ -54,6 +54,6 @@
|
|||
:nv "L" 'markdown-insert-reference-link-dwim))))
|
||||
|
||||
|
||||
(@def-package markdown-toc
|
||||
(def-package! markdown-toc
|
||||
:commands markdown-toc-generate-toc)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/markdown/packages.el
|
||||
|
||||
(@package markdown-mode)
|
||||
(@package markdown-toc)
|
||||
(package! markdown-mode)
|
||||
(package! markdown-toc)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
;;; lang/octave/config.el
|
||||
|
||||
;; built-in
|
||||
(@def-package octave
|
||||
(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
|
||||
;; (@add-hook octave-mode
|
||||
;; (add-hook! octave-mode
|
||||
;; (require 'ac-octave)
|
||||
;; (setq ac-sources '(ac-source-octave))))
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,6 @@
|
|||
,@dnd-protocol-alist))
|
||||
|
||||
;; keybinds
|
||||
;; (@map :leader :n "oa" (@find-file-in +org-attachment-dir))
|
||||
;; (map! :leader :n "oa" (find-file-in! +org-attachment-dir))
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
(require 'org-capture)
|
||||
(require 'org-protocol)
|
||||
(@set :popup "*Org Select*" :size 0.4)
|
||||
(set! :popup "*Org Select*" :size 0.4)
|
||||
|
||||
(defadvice org-capture (after make-full-window-frame activate)
|
||||
"If org-capture creates a new frame, this initializes it properly, by
|
||||
|
|
|
|||
|
|
@ -23,6 +23,6 @@
|
|||
;; (setq org-pandoc-options '((standalone . t) (mathjax . t) (parse-raw . t)))
|
||||
|
||||
;; keybinds
|
||||
;; (@map :leader :n "oe" (@find-file-in org-export-directory))
|
||||
;; (map! :leader :n "oe" (find-file-in! org-export-directory))
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -35,9 +35,9 @@
|
|||
;; "A list of attachments for the current buffer. This is so my custom attachment
|
||||
;; system can keep track of each buffer's attachments.")
|
||||
|
||||
(@load +attach)
|
||||
(@load +capture)
|
||||
(@load +export)
|
||||
(load! +attach)
|
||||
(load! +capture)
|
||||
(load! +export)
|
||||
|
||||
|
||||
;;
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
:keymap (make-sparse-keymap)
|
||||
:group 'evil-org)
|
||||
|
||||
(@set :popup
|
||||
(set! :popup
|
||||
'(" *Agenda Commands*" :size 30 :noselect t)
|
||||
'(" *Org todo*" :size 5 :noselect t)
|
||||
'("*Calendar*" :size 0.4 :noselect t)
|
||||
|
|
@ -216,10 +216,10 @@
|
|||
(sp-local-pair "{" nil))
|
||||
|
||||
;; bullets
|
||||
(@def-package org-bullets :commands org-bullets-mode)
|
||||
(def-package! org-bullets :commands org-bullets-mode)
|
||||
|
||||
;; Keybinds
|
||||
(@map (:map org-mode-map
|
||||
(map! (:map org-mode-map
|
||||
"RET" nil
|
||||
"C-j" nil
|
||||
"C-k" nil
|
||||
|
|
@ -262,18 +262,18 @@
|
|||
:nv "k" 'evil-previous-visual-line
|
||||
:v "<S-tab>" '+snippets/expand-on-region
|
||||
|
||||
:i "M-a" (@λ (evil-visual-state) (org-mark-element))
|
||||
:i "M-a" (λ! (evil-visual-state) (org-mark-element))
|
||||
: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))
|
||||
:ni "<M-return>" (λ! (+org/insert-item 'below))
|
||||
:ni "<S-M-return>" (λ! (+org/insert-item 'above))
|
||||
|
||||
;; Formatting shortcuts
|
||||
:i "M-b" (@λ (+org-surround "*")) ; bold
|
||||
:i "M-u" (@λ (+org-surround "_")) ; underline
|
||||
:i "M-i" (@λ (+org-surround "/")) ; italics
|
||||
:i "M-`" (@λ (+org-surround "+")) ; strikethrough
|
||||
:i "M-b" (λ! (+org-surround "*")) ; bold
|
||||
:i "M-u" (λ! (+org-surround "_")) ; underline
|
||||
:i "M-i" (λ! (+org-surround "/")) ; italics
|
||||
:i "M-`" (λ! (+org-surround "+")) ; strikethrough
|
||||
|
||||
:v "M-b" "S*"
|
||||
:v "M-u" "S_"
|
||||
|
|
@ -288,17 +288,17 @@
|
|||
:n "?" 'org-tags-view
|
||||
:n "D" 'org-deadline
|
||||
:nv "L" 'org-store-link
|
||||
:n "R" (@λ (org-metaleft) (org-archive-to-archive-sibling)) ; archive to parent sibling
|
||||
:n "R" (λ! (org-metaleft) (org-archive-to-archive-sibling)) ; archive to parent sibling
|
||||
:n "T" 'org-todo
|
||||
:n "a" 'org-agenda
|
||||
:n "d" 'org-time-stamp
|
||||
:n "e" 'org-edit-special
|
||||
:n "l" 'org-insert-link
|
||||
:n "n" (@λ (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
|
||||
:n "n" (λ! (if (buffer-narrowed-p) (widen) (org-narrow-to-subtree)))
|
||||
:n "r" 'org-refile
|
||||
: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 (if (org-entry-is-todo-p) 'none 'todo)))
|
||||
:v "t" (λ! (evil-ex-normal evil-visual-beginning evil-visual-end "\\t"))
|
||||
:n "v" 'variable-pitch-mode
|
||||
;; :n "w" 'writing-mode
|
||||
;; :n "x" '+org/remove-link
|
||||
|
|
@ -308,25 +308,25 @@
|
|||
:n "za" '+org/toggle-fold
|
||||
:n "zA" 'org-shifttab
|
||||
:n "zc" 'outline-hide-subtree
|
||||
:n "zC" (@λ (outline-hide-sublevels 1))
|
||||
: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 "zm" (λ! (outline-hide-sublevels 1))
|
||||
: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 "]]" (λ! (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 "gl" (λ! (call-interactively 'outline-next-visible-heading) (show-children))
|
||||
|
||||
:n "go" 'org-open-at-point
|
||||
:n "gO" (@λ (let ((org-link-frame-setup (append '((file . find-file-other-window)) org-link-frame-setup))
|
||||
: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)))
|
||||
|
|
@ -336,13 +336,13 @@
|
|||
:m "^" 'org-beginning-of-line
|
||||
:n "<" 'org-metaleft
|
||||
:n ">" 'org-metaright
|
||||
:v "<" (@λ (org-metaleft) (evil-visual-restore))
|
||||
:v ">" (@λ (org-metaright) (evil-visual-restore))
|
||||
:v "<" (λ! (org-metaleft) (evil-visual-restore))
|
||||
:v ">" (λ! (org-metaright) (evil-visual-restore))
|
||||
:n "-" 'org-cycle-list-bullet
|
||||
:m "<tab>" 'org-cycle)
|
||||
|
||||
(:map org-src-mode-map
|
||||
:n "<escape>" (@λ (message "Exited") (org-edit-src-exit)))
|
||||
:n "<escape>" (λ! (message "Exited") (org-edit-src-exit)))
|
||||
|
||||
(:after org-agenda
|
||||
(:map org-agenda-mode-map
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/org/packages.el
|
||||
|
||||
(@package org-plus-contrib :pin "org")
|
||||
(@package org-download)
|
||||
;; (@package ox-pandox)
|
||||
;; (@package org-bullets)
|
||||
;; (@package ob-go :recipe (:fetcher github :repo "pope/ob-go"))
|
||||
;; (@package ob-http)
|
||||
(package! org-plus-contrib :pin "org")
|
||||
(package! org-download)
|
||||
;; (package! ox-pandox)
|
||||
;; (package! org-bullets)
|
||||
;; (package! ob-go :recipe (:fetcher github :repo "pope/ob-go"))
|
||||
;; (package! ob-http)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
;;; lang/php/config.el
|
||||
|
||||
;; (@def-package hack-mode
|
||||
;; (def-package! hack-mode
|
||||
;; :mode "\\.hh$"
|
||||
;; :config
|
||||
;; (@set :company-backend 'hack-mode '(company-capf)))
|
||||
;; (set! :company-backend 'hack-mode '(company-capf)))
|
||||
|
||||
|
||||
(@def-package php-mode
|
||||
(def-package! php-mode
|
||||
:mode ("\\.php[s345]?$" "\\.inc$")
|
||||
:interpreter "php"
|
||||
:init
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
:config
|
||||
(setq php-template-compatibility nil)
|
||||
|
||||
(@set :repl 'php-mode 'php-boris)
|
||||
(@set :company-bakend 'php-mode '(php-extras-company company-yasnippet))
|
||||
(set! :repl 'php-mode 'php-boris)
|
||||
(set! :company-bakend 'php-mode '(php-extras-company company-yasnippet))
|
||||
|
||||
(@add-hook php-mode (setq-local sp-max-pair-length 6))
|
||||
(add-hook! php-mode (setq-local sp-max-pair-length 6))
|
||||
|
||||
(sp-with-modes '(php-mode)
|
||||
(sp-local-pair "/*" "*/" :post-handlers '(("||\n[i]" "RET") ("| " "SPC")))
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
(sp-local-pair "<?" "?>" :when '(("RET")) :post-handlers '("||\n[i]"))
|
||||
(sp-local-pair "<?php" "?>" :when '(("RET")) :post-handlers '("||\n[i]")))
|
||||
|
||||
(@map :map php-mode-map
|
||||
(map! :map php-mode-map
|
||||
:localleader
|
||||
:nv ";" 'doom/append-semicolon
|
||||
|
||||
|
|
@ -44,7 +44,7 @@
|
|||
:n "s" 'phpunit-current-test))
|
||||
|
||||
|
||||
(@def-package php-extras
|
||||
(def-package! php-extras
|
||||
:after php-mode
|
||||
:init
|
||||
(add-hook 'php-mode-hook 'eldoc-mode)
|
||||
|
|
@ -65,28 +65,28 @@
|
|||
(message "PHP eldoc updated!")))))
|
||||
|
||||
|
||||
(@def-package php-refactor-mode
|
||||
(def-package! php-refactor-mode
|
||||
:commands php-refactor-mode
|
||||
:init (add-hook 'php-mode-hook 'php-refactor-mode))
|
||||
|
||||
|
||||
(@def-package phpunit
|
||||
(def-package! phpunit
|
||||
:commands (phpunit-current-test phpunit-current-class phpunit-current-project))
|
||||
|
||||
|
||||
(@def-package php-boris :commands php-boris)
|
||||
(def-package! php-boris :commands php-boris)
|
||||
|
||||
|
||||
;;
|
||||
;; Projects
|
||||
;;
|
||||
|
||||
;; (@def-project laravel "laravel"
|
||||
;; (def-project! laravel "laravel"
|
||||
;; :modes (php-mode yaml-mode web-mode nxml-mode js2-mode scss-mode)
|
||||
;; :files ("artisan" "server.php"))
|
||||
|
||||
;; (defvar php-composer-conf (make-hash-table :test 'equal))
|
||||
;; (@def-project composer "composer"
|
||||
;; (def-project! composer "composer"
|
||||
;; :modes (web-mode php-mode)
|
||||
;; :files ("composer.json")
|
||||
;; :when
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/php/packages.el
|
||||
|
||||
(@package php-boris)
|
||||
(@package php-extras :recipe (:fetcher github :repo "arnested/php-extras"))
|
||||
(@package php-mode)
|
||||
(@package php-refactor-mode)
|
||||
(@package phpunit)
|
||||
(package! php-boris)
|
||||
(package! php-extras :recipe (:fetcher github :repo "arnested/php-extras"))
|
||||
(package! php-mode)
|
||||
(package! php-refactor-mode)
|
||||
(package! phpunit)
|
||||
|
||||
;; (@package hack-mode
|
||||
;; (package! hack-mode
|
||||
;; :recipe
|
||||
;; (:fetcher url :url "https://raw.githubusercontent.com/facebook/hhvm/master/hphp/hack/editor-plugins/emacs/hack-mode.el"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
;;; module-processing.el
|
||||
|
||||
(@def-package processing-mode
|
||||
(def-package! processing-mode
|
||||
:commands (processing-mode processing-find-sketch)
|
||||
:mode "\\.pde$"
|
||||
:init
|
||||
(add-hook 'processing-compilation-mode-hook 'doom-hide-modeline-mode)
|
||||
:config
|
||||
(@set :build 'build-sketch 'processing-mode 'processing-sketch-build)
|
||||
(@set :popup "*processing-compilation*" :size 10 :noselect t)
|
||||
(@set :eval 'processing-mode
|
||||
(set! :build 'build-sketch 'processing-mode 'processing-sketch-build)
|
||||
(set! :popup "*processing-compilation*" :size 10 :noselect t)
|
||||
(set! :eval 'processing-mode
|
||||
'((:command . ,processing-location)
|
||||
(:exec . (lambda () (format "--sketch=%s --output=%s --force --run"
|
||||
(doom/project-root) processing-output-dir)))
|
||||
(:description . "Run Processing sketch")))
|
||||
(@set :company-backend 'processing-mode
|
||||
(set! :company-backend 'processing-mode
|
||||
'(company-keywords :with company-yasnippet company-dabbrev-code))
|
||||
|
||||
(setq processing-location "/usr/local/bin/processing-java"
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
processing-sketchbook-dir "~/Dropbox/work/pde"
|
||||
processing-output-dir "/tmp")
|
||||
|
||||
(@map :map processing-mode-map
|
||||
(map! :map processing-mode-map
|
||||
:nv "M-r" 'processing-sketch-run
|
||||
:m "gd" 'processing-find-in-reference
|
||||
:m "gF" 'processing-find-sketch
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
:n "e" 'processing-open-examples
|
||||
:n "o" 'processing-open-sketchbook)
|
||||
|
||||
(@after company-keywords
|
||||
(after! company-keywords
|
||||
(nconc company-keywords-alist
|
||||
(cons 'processing-mode (append processing-functions
|
||||
processing-builtins
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/processing/packages.el
|
||||
|
||||
(@package processing-mode)
|
||||
(package! processing-mode)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; lang/python/config.el
|
||||
|
||||
(@def-package python
|
||||
(def-package! python
|
||||
:commands python-mode
|
||||
:init
|
||||
(setq python-environment-directory doom-cache-dir
|
||||
|
|
@ -17,11 +17,11 @@
|
|||
(add-hook 'python-mode-hook 'flycheck-mode)
|
||||
|
||||
:config
|
||||
(@set :repl 'python-mode '+python/repl)
|
||||
(set! :repl 'python-mode '+python/repl)
|
||||
(define-key python-mode-map (kbd "DEL") nil)) ; interferes with smartparens
|
||||
|
||||
|
||||
(@def-package anaconda-mode
|
||||
(def-package! anaconda-mode
|
||||
:after python
|
||||
:init
|
||||
(add-hook 'python-mode-hook 'anaconda-mode)
|
||||
|
|
@ -30,17 +30,17 @@
|
|||
anaconda-mode-eldoc-as-single-line t)
|
||||
|
||||
:config
|
||||
(@set :company-backend 'python-mode '(company-anaconda))
|
||||
(set! :company-backend 'python-mode '(company-anaconda))
|
||||
|
||||
(@map :map anaconda-mode-map :m "gd" 'anaconda-mode-find-definitions
|
||||
(map! :map anaconda-mode-map :m "gd" 'anaconda-mode-find-definitions
|
||||
:map anaconda-nav-mode-map :n [escape] 'anaconda-nav-quit)
|
||||
|
||||
(advice-add 'anaconda-mode-doc-buffer :after 'doom*anaconda-mode-doc-buffer))
|
||||
|
||||
(@def-package company-anaconda
|
||||
(def-package! company-anaconda
|
||||
:after anaconda-mode
|
||||
:config
|
||||
(@set :emr 'python-mode
|
||||
(set! :emr 'python-mode
|
||||
'(:nv anaconda-mode-show-doc "view documentation")
|
||||
'(:nv anaconda-mode-find-assignments "find assignments")
|
||||
'(:nv anaconda-mode-find-definitions "find definitions")
|
||||
|
|
@ -48,20 +48,20 @@
|
|||
'(:n anaconda-mode-find-references "show usages")))
|
||||
|
||||
|
||||
(@def-package pip-requirements
|
||||
(def-package! pip-requirements
|
||||
:mode ("/requirements.txt$" . pip-requirements-mode))
|
||||
|
||||
|
||||
(@def-package nose
|
||||
(def-package! nose
|
||||
:commands nose-mode
|
||||
:preface
|
||||
(defvar nose-mode-map (make-sparse-keymap))
|
||||
:init
|
||||
(@associate nose-mode :match "/test_.+\\.py$" :in (python-mode))
|
||||
(associate! nose-mode :match "/test_.+\\.py$" :in (python-mode))
|
||||
:config
|
||||
(@set :popup "*nosetests*" :size 0.4 :noselect t)
|
||||
(@set :yas-minor-mode 'nose-mode)
|
||||
(@map :map nose-mode-map
|
||||
(set! :popup "*nosetests*" :size 0.4 :noselect t)
|
||||
(set! :yas-minor-mode 'nose-mode)
|
||||
(map! :map nose-mode-map
|
||||
:localleader
|
||||
:n "tr" 'nosetests-again
|
||||
:n "ta" 'nosetests-all
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/python/packages.el
|
||||
|
||||
(@package anaconda-mode)
|
||||
(@package nose)
|
||||
(@package pip-requirements)
|
||||
(package! anaconda-mode)
|
||||
(package! nose)
|
||||
(package! pip-requirements)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-anaconda))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-anaconda))
|
||||
|
|
|
|||
|
|
@ -1,21 +1,21 @@
|
|||
;;; lang/ruby/config.el
|
||||
|
||||
(@def-package ruby-mode
|
||||
(def-package! ruby-mode
|
||||
:mode ("\\.rb$" "\\.rake$" "\\.gemspec$" "\\.?pryrc$"
|
||||
"/\\(Gem\\|Cap\\|Vagrant\\|Rake\\)file$")
|
||||
:interpreter "ruby"
|
||||
:init
|
||||
(add-hook 'ruby-mode-hook 'flycheck-mode)
|
||||
:config
|
||||
(@set :build 'rake 'ruby-mode '+ruby/rake)
|
||||
(@set :company-backend 'ruby-mode '(company-dabbrev-code))
|
||||
(@set :electric 'ruby-mode :words '("else" "end" "elseif"))
|
||||
(@set :repl 'ruby-mode 'inf-ruby)
|
||||
(set! :build 'rake 'ruby-mode '+ruby/rake)
|
||||
(set! :company-backend 'ruby-mode '(company-dabbrev-code))
|
||||
(set! :electric 'ruby-mode :words '("else" "end" "elseif"))
|
||||
(set! :repl 'ruby-mode 'inf-ruby)
|
||||
(setq ruby-deep-indent-paren t)
|
||||
;; Don't interfere with my custom RET behavior
|
||||
(define-key ruby-mode-map [?\n] nil)
|
||||
|
||||
(@map :map ruby-mode-map
|
||||
(map! :map ruby-mode-map
|
||||
:localleader
|
||||
:prefix "r"
|
||||
:desc "toggle block" :nv "b" 'ruby-toggle-block
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
:desc "convert post conditional" :nv "cc" 'ruby-refactor-convert-post-conditional))
|
||||
|
||||
|
||||
(@def-package ruby-refactor
|
||||
(def-package! ruby-refactor
|
||||
:commands
|
||||
(ruby-refactor-extract-to-method ruby-refactor-extract-local-variable
|
||||
ruby-refactor-extract-constant ruby-refactor-add-parameter
|
||||
|
|
@ -35,16 +35,16 @@
|
|||
|
||||
|
||||
;; Highlight doc comments
|
||||
(@def-package yard-mode
|
||||
(def-package! yard-mode
|
||||
:commands yard-mode
|
||||
:init (add-hook 'ruby-mode-hook 'yard-mode))
|
||||
|
||||
|
||||
(@def-package rspec-mode
|
||||
(def-package! rspec-mode
|
||||
:mode ("/\\.rspec$" . text-mode)
|
||||
:init
|
||||
(@associate rspec-mode :match "/\\.rspec$")
|
||||
(@associate rspec-mode :in (ruby-mode yaml-mode) :files ("/spec/"))
|
||||
(associate! rspec-mode :match "/\\.rspec$")
|
||||
(associate! rspec-mode :in (ruby-mode yaml-mode) :files ("/spec/"))
|
||||
(defvar rspec-mode-verifiable-map (make-sparse-keymap))
|
||||
(defvar evilmi-ruby-match-tags
|
||||
'((("unless" "if") ("elsif" "else") "end")
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
;; Rake
|
||||
(("task" "namespace") () "end")))
|
||||
:config
|
||||
(@map :map rspec-mode-map
|
||||
(map! :map rspec-mode-map
|
||||
:localleader
|
||||
:n "tr" 'rspec-rerun
|
||||
:n "ta" 'rspec-verify-all
|
||||
|
|
@ -62,19 +62,19 @@
|
|||
:n "tv" 'rspec-verify))
|
||||
|
||||
|
||||
(@def-package inf-ruby
|
||||
(def-package! inf-ruby
|
||||
:commands (inf-ruby inf-ruby-console-auto)
|
||||
:config
|
||||
(@set :company-backend 'inf-ruby-mode '(company-inf-ruby)))
|
||||
(set! :company-backend 'inf-ruby-mode '(company-inf-ruby)))
|
||||
|
||||
|
||||
(@def-package company-inf-ruby
|
||||
(def-package! company-inf-ruby
|
||||
:after inf-ruby)
|
||||
|
||||
;;
|
||||
;; TODO Frameworks
|
||||
;;
|
||||
|
||||
;; (@def-project rake "rake"
|
||||
;; (def-project! rake "rake"
|
||||
;; :files ("Rakefile"))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/ruby/packages.el
|
||||
|
||||
(@package inf-ruby)
|
||||
(@package rspec-mode)
|
||||
(@package ruby-refactor)
|
||||
(@package yard-mode)
|
||||
(package! inf-ruby)
|
||||
(package! rspec-mode)
|
||||
(package! ruby-refactor)
|
||||
(package! yard-mode)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-inf-ruby))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-inf-ruby))
|
||||
|
|
|
|||
|
|
@ -3,33 +3,33 @@
|
|||
(defvar +rust-cache-dir (concat doom-cache-dir "+rust/")
|
||||
"TODO")
|
||||
|
||||
(@def-package rust-mode
|
||||
(def-package! rust-mode
|
||||
:mode "\\.rs$"
|
||||
:init
|
||||
(add-hook 'rust-mode-hook 'flycheck-mode)
|
||||
:config
|
||||
(@set :build 'cargo-run '(rust-mode toml-mode)
|
||||
(set! :build 'cargo-run '(rust-mode toml-mode)
|
||||
'+rust-is-cargo-project-p '+rust/cargo-run))
|
||||
|
||||
|
||||
(@def-package racer
|
||||
(def-package! racer
|
||||
:after rust-mode
|
||||
:preface
|
||||
:init
|
||||
(@add-hook rust-mode '(racer-mode eldoc-mode flycheck-rust-setup))
|
||||
(add-hook! rust-mode '(racer-mode eldoc-mode flycheck-rust-setup))
|
||||
:config
|
||||
(setq racer-cmd (expand-file-name "racer/target/release/racer" +rust-cache-dir)
|
||||
racer-rust-src-path (expand-file-name "rust/src/" +rust-cache-dir))
|
||||
|
||||
;; TODO Unit test keybinds
|
||||
(@set :company-backend 'rust-mode '(company-racer))
|
||||
(@map :map rust-mode-map :m "gd" 'racer-find-definition))
|
||||
(set! :company-backend 'rust-mode '(company-racer))
|
||||
(map! :map rust-mode-map :m "gd" 'racer-find-definition))
|
||||
|
||||
|
||||
(@def-package company-racer
|
||||
(def-package! company-racer
|
||||
:after racer)
|
||||
|
||||
|
||||
(@def-package flycheck-rust
|
||||
(def-package! flycheck-rust
|
||||
:after rust-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/rust/packages.el
|
||||
|
||||
(@package racer)
|
||||
(@package rust-mode)
|
||||
(package! racer)
|
||||
(package! rust-mode)
|
||||
|
||||
(when (@featurep :feature syntax-checker)
|
||||
(@package flycheck-rust))
|
||||
(when (@featurep :completion company)
|
||||
(@package company-racer))
|
||||
(when (featurep! :feature syntax-checker)
|
||||
(package! flycheck-rust))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-racer))
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; lang/scala/config.el
|
||||
|
||||
(@def-package scala-mode
|
||||
(def-package! scala-mode
|
||||
:mode "\\.s\\(cala\\|bt\\)$"
|
||||
:init
|
||||
(add-hook 'scala-mode-hook 'eldoc-mode)
|
||||
:config
|
||||
(@set :company-backend 'scala-mode '(ensime-company (company-yasnippet))))
|
||||
(set! :company-backend 'scala-mode '(ensime-company (company-yasnippet))))
|
||||
|
||||
|
||||
(@def-package sbt-mode :after scala-mode)
|
||||
(def-package! sbt-mode :after scala-mode)
|
||||
|
||||
|
||||
(@def-package ensime
|
||||
(def-package! ensime
|
||||
:commands (ensime ensime-mode ensime-scala-mode-hook)
|
||||
:init
|
||||
(add-hook 'scala-mode-hook 'ensime-scala-mode-hook))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/scala/packages.el
|
||||
|
||||
(@package ensime)
|
||||
(@package sbt-mode)
|
||||
(@package scala-mode)
|
||||
(package! ensime)
|
||||
(package! sbt-mode)
|
||||
(package! scala-mode)
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
;;; lang/sh/config.el
|
||||
|
||||
(@def-package sh-script ; built-in
|
||||
(def-package! sh-script ; built-in
|
||||
: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 :company-backend 'sh-mode '(company-shell))
|
||||
(@set :electric 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
|
||||
(@set :repl 'sh-mode '+sh/repl)
|
||||
(set! :company-backend 'sh-mode '(company-shell))
|
||||
(set! :electric 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
|
||||
(set! :repl 'sh-mode '+sh/repl)
|
||||
(setq sh-indent-after-continuation 'always)
|
||||
|
||||
;; [pedantry intensifies]
|
||||
(@add-hook sh-mode (setq mode-name "sh"))
|
||||
(add-hook! sh-mode (setq mode-name "sh"))
|
||||
|
||||
(defun +sh|detect-zsh ()
|
||||
(when (and buffer-file-name (string-match-p "\\.zsh\\'" buffer-file-name))
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
(add-hook 'sh-mode-hook '+sh|detect-zsh))
|
||||
|
||||
|
||||
(@def-package company-shell
|
||||
(def-package! company-shell
|
||||
:after sh-script
|
||||
:config (setq company-shell-delete-duplicates t))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/sh/packages.el
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-shell))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-shell))
|
||||
|
|
|
|||
|
|
@ -2,17 +2,17 @@
|
|||
|
||||
;; TODO Set up emacs task runners for fruitstrap
|
||||
|
||||
(@def-package swift-mode
|
||||
(def-package! swift-mode
|
||||
:mode "\\.swift$"
|
||||
:init
|
||||
(add-hook 'swift-mode-hook 'flycheck-mode)
|
||||
:config
|
||||
(@set :repl 'swift-mode 'swift-mode-run-repl) ; TODO test this
|
||||
(@after flycheck (push 'swift flycheck-checkers)))
|
||||
(set! :repl 'swift-mode 'swift-mode-run-repl) ; TODO test this
|
||||
(after! flycheck (push 'swift flycheck-checkers)))
|
||||
|
||||
|
||||
(@def-package company-sourcekit
|
||||
(def-package! company-sourcekit
|
||||
:after swift-mode
|
||||
:config
|
||||
(@set :company-backend 'swift-mode '(company-sourcekit company-yasnippet)))
|
||||
(set! :company-backend 'swift-mode '(company-sourcekit company-yasnippet)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/swift/packages.el
|
||||
|
||||
(@package swift-mode)
|
||||
(package! swift-mode)
|
||||
|
||||
(when (@featurep :completion company)
|
||||
(@package company-sourcekit))
|
||||
(when (featurep! :completion company)
|
||||
(package! company-sourcekit))
|
||||
|
|
|
|||
|
|
@ -1,17 +1,17 @@
|
|||
;;; lang/typescript/config.el
|
||||
|
||||
(@def-package typescript-mode
|
||||
(def-package! typescript-mode
|
||||
:mode "\\.ts$"
|
||||
:init
|
||||
(add-hook 'typescript-mode-hook 'rainbow-delimiters-mode)
|
||||
:config
|
||||
(@set :company-backend 'typescript-mode '(company-tide))
|
||||
(@set :electric 'typescript-mode :chars '(?\} ?\)) :words '("||" "&&"))
|
||||
(set! :company-backend 'typescript-mode '(company-tide))
|
||||
(set! :electric 'typescript-mode :chars '(?\} ?\)) :words '("||" "&&"))
|
||||
|
||||
;; TODO emr definitions for:
|
||||
;; + tide-jump-back
|
||||
;; + (tide-jump-to-definition t)
|
||||
(@set :emr 'typescript-mode
|
||||
(set! :emr 'typescript-mode
|
||||
'(tide-find-references "find usages")
|
||||
'(tide-rename-symbol "rename symbol")
|
||||
'(tide-jump-to-definition "jump to definition")
|
||||
|
|
@ -26,16 +26,16 @@
|
|||
(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)
|
||||
|
||||
(@map :map typescript-mode-map
|
||||
(map! :map typescript-mode-map
|
||||
:m "gd" 'tide-jump-to-definition
|
||||
:m "K" 'tide-documentation-at-point))
|
||||
|
||||
|
||||
(@def-package tide
|
||||
(def-package! tide
|
||||
:after typescript-mode
|
||||
:config
|
||||
(setq tide-format-options
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;; -*- no-byte-compile: t; -*-
|
||||
;;; lang/typescript/packages.el
|
||||
|
||||
(@package tide)
|
||||
(@package typescript-mode)
|
||||
(package! tide)
|
||||
(package! typescript-mode)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
(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)
|
||||
(map! :map* (css-mode-map scss-mode-map less-css-mode-map)
|
||||
:n "M-R" '+css/web-refresh-browser
|
||||
:localleader
|
||||
:nv ";" '+css/append-semicolon
|
||||
|
|
@ -15,33 +15,33 @@
|
|||
;; Packages
|
||||
;;
|
||||
|
||||
(@def-package css-mode
|
||||
(def-package! css-mode
|
||||
:mode "\\.css$"
|
||||
:mode ("\\.scss$" . scss-mode)
|
||||
:init
|
||||
(@add-hook css-mode
|
||||
(add-hook! css-mode
|
||||
'(yas-minor-mode-on flycheck-mode rainbow-mode highlight-numbers-mode
|
||||
;; doom|counsel-css-imenu-setup
|
||||
))
|
||||
|
||||
:config
|
||||
(@set :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
|
||||
(@set :build 'scss 'scss-mode '+css/scss-build))
|
||||
(set! :company-backend '(css-mode scss-mode) '(company-css company-yasnippet))
|
||||
(set! :build 'scss 'scss-mode '+css/scss-build))
|
||||
|
||||
|
||||
(@def-package sass-mode
|
||||
(def-package! sass-mode
|
||||
:mode "\\.sass$"
|
||||
:config
|
||||
(setq sass-command-options '("--style compressed"))
|
||||
(@set :build 'sass 'sass-mode '+css/sass-build)
|
||||
(@set :company-backend 'sass-mode '(company-css company-yasnippet)))
|
||||
(set! :build 'sass 'sass-mode '+css/sass-build)
|
||||
(set! :company-backend 'sass-mode '(company-css company-yasnippet)))
|
||||
|
||||
|
||||
(@def-package less-css-mode
|
||||
(def-package! less-css-mode
|
||||
:mode "\\.less$")
|
||||
|
||||
|
||||
(@def-package stylus-mode
|
||||
(def-package! stylus-mode
|
||||
:mode "\\.styl$"
|
||||
:init (@add-hook stylus-mode '(yas-minor-mode-on flycheck-mode)))
|
||||
:init (add-hook! stylus-mode '(yas-minor-mode-on flycheck-mode)))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
;;; lang/web/config.el
|
||||
|
||||
(@def-package web-mode
|
||||
(def-package! web-mode
|
||||
:mode ("\\.p?html?$"
|
||||
"\\.\\(tpl\\|blade\\)\\(\\.php\\)?$"
|
||||
"\\.erb$"
|
||||
|
|
@ -12,13 +12,13 @@
|
|||
:init
|
||||
(add-hook 'web-mode-hook 'turn-off-smartparens-mode)
|
||||
:config
|
||||
(@set :company-backend 'web-mode '(company-web-html company-yasnippet))
|
||||
(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)
|
||||
|
||||
(@map :map web-mode-map
|
||||
(map! :map web-mode-map
|
||||
(:localleader :n "t" 'web-mode-element-rename)
|
||||
"M-/" 'web-mode-comment-or-uncomment
|
||||
:i "SPC" 'self-insert-command
|
||||
|
|
@ -31,17 +31,17 @@
|
|||
:nv "]T" 'web-mode-element-child
|
||||
:nv "[T" 'web-mode-element-parent)
|
||||
|
||||
(@def-package company-web :after company))
|
||||
(def-package! company-web :after company))
|
||||
|
||||
|
||||
(@def-package haml-mode :mode "\\.haml$")
|
||||
(def-package! haml-mode :mode "\\.haml$")
|
||||
|
||||
|
||||
(@def-package pug-mode
|
||||
(def-package! pug-mode
|
||||
:mode ("\\.jade$" "\\.pug$")
|
||||
:config
|
||||
(@set :company-backend 'pug-mode '(company-yasnippet))
|
||||
(@map :map pug-mode-map
|
||||
(set! :company-backend 'pug-mode '(company-yasnippet))
|
||||
(map! :map pug-mode-map
|
||||
:i [tab] 'doom/dumb-indent
|
||||
:i [backtab] 'doom/dumb-dedent))
|
||||
|
||||
|
|
@ -50,14 +50,14 @@
|
|||
;; Tools
|
||||
;;
|
||||
|
||||
(@def-package emmet-mode
|
||||
(def-package! emmet-mode
|
||||
:commands emmet-mode
|
||||
:preface (defvar emmet-mode-keymap (make-sparse-keymap))
|
||||
:init
|
||||
(@add-hook (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
|
||||
(add-hook! (scss-mode web-mode html-mode haml-mode nxml-mode) 'emmet-mode)
|
||||
:config
|
||||
(setq emmet-move-cursor-between-quotes t)
|
||||
(@map :map emmet-mode-keymap
|
||||
(map! :map emmet-mode-keymap
|
||||
:v "M-e" 'emmet-wrap-with-markup
|
||||
:i "M-e" 'emmet-expand-yas
|
||||
:i "M-E" 'emmet-expand-line))
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
;;; lang/web/config.el
|
||||
|
||||
(@load +html)
|
||||
(@load +css)
|
||||
(load! +html)
|
||||
(load! +css)
|
||||
|
||||
|
||||
;;
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
;;
|
||||
|
||||
;; (defvar bower-conf (make-hash-table :test 'equal))
|
||||
;; (@def-project bower "bower"
|
||||
;; (def-project! bower "bower"
|
||||
;; :modes (web-mode js-mode coffee-mode css-mode sass-mode pug-mode)
|
||||
;; :files ("bower.json")
|
||||
;; :when
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
;; (puthash project-path it bower-conf)))
|
||||
;; t))
|
||||
|
||||
;; (@def-project angularjs "angular"
|
||||
;; (def-project! angularjs "angular"
|
||||
;; :modes (nodejs-project-mode bower-project-mode)
|
||||
;; :when
|
||||
;; (lambda (&rest _)
|
||||
|
|
@ -36,15 +36,15 @@
|
|||
;; (cdr-safe (assq 'devDependencies npm)))))
|
||||
;; (assq 'angular deps))))
|
||||
|
||||
;; (@def-project jekyll ":{"
|
||||
;; (def-project! jekyll ":{"
|
||||
;; :modes (web-mode js-mode coffee-mode css-mode haml-mode pug-mode)
|
||||
;; :match "/\\(\\(css\\|_\\(layouts\\|posts\\|sass\\)\\)/.+\\|.+.html\\)$"
|
||||
;; :files ("config.yml" "_layouts/")
|
||||
;; (@add-hook mode
|
||||
;; (add-hook! mode
|
||||
;; (when (eq major-mode 'web-mode)
|
||||
;; (web-mode-set-engine "django"))))
|
||||
|
||||
;; (@def-project wordpress "wp"
|
||||
;; (def-project! wordpress "wp"
|
||||
;; :modes (php-mode web-mode css-mode haml-mode pug-mode)
|
||||
;; :match "/wp-\\(\\(content\\|admin\\|includes\\)/\\)?.+$"
|
||||
;; :files ("wp-config.php" "wp-content/"))
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
;; n/a
|
||||
|
||||
;; +html.el
|
||||
(@package company-web)
|
||||
(@package emmet-mode)
|
||||
(@package haml-mode)
|
||||
(@package pug-mode)
|
||||
(@package web-mode)
|
||||
(package! company-web)
|
||||
(package! emmet-mode)
|
||||
(package! haml-mode)
|
||||
(package! pug-mode)
|
||||
(package! web-mode)
|
||||
|
||||
;; +css.el
|
||||
(@package less-css-mode)
|
||||
(@package sass-mode)
|
||||
(@package stylus-mode)
|
||||
(package! less-css-mode)
|
||||
(package! sass-mode)
|
||||
(package! stylus-mode)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue