aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dot_emacs12
-rw-r--r--private_dot_ssh/config.tmpl1
2 files changed, 3 insertions, 10 deletions
diff --git a/dot_emacs b/dot_emacs
index e6f222f..2e8dc1d 100644
--- a/dot_emacs
+++ b/dot_emacs
@@ -85,18 +85,10 @@
(?1 delete-other-windows "Delete Other Windows")
(?? aw-show-dispatch-help))))
-(use-package auto-indent-mode
+(use-package aggressive-indent
:ensure t
:config
- (auto-indent-global-mode)
- :custom
- (auto-indent-next-pair-timer-interval
- (quote ((css-mode 1.5)
- (haskell-mode 1.5)
- (python-mode 1.5)
- (latex-mode 1.5)
- (coq-mode 1.5)
- (default 0.0005)))))
+ (global-aggressive-indent-mode 1))
(use-package bibtex
:mode ("\\.bib\'" . bibtex-mode)
diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl
index 54572cd..0f5890d 100644
--- a/private_dot_ssh/config.tmpl
+++ b/private_dot_ssh/config.tmpl
@@ -107,6 +107,7 @@ Host rsync.net
Hostname de1270.rsync.net
UserKnownHostsFile ~/.ssh/known_hosts.d/rsync.net
User de1270
+ VisualHostKey no
Host github.com *.github.com
# Don't spam known_hosts with github's many IPs
# Especially given that they just use the same key