summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2015-12-06 23:40:20 -0500
committerLuke Shumaker <shumakl@purdue.edu>2015-12-06 23:40:20 -0500
commit989314a3677f520de767ceff5137a7f13c22a204 (patch)
treea55847e7c7a29bf0918d34908579c34c2520a186
parentdd81b9c54a7f4fffbf1e8e7ae04d09c409750c05 (diff)
update ~/.config/emacs
-rw-r--r--.config/emacs/custom.el15
-rw-r--r--.config/emacs/init.el6
2 files changed, 12 insertions, 9 deletions
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index 8291602..82aebfb 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -9,13 +9,6 @@
("9f443833deb3412a34d2d2c912247349d4bd1b09e0f5eaba11a3ea7872892000" "bb08c73af94ee74453c90422485b29e5643b73b05e8de029a6909af6a3fb3f58" "82d2cac368ccdec2fcc7573f24c3f79654b78bf133096f9b40c20d97ec1d8016" "1b8d67b43ff1723960eb5e0cba512a2c7a2ad544ddb2533a90101fd1852b426e" "628278136f88aa1a151bb2d6c8a86bf2b7631fbea5f0f76cba2a0079cd910f7d" "06f0b439b62164c6f8f84fdda32b62fb50b6d00e8b01c2208e55543a6337433a" "1e7e097ec8cb1f8c3a912d7e1e0331caeed49fef6cff220be63bd2a6ba4cc365" "71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(erc-nick "lukeshu")
'(explicit-shell-file-name "/bin/bash")
- '(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))))
'(graphviz-dot-auto-indent-on-semi nil)
'(org-latex-default-packages-alist
(quote
@@ -38,11 +31,19 @@
(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)
'(scss-compile-at-save 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 90fda1b..39dcf0e 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -112,6 +112,8 @@
(: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.
@@ -136,6 +138,8 @@
nginx-mode
php-mode-improved
scss-mode
+ go-mode
+ yaml-mode
)))
@@ -187,8 +191,6 @@ sh-script.el is broken."
(advice-add 'term-handle-ansi-terminal-messages :after
#'term-handle-ansi-terminal-messages--uniquify)
-(require 'go-mode-load nil t)
-
;; Make the mouse work in an xterm