misc

2 files changed, 13 insertions, 1 deletions

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index a099221..8e72fec 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -33,6 +33,9 @@
    (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)
+ '(package-selected-packages
+   (quote
+    (yaml-mode smart-tabs-mode scss-mode sass-mode page-break-lines nginx-mode mediawiki markdown-mode jabber graphviz-dot-mode gradle-mode go-mode glsl-mode editorconfig dtrt-indent coffee-mode cmake-mode bison-mode)))
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index f1650a4..9fe3b9c 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -99,6 +99,7 @@
                   (mapcar 'car smart-tabs-insinuate-alist))))
   ;; Major modes
   (:name bison-mode :type elpa)
+  (:name cmake-mode :type elpa)
   (:name coffee-mode :type elpa
    :after (add-hook 'coffee-mode-hook
                     '(lambda ()
@@ -107,6 +108,7 @@
                        )))
   (:name glsl-mode :type elpa)
   (:name go-mode :type elpa)
+  (:name gradle-mode :type elpa)
   (:name graphviz-dot-mode :type elpa)
   (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
@@ -116,6 +118,7 @@
    :after (put 'nginx-indent-level 'safe-local-variable 'integerp))
   (:name scss-mode :type elpa)
   (:name yaml-mode :type elpa)
+  (:name editorconfig :type elpa)
   ))
 ;; What packages el-get should install, both from above, and its
 ;; internal list of sources.
@@ -125,6 +128,7 @@
   '(dtrt-indent
     page-break-lines
     smart-tabs-mode
+    editorconfig
     )
   ;; Major modes
   (if (file-exists-p "~/Maildir") ; wanderlust is huge, only use on emailing boxes
@@ -133,13 +137,14 @@
   '(
     ;;nxhtml ; nxhtml is invasive, only enable if actively using
     bison-mode
+    cmake-mode
     coffee-mode
     glsl-mode
     go-mode
+    gradle-mode
     graphviz-dot-mode
     haml-mode
     markdown-mode
-    yaml-mode
     mediawiki
     nginx-mode
     php-mode-improved
@@ -206,6 +211,10 @@ sh-script.el is broken."
                (if xterm-mouse-mode (xterm-mouse-mode 1))
                )))
 
+;; Make TRAMP obey ~/.ssh/config for ControlMaster.  For some reason,
+;; customize doesn't correctly set this.
+(setq tramp-use-ssh-controlmaster-options nil)
+
 ;; Use mailcrypt to encrypt/decrypt email
 (when (require 'mailcrypt nil t)
   (mc-setversion "gpg")