From 639a5ff9bdfa29c9c1367c99e571a8b3b8c6b77a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 17 Jul 2014 05:53:01 -0400
Subject: [PATCH] Convert to tabs, add :retab, more file associations

---
 init.el              | 41 ++++++++++++++++++++++-------------------
 init/core-editor.el  |  8 ++++----
 init/core-keymaps.el |  1 +
 init/core-ui.el      |  3 ++-
 4 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/init.el b/init.el
index 3702cb1cf..0011d56bc 100644
--- a/init.el
+++ b/init.el
@@ -37,24 +37,24 @@
 ;;;;;;;;;;;;;;;;;;;;;;;
 
 (dolist (module '(
-      core               ; Emacs core settings
-      core-packages      ; Package init & management
-      core-ui            ; Look and behavior of the emacs UI
-      core-editor        ; Text/code editor settings and behavior
-      core-osx           ; OSX-specific settings & functions
-      core-project       ; Project navigation settings & packages
+	core               ; Emacs core settings
+	core-packages      ; Package init & management
+	core-ui            ; Look and behavior of the emacs UI
+	core-editor        ; Text/code editor settings and behavior
+	core-osx           ; OSX-specific settings & functions
+	core-project       ; Project navigation settings & packages
 
-      ;; Editor essentials
-      mod-ac             ; Auto-complete engine & settings
-      mod-git            ; GIT tools/settings
-      mod-fly            ; Syntax and spell checkers
-      ; mod-webdev         ; Webdev tools (sass, js, etc)
-      ; mod-gamedev        ; Gamedev tools (C++, love2D, html5)
-      ; mod-shell          ; Goodies for ansi-term
+	;; Editor essentials
+	mod-ac             ; Auto-complete engine & settings
+	mod-git            ; GIT tools/settings
+	mod-fly            ; Syntax and spell checkers
+	; mod-webdev         ; Webdev tools (sass, js, etc)
+	; mod-gamedev        ; Gamedev tools (C++, love2D, html5)
+	; mod-shell          ; Goodies for ansi-term
 
-      ;; Must be last!
-      core-keymaps       ; Global & local keybindings for all modes
-      ))
+	;; Must be last!
+	core-keymaps       ; Global & local keybindings for all modes
+	))
   (require module))
 
 
@@ -66,6 +66,9 @@
 (associate-mode 'org-mode       '(".org" ".gtd") t)
 (associate-mode 'js2-mode       '(".js" ".json"))
 (associate-mode 'web-mode       '(".html" ".htm" ".phtml" ".tpl" ".tpl.php" ".erb"))
-; (associate-mode 'lua-mode ".lua")
-;; (associate-mode 'yaml-mode ".yml")
-;; (associate-mode 'python-mode ".py")
+(associate-mode 'lua-mode       '(".lua"))
+(associate-mode 'yaml-mode      '(".yml"))
+(associate-mode 'python-mode    '(".py"))
+(associate-mode 'c++-mode       '(".h") t)
+
+;;
diff --git a/init/core-editor.el b/init/core-editor.el
index 0afb14842..4d63db960 100644
--- a/init/core-editor.el
+++ b/init/core-editor.el
@@ -15,7 +15,7 @@
     yasnippet               ; snippets: expand with tab
     rainbow-delimiters      ; colored matching parenthesis
     rainbow-mode            ; highlight color codes
-    highlight-indentation   ; visual indentation guides
+    ;; highlight-indentation   ; visual indentation guides
     saveplace               ; restore cursor position on buffer load
     volatile-highlights     ; temporarily highlight changes on undo/yank
     anzu                    ; display current + total matches searching
@@ -34,8 +34,8 @@
 (setq blink-matching-paren nil)     ; disable blink-matching-paren
 (setq-default
   tab-width             4           ; set tab width to 4 for all buffers
-  indent-tabs-mode      nil         ; always replace tabs with spaces
-  tab-always-indent     nil)
+  indent-tabs-mode      t           ; always replace tabs with spaces
+  tab-always-indent     t)
 
 ;; do not soft-wrap lines
 (setq-default truncate-lines t)
@@ -43,7 +43,7 @@
 
 ;; Prettify code-related major modes
 (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
-(add-hook 'prog-mode-hook #'highlight-indentation-mode)
+;; (add-hook 'prog-mode-hook #'highlight-indentation-mode)
 
 ;; Remove trailing whitespace
 (add-hook 'before-save-hook 'delete-trailing-whitespace)
diff --git a/init/core-keymaps.el b/init/core-keymaps.el
index 7b861c17e..861d96bb3 100644
--- a/init/core-keymaps.el
+++ b/init/core-keymaps.el
@@ -175,6 +175,7 @@
 
 ;; (cmap "e[dit]" 'find-file)
 ;; (cmap "n[ew]" ')
+(cmap "retab" 'indent-region)
 
 
 ;;;; Keymap fixes ;;;;;;;;;;;;;;;
diff --git a/init/core-ui.el b/init/core-ui.el
index 4dcea2116..3d401ce83 100644
--- a/init/core-ui.el
+++ b/init/core-ui.el
@@ -15,8 +15,9 @@
       (diminish 'volatile-highlights-mode)
       (diminish 'undo-tree-mode)
       (diminish 'auto-complete-mode)
-      (diminish 'highlight-indentation-mode)
       (diminish 'flyspell-mode " ?")
+	  (diminish 'projectile-mode)
+	  (diminish 'yas-minor-mode)
       ))
 
 ;; Sane scroll settings