Minor refactor & revision across the board

This commit is contained in:
Henrik Lissner 2018-08-31 02:50:47 +02:00
parent fd8f8c5108
commit 0cf9d1f2f2
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
7 changed files with 19 additions and 19 deletions

View file

@ -67,7 +67,7 @@
;gist ; interacting with github gists ;gist ; interacting with github gists
;macos ; MacOS-specific commands ;macos ; MacOS-specific commands
;make ; run make tasks from Emacs ;make ; run make tasks from Emacs
;magit ; ;magit ; a git porcelain for Emacs
;password-store ; password manager for nerds ;password-store ; password manager for nerds
;pdf ; pdf enhancements ;pdf ; pdf enhancements
;prodigy ; FIXME managing external services & code builders ;prodigy ; FIXME managing external services & code builders
@ -119,7 +119,7 @@
;ruby ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;ruby ; 1.step do {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
;scala ; java, but good ;scala ; java, but good
(sh +fish) ; she sells (ba|z)sh shells on the C xor (sh +fish) ; she sells (ba|z|fi)sh shells on the C xor
;solidity ; do you need a blockchain? No. ;solidity ; do you need a blockchain? No.
;swift ; who asked for emoji variables? ;swift ; who asked for emoji variables?
;web ; the tubes ;web ; the tubes
@ -145,9 +145,9 @@
;; literate config in your `doom-private-dir' whenever it changes. ;; literate config in your `doom-private-dir' whenever it changes.
;literate ;literate
;; The default module set reasonable defaults for Emacs. It also provides ;; The default module sets reasonable defaults for Emacs. It also
;; a Spacemacs-inspired keybinding scheme, a custom yasnippet library, ;; provides a Spacemacs-inspired keybinding scheme, a custom yasnippet
;; and additional ex commands for evil-mode. Use it as a reference for ;; library, and additional ex commands for evil-mode. Use it as a
;; your own modules. ;; reference for your own modules.
(default +bindings +snippets +evil-commands)) (default +bindings +snippets +evil-commands))

View file

@ -141,9 +141,9 @@ point or current buffer. Falls back to dumb-jump, naive
ripgrep/the_silver_searcher text search, then `evil-goto-definition' if ripgrep/the_silver_searcher text search, then `evil-goto-definition' if
evil-mode is active." evil-mode is active."
(interactive (interactive
(list (+lookup--symbol-or-region) current-prefix-arg)) (list (+lookup--symbol-or-region)
(cond ((null identifier) current-prefix-arg))
(user-error "Nothing under point")) (cond ((null identifier) (user-error "Nothing under point"))
((and +lookup-definition-functions ((and +lookup-definition-functions
(+lookup--jump-to :definition identifier))) (+lookup--jump-to :definition identifier)))
@ -187,7 +187,9 @@ point and/or current buffer. Falls back to a naive ripgrep/the_silver_searcher
search otherwise." search otherwise."
(interactive (interactive
(list (+lookup--symbol-or-region))) (list (+lookup--symbol-or-region)))
(cond ((and +lookup-references-functions (cond ((null identifier) (user-error "Nothing under point"))
((and +lookup-references-functions
(+lookup--jump-to :references identifier))) (+lookup--jump-to :references identifier)))
((+lookup--file-search identifier)) ((+lookup--file-search identifier))

View file

@ -1,8 +1,8 @@
;; -*- no-byte-compile: t; -*- ;; -*- no-byte-compile: t; -*-
;;; feature/lookup/packages.el ;;; feature/lookup/packages.el
;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm be ;; `dumb-jump' uses the `helm-build-sync-source' macro, but this requires helm
;; loaded before it is byte-compiled during installation. To ensure this, we ;; be loaded before it is byte-compiled during installation. To ensure this, we
;; declare helm before dumb-jump. ;; declare helm before dumb-jump.
(when (featurep! :completion helm) (when (featurep! :completion helm)
(depends-on! :completion helm)) (depends-on! :completion helm))

View file

@ -77,14 +77,15 @@
:config :config
(set-electric! 'rjsx-mode :chars '(?\} ?\) ?. ?>)) (set-electric! 'rjsx-mode :chars '(?\} ?\) ?. ?>))
(set-docsets! 'rjsx-mode +javascript-docsets) (set-docsets! 'rjsx-mode +javascript-docsets)
(when (featurep! :feature syntax-checker)
(add-hook! 'rjsx-mode-hook (add-hook! 'rjsx-mode-hook
;; jshint doesn't know how to deal with jsx ;; jshint doesn't know how to deal with jsx
(push 'javascript-jshint flycheck-disabled-checkers)) (push 'javascript-jshint flycheck-disabled-checkers)))
;; `rjsx-electric-gt' relies on js2's parser to tell it when the cursor is in ;; `rjsx-electric-gt' relies on js2's parser to tell it when the cursor is in
;; a self-closing tag, so that it can insert a matching ending tag at point. ;; a self-closing tag, so that it can insert a matching ending tag at point.
;; However, the parser doesn't run immediately, so a fast typist can outrun ;; However, the parser doesn't run immediately, so a fast typist can outrun
;; it, causing tags to stay unclosed, so force it to parse. ;; it, causing tags to stay unclosed, so we force it to parse.
(defun +javascript|reparse (n) (defun +javascript|reparse (n)
;; if n != 1, rjsx-electric-gt calls rjsx-maybe-reparse itself ;; if n != 1, rjsx-electric-gt calls rjsx-maybe-reparse itself
(if (= n 1) (rjsx-maybe-reparse))) (if (= n 1) (rjsx-maybe-reparse)))

View file

@ -27,7 +27,6 @@
(file+headline +org-default-notes-file "Inbox") (file+headline +org-default-notes-file "Inbox")
"* %u %?\n%i" :prepend t :kill-buffer t))) "* %u %?\n%i" :prepend t :kill-buffer t)))
(defun +org|init-capture () (defun +org|init-capture ()
(setq org-default-notes-file (expand-file-name +org-default-notes-file org-directory) (setq org-default-notes-file (expand-file-name +org-default-notes-file org-directory)
+org-default-todo-file (expand-file-name +org-default-todo-file org-directory)) +org-default-todo-file (expand-file-name +org-default-todo-file org-directory))

View file

@ -19,7 +19,6 @@
(add-hook 'css-mode-hook #'rainbow-delimiters-mode) (add-hook 'css-mode-hook #'rainbow-delimiters-mode)
(add-hook! (css-mode sass-mode stylus-mode) (add-hook! (css-mode sass-mode stylus-mode)
#'(yas-minor-mode-on #'(yas-minor-mode-on
flycheck-mode
rainbow-mode)) rainbow-mode))

View file

@ -31,7 +31,6 @@
:config :config
;; improve integration w/ org-mode ;; improve integration w/ org-mode
(add-hook 'doom-load-theme-hook #'doom-themes-org-config) (add-hook 'doom-load-theme-hook #'doom-themes-org-config)
;; more Atom-esque file icons for neotree/treemacs ;; more Atom-esque file icons for neotree/treemacs
(when (featurep! :ui neotree) (when (featurep! :ui neotree)
(add-hook 'doom-load-theme-hook #'doom-themes-neotree-config) (add-hook 'doom-load-theme-hook #'doom-themes-neotree-config)