X-Git-Url: https://code.delx.au/dotemacs/blobdiff_plain/9715cdd6761717a7465f809b8a6e0218cceaa66e..1107bced8c2967f75fcd70c4aa35163e3f5ffb36:/lisp/my-file-modes.el

diff --git a/lisp/my-file-modes.el b/lisp/my-file-modes.el
index 33bfcad..142e1a0 100644
--- a/lisp/my-file-modes.el
+++ b/lisp/my-file-modes.el
@@ -1,9 +1,16 @@
+;;; -*- lexical-binding: t -*-
+
 (setq-default indent-tabs-mode nil)
-(setq-default c-basic-offset 4)
-(setq-default python-indent-offset 4)
+(setq-default require-final-newline t)
+
+(require 'cc-mode)
+(setq c-auto-align-backslashes nil)
+(setq c-default-style '((java-mode . "java")
+                        (awk-mode . "awk")
+                        (other . "stroustrup")))
 
 (require 'coffee-mode)
-(setq-default coffee-tab-width 4)
+(setq coffee-tab-width 4)
 
 (require 'dockerfile-mode)
 
@@ -18,24 +25,46 @@
 (require 'js)
 (add-hook 'json-mode-hook
           (lambda ()
-            (make-local-variable 'js-indent-level)
-            (setq js-indent-level 2)))
+            (set (make-local-variable 'js-indent-level) 2)))
 
 (require 'js2-mode)
 (add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
 (add-to-list 'interpreter-mode-alist '("node" . js2-mode))
+(setq js2-concat-multiline-strings 'eol)
+(setq js2-highlight-external-variables nil)
+(setq js2-mode-show-parse-errors nil)
+(setq js2-mode-show-strict-warnings nil)
+(setq js--declaration-keyword-re "x^") ; declarations should have normal indentation
+(when (require 'tern nil 'noerror)
+  (add-hook 'js2-mode-hook (lambda () (tern-mode t))))
+
+(when (require 'ledger-mode nil 'noerror)
+  (add-to-list 'auto-mode-alist '("\\.ledger\\'" . ledger-mode))
+  (setq ledger-post-amount-alignment-column 72))
 
 (require 'markdown-mode)
+(define-key markdown-mode-map (kbd "M-{") 'markdown-beginning-of-block)
+(define-key markdown-mode-map (kbd "M-}") 'markdown-end-of-block)
+(setq markdown-command "markdown_py -x markdown.extensions.smart_strong -x markdown.extensions.fenced_code -x markdown.extensions.nl2br")
+(add-to-list 'auto-mode-alist '("\\.mdown\\'" . markdown-mode) t)
 
 (require 'pkgbuild-mode)
 
 (require 'python)
 (add-hook 'python-mode-hook
-          (lambda () (setq forward-sexp-function nil)))
+          (lambda ()
+            (setq forward-sexp-function nil)
+            (set (make-local-variable 'python-indent-offset) 4)))
+
 
 (require 'scala-mode)
 
 (require 'slime)
-(setq inferior-lisp-program "clisp")
+(setq inferior-lisp-program "sbcl")
+
+(require 'ssh-file-modes)
+
+(when (require 'stumpwm-mode nil 'noerror)
+  (add-to-list 'auto-mode-alist '("/\\.stumpwmrc\\'" . stumpwm-mode)))
 
 (require 'yaml-mode)