update ~/.config/emacs

2 files changed, 11 insertions, 1 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 55af402..a33c87f 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -31,10 +31,18 @@
    (quote
     ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f")))
  '(org-src-fontify-natively t)
+ '(ruby-deep-arglist nil)
+ '(ruby-deep-indent-paren nil)
+ '(safe-local-variable-values
+   (quote
+    ((Nginx-indent-tabs-mode)
+     (Nginx-indent-level . 4)
+     (Nginx-indent-level . 8))))
  '(scroll-bar-mode nil)
  '(send-mail-function (quote smtpmail-send-it))
  '(smtpmail-smtp-server "plus.smtp.mail.yahoo.com")
  '(smtpmail-smtp-service 587)
+ '(tramp-use-ssh-controlmaster-options nil)
  '(uniquify-buffer-name-style (quote post-forward-angle-brackets) nil (uniquify)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 38f6e77..d102269 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -105,6 +105,7 @@
                        (set (make-local-variable 'tab-width) 2)
                        (set (make-local-variable 'indent-tabs-mode) nil)
                        )))
+  (:name go-mode :type elpa)
   (:name graphviz-dot-mode :type elpa)
   (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
@@ -112,7 +113,7 @@
   (:name nginx-mode :type elpa
    :after (put 'nginx-indent-level 'safe-local-variable 'integerp))
   (:name scss-mode :type elpa)
-  (:name go-mode :type elpa)
+  (:name yaml-mode :type elpa)
   ))
 ;; What packages el-get should install, both from above, and it's
 ;; internal list of sources.
@@ -138,6 +139,7 @@
     nginx-mode
     php-mode-improved
     scss-mode
+    yaml-mode
     )))