General refactor & cleanup
This commit is contained in:
parent
bc3aee2a4f
commit
392c58ea47
10 changed files with 51 additions and 46 deletions
|
@ -147,9 +147,11 @@ mode is detected.")
|
||||||
|
|
||||||
;; buffer name in frame title
|
;; buffer name in frame title
|
||||||
(setq-default frame-title-format '("DOOM Emacs"))
|
(setq-default frame-title-format '("DOOM Emacs"))
|
||||||
|
|
||||||
;; standardize fringe width
|
;; standardize fringe width
|
||||||
(push (cons 'left-fringe doom-ui-fringe-size) default-frame-alist)
|
(push (cons 'left-fringe doom-ui-fringe-size) default-frame-alist)
|
||||||
(push (cons 'right-fringe doom-ui-fringe-size) default-frame-alist)
|
(push (cons 'right-fringe doom-ui-fringe-size) default-frame-alist)
|
||||||
|
|
||||||
;; no fringe in the minibuffer
|
;; no fringe in the minibuffer
|
||||||
(defun doom|no-fringes-in-minibuffer ()
|
(defun doom|no-fringes-in-minibuffer ()
|
||||||
(set-window-fringes (minibuffer-window) 0 0 nil))
|
(set-window-fringes (minibuffer-window) 0 0 nil))
|
||||||
|
|
|
@ -130,13 +130,13 @@ evil-window-move-* (e.g. `evil-window-move-far-left')"
|
||||||
(select-window that-window))))
|
(select-window that-window))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +evil/window-move-left () "`+evil--window-swap'" (interactive) (+evil--window-swap 'left))
|
(defun +evil/window-move-left () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'left))
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +evil/window-move-right () "`+evil--window-swap'" (interactive) (+evil--window-swap 'right))
|
(defun +evil/window-move-right () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'right))
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +evil/window-move-up () "`+evil--window-swap'" (interactive) (+evil--window-swap 'up))
|
(defun +evil/window-move-up () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'up))
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun +evil/window-move-down () "`+evil--window-swap'" (interactive) (+evil--window-swap 'down))
|
(defun +evil/window-move-down () "See `+evil--window-swap'" (interactive) (+evil--window-swap 'down))
|
||||||
|
|
||||||
;;;###autoload (autoload '+evil:macro-on-all-lines "feature/evil/autoload/evil" nil t)
|
;;;###autoload (autoload '+evil:macro-on-all-lines "feature/evil/autoload/evil" nil t)
|
||||||
(evil-define-operator +evil:macro-on-all-lines (beg end &optional macro)
|
(evil-define-operator +evil:macro-on-all-lines (beg end &optional macro)
|
||||||
|
|
|
@ -63,6 +63,7 @@
|
||||||
:config
|
:config
|
||||||
(setq auto-compile-display-buffer nil
|
(setq auto-compile-display-buffer nil
|
||||||
auto-compile-use-mode-line nil)
|
auto-compile-use-mode-line nil)
|
||||||
|
|
||||||
(defun +emacs-lisp*load-after-compile (success)
|
(defun +emacs-lisp*load-after-compile (success)
|
||||||
"Reload the current emacs-lisp file after it's recompiled, if an older
|
"Reload the current emacs-lisp file after it's recompiled, if an older
|
||||||
version is loaded."
|
version is loaded."
|
||||||
|
|
|
@ -21,7 +21,8 @@
|
||||||
;; Favor local eslint over global, if available
|
;; Favor local eslint over global, if available
|
||||||
(defun +javascript|init-flycheck-elint ()
|
(defun +javascript|init-flycheck-elint ()
|
||||||
(when (derived-mode-p 'js-mode)
|
(when (derived-mode-p 'js-mode)
|
||||||
(when-let ((eslint (expand-file-name "node_modules/eslint/bin/eslint.js" (doom-project-root)))
|
(when-let ((eslint (expand-file-name "node_modules/eslint/bin/eslint.js"
|
||||||
|
(doom-project-root)))
|
||||||
(exists-p (file-exists-p eslint))
|
(exists-p (file-exists-p eslint))
|
||||||
(executable-p (file-executable-p eslint)))
|
(executable-p (file-executable-p eslint)))
|
||||||
(setq-local flycheck-javascript-eslint-executable eslint))))
|
(setq-local flycheck-javascript-eslint-executable eslint))))
|
||||||
|
@ -32,35 +33,35 @@
|
||||||
|
|
||||||
(map! :map js2-mode-map
|
(map! :map js2-mode-map
|
||||||
:localleader
|
:localleader
|
||||||
:n "S" '+javascript/skewer-this-buffer
|
:n "S" #'+javascript/skewer-this-buffer
|
||||||
|
|
||||||
:prefix "r"
|
:prefix "r"
|
||||||
:n "g" 'js2r-add-to-globals-annotation
|
:n "g" #'js2r-add-to-globals-annotation
|
||||||
:n "ca" 'js2r-arguments-to-object
|
:n "ca" #'js2r-arguments-to-object
|
||||||
:n "Xa" 'js2r-contract-array
|
:n "Xa" #'js2r-contract-array
|
||||||
:n "Xf" 'js2r-contract-function
|
:n "Xf" #'js2r-contract-function
|
||||||
:n "Xo" 'js2r-contract-object
|
:n "Xo" #'js2r-contract-object
|
||||||
:nv "d" 'js2r-debug-this
|
:nv "d" #'js2r-debug-this
|
||||||
:n "xa" 'js2r-expand-array
|
:n "xa" #'js2r-expand-array
|
||||||
:n "xf" 'js2r-expand-function
|
:n "xf" #'js2r-expand-function
|
||||||
:n "xo" 'js2r-expand-object
|
:n "xo" #'js2r-expand-object
|
||||||
:v "ef" 'js2r-extract-function
|
:v "ef" #'js2r-extract-function
|
||||||
:v "em" 'js2r-extract-method
|
:v "em" #'js2r-extract-method
|
||||||
:v "ev" 'js2r-extract-var
|
:v "ev" #'js2r-extract-var
|
||||||
:n "F" 'js2r-forward-barf
|
:n "F" #'js2r-forward-barf
|
||||||
:n "f" 'js2r-forward-slurp
|
:n "f" #'js2r-forward-slurp
|
||||||
:v "ii" 'js2r-inject-global-in-iife
|
:v "ii" #'js2r-inject-global-in-iife
|
||||||
:v "iv" 'js2r-inline-var
|
:v "iv" #'js2r-inline-var
|
||||||
:v "p" 'js2r-introduce-parameter
|
:v "p" #'js2r-introduce-parameter
|
||||||
:n "p" 'js2r-localize-parameter
|
:n "p" #'js2r-localize-parameter
|
||||||
:nv "l" 'js2r-log-this
|
:nv "l" #'js2r-log-this
|
||||||
:n "r" 'js2r-rename-var
|
:n "r" #'js2r-rename-var
|
||||||
:n "ss" 'js2r-split-string
|
:n "ss" #'js2r-split-string
|
||||||
:n "sv" 'js2r-split-var-declaration
|
:n "sv" #'js2r-split-var-declaration
|
||||||
:n "ct" 'js2r-ternary-to-if
|
:n "ct" #'js2r-ternary-to-if
|
||||||
:v "u" 'js2r-unwrap
|
:v "u" #'js2r-unwrap
|
||||||
:n "t" 'js2r-var-to-this
|
:n "t" #'js2r-var-to-this
|
||||||
:n "ii" 'js2r-wrap-buffer-in-iife))
|
:n "ii" #'js2r-wrap-buffer-in-iife))
|
||||||
|
|
||||||
|
|
||||||
;; A find-{definition,references} backend for js2-mode. NOTE The xref API is
|
;; A find-{definition,references} backend for js2-mode. NOTE The xref API is
|
||||||
|
|
|
@ -54,7 +54,7 @@
|
||||||
|
|
||||||
:config
|
:config
|
||||||
(map! :map reftex-mode-map
|
(map! :map reftex-mode-map
|
||||||
:leader :n ";" 'reftex-toc)
|
:localleader :n ";" 'reftex-toc)
|
||||||
|
|
||||||
(add-hook! 'reftex-toc-mode-hook
|
(add-hook! 'reftex-toc-mode-hook
|
||||||
(reftex-toc-rescan)
|
(reftex-toc-rescan)
|
||||||
|
|
|
@ -17,15 +17,6 @@
|
||||||
;; '(tide-documentation-at-point "current type documentation")
|
;; '(tide-documentation-at-point "current type documentation")
|
||||||
;; '(tide-restart-server "restart tide server"))
|
;; '(tide-restart-server "restart tide server"))
|
||||||
|
|
||||||
(defun +typescript|tide-setup ()
|
|
||||||
(when (or (eq major-mode 'typescript-mode)
|
|
||||||
(and (eq major-mode 'web-mode)
|
|
||||||
buffer-file-name
|
|
||||||
(string= (file-name-extension buffer-file-name) "tsx")))
|
|
||||||
(tide-setup)
|
|
||||||
(flycheck-mode +1)
|
|
||||||
(eldoc-mode +1)))
|
|
||||||
(add-hook! (typescript-mode web-mode) #'+typescript|tide-setup)
|
|
||||||
(map! :localleader
|
(map! :localleader
|
||||||
:m "fh" #'tide-documentation-at-point))
|
:m "fh" #'tide-documentation-at-point))
|
||||||
|
|
||||||
|
@ -43,5 +34,15 @@
|
||||||
'(:insertSpaceAfterFunctionKeywordForAnonymousFunctions t
|
'(:insertSpaceAfterFunctionKeywordForAnonymousFunctions t
|
||||||
:placeOpenBraceOnNewLineForFunctions nil))
|
:placeOpenBraceOnNewLineForFunctions nil))
|
||||||
|
|
||||||
|
(defun +typescript|init-tide ()
|
||||||
|
(when (or (eq major-mode 'typescript-mode)
|
||||||
|
(and (eq major-mode 'web-mode)
|
||||||
|
buffer-file-name
|
||||||
|
(equal (file-name-extension buffer-file-name) "tsx")))
|
||||||
|
(tide-setup)
|
||||||
|
(flycheck-mode +1)
|
||||||
|
(eldoc-mode +1)))
|
||||||
|
(add-hook! (typescript-mode web-mode) #'+typescript|init-tide)
|
||||||
|
|
||||||
(advice-add #'tide-project-root :override #'doom*project-root))
|
(advice-add #'tide-project-root :override #'doom*project-root))
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
:init
|
: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)
|
(map! :map* (css-mode-map scss-mode-map less-css-mode-map)
|
||||||
:leader :n ";" #'counsel-css))
|
:localleader :n ";" #'counsel-css))
|
||||||
|
|
||||||
|
|
||||||
(def-package! rainbow-mode
|
(def-package! rainbow-mode
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
(defvar-local doom-electric-indent-words '()
|
(defvar-local doom-electric-indent-words '()
|
||||||
"TODO")
|
"TODO")
|
||||||
|
|
||||||
(setq electric-indent-chars '(?\n ?\^?))
|
(setq-default electric-indent-chars '(?\n ?\^?))
|
||||||
|
|
||||||
(defun +electric-indent|char (_c)
|
(defun +electric-indent|char (_c)
|
||||||
(when (and (eolp) doom-electric-indent-words)
|
(when (and (eolp) doom-electric-indent-words)
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
(setq eldoc-in-minibuffer-show-fn #'+doom-modeline--show-eldoc)
|
(setq eldoc-in-minibuffer-show-fn #'+doom-modeline--show-eldoc)
|
||||||
(eldoc-in-minibuffer-mode +1))
|
(eldoc-in-minibuffer-mode +1))
|
||||||
|
|
||||||
;; anzu and evil-anzu make it possible to display current/total in the
|
;; anzu and evil-anzu expose current/total state that can be displayed in the
|
||||||
;; mode-line.
|
;; mode-line.
|
||||||
(def-package! evil-anzu
|
(def-package! evil-anzu
|
||||||
:when (featurep 'evil)
|
:when (featurep 'evil)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue