aboutsummaryrefslogtreecommitdiffstats
path: root/emacs/.emacs.d/init.el
diff options
context:
space:
mode:
authorGravatar Tom Willemse2018-07-17 00:38:59 -0700
committerGravatar Tom Willemse2018-07-17 00:38:59 -0700
commit91d97b939abb761906b66f98c0ddb812e42aec25 (patch)
tree948ad958028892a0b645047b7efe34f42fc9703b /emacs/.emacs.d/init.el
parentf97ac07cfb6c58446b6966cdf3971c0c97537308 (diff)
parente31e7663ab77266d6572f8f5c8e786436361ea2d (diff)
downloadnew-dotfiles-91d97b939abb761906b66f98c0ddb812e42aec25.tar.gz
new-dotfiles-91d97b939abb761906b66f98c0ddb812e42aec25.zip
Merge remote-tracking branch 'origin/stripped-down' into stripped-down
Diffstat (limited to 'emacs/.emacs.d/init.el')
-rw-r--r--emacs/.emacs.d/init.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 3674054..4503849 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -230,6 +230,7 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
(setq projectile-completion-system 'ivy)
(add-to-list 'projectile-project-root-files "yarn.lock")
+(add-to-list 'projectile-project-root-files "fabfile.py")
(with-eval-after-load 'server
(diminish 'server-buffer-clients
@@ -347,6 +348,10 @@ ORIG-FUN is the function being wrapped, ARGS are the arguments specified"
(with-eval-after-load 'org (load "oni-org-init"))
+(with-eval-after-load 'elec-pair (load "oni-elec-pair-init"))
+
+(with-eval-after-load 'flycheck (load "oni-flycheck-init"))
+
(add-to-list 'grep-files-aliases '("js" . "*.js *.jsx *.json"))
(add-to-list 'grep-files-aliases '("css" . "*.css *.less *.sass *.scss"))
(add-to-list 'grep-files-aliases '("php" . "*.php *.inc *.module"))