 ;; add pandoc hook
 (add-hook 'markdown-mode-hook 'turn-on-pandoc)
 
+;; yaml
+(require 'yaml-mode)
+(add-to-list 'auto-mode-alist '("\\.yaml$" . yaml-mode))
+(add-to-list 'auto-mode-alist '("\\.yml$" . yaml-mode))
+(defun no-electric-indent-yaml ()
+  (electric-indent-mode -1)
+  (define-key yaml-mode-map [(return)] 'newline-and-indent))
+(add-hook 'yaml-mode-hook 'no-electric-indent-yaml)
 ;; octave mode
 ;; (autoload 'octave-mode "octave-mod" nil t)
 ;; (setq auto-mode-alist

(diminish 'highlight-parentheses-mode)
(diminish 'fic-mode)
(diminish 'auto-complete-mode "AC")

;; don't start in lisp
(setq initial-major-mode 'org-mode)


;; Sometimes you have to
(require 'php-mode)

;; lua
(require 'lua-mode)
(setq lua-indent-level 2)

;; (s)css
(setq scss-compile-at-save nil)
(setq css-indent-level 2)

;; expand-region
(require 'expand-region)
(global-set-key (kbd "<C-prior>") 'er/expand-region)
(global-set-key (kbd "<C-next>") 'er/contract-region)

;; C coding style
(setq c-default-style "linux"
