update editorconfig, charm

.editorconfig

@@ -9,34 +9,47 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf-8
 trim_trailing_whitespace = true
-
-# Too many exceptions
-max_line_length = 800
-
+max_line_length = 120
 spaces_around_operators = true
 spaces_around_brackets = false
 indent_style = space
 indent_size = 2
 indent_brace_style = K&R
 curly_bracket_next_line = false
-continuation_indent_size 4
+continuation_indent_size = 4
 
-# Makefiles
-[{Makefile*,*.mf}]
+# Make, Go
+[{Makefile*,*.mf,*.go}]
 indent_style = tab
 
+# F#
+[{*.fs,*.fsx}]
+indent_style = space
+
 # Markdown
 [{*.md,*.markdown}]
 indent_size = none
 
+# PEP8, Docker
+[{*.py,Dockerfile*}]
+indent_size = 4
+
 # JavaScript
 [*.js]
 quote_type = single
 
 # Lisp
-[{*.lisp,*.scm,*.rkt,*.lsp,*.clj,*.el}]
+[{*.lisp,*.scm,*.rkt,*.lsp,*.clj,*.el,*.emacs}]
 indent_size = none
 
+# Pagragraph-oriented text
+[{*.txt,*.text,*.xml,*.*htm*,*.erb,*.tex,*.md,*.markdown,*.textile,*.ps,Makefile*,Rakefile*,*.mf,*.plist,*.bat,*.*sh,.*profile*,.editorconfig,.gitignore*,.*rc*,*.profile,*.epf,*.cfg,Dockerfile*}]
+max_line_length = none
+
+# Bashate
+[{*.sh,*.profile*,*.bash*}]
+indent_size = 4
+
 # Windows files
-[{*.bat,*reg,*.ps1,*.vbs,*.cs,*.csproj,*.fs,*.sln,*.xaml*,*.ahk}]
+[{*.cmd,*.bat,*reg,*.ps1,*.vbs,*.cs,*.csproj,*.fs,*.sln,*.xaml*,*.ahk}]
 end_of_line = crlf

Makefile

@@ -5,17 +5,17 @@ all: test
 test: bin/hellocharm
 	bin/hellocharm
 
-bin/hellocharm: HelloCharm.hs HsCharm.hs charm/charm.c charm/charm.h
-	mkdir -p bin/
-	ghc $(FLAGS) -o bin/hellocharm HelloCharm.hs HsCharm.hs charm/charm.c charm/charm.h
+bin/hellocharm: HelloCharm.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h
+	mkdir -p bin
+	ghc $(FLAGS) -o bin/hellocharm HelloCharm.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h
 
-bin/ddr: DDR.hs HsCharm.hs charm/charm.c charm/charm.h
-	mkdir -p bin/
-	ghc $(FLAGS) -o bin/ddr DDR.hs HsCharm.hs charm/charm.c charm/charm.h -package random-extras
+bin/ddr: DDR.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h
+	mkdir -p bin
+	ghc $(FLAGS) -o bin/ddr DDR.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h -package random-extras
 
-bin/rl: RL.hs HsCharm.hs charm/charm.c charm/charm.h
-	mkdir -p bin/
-	ghc $(FLAGS) -o bin/rl RL.hs HsCharm.hs charm/charm.c charm/charm.h -package random-extras -package base
+bin/rl: RL.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h
+	mkdir -p bin
+	ghc $(FLAGS) -o bin/rl RL.hs HsCharm.hs charm/lib/charm.c charm/lib/charm.h -package random-extras -package base
 
 hlint:
 	hlint .

README.md

@@ -7,6 +7,7 @@
 
 # EXAMPLE
 
-    $ git submodule init
-    $ git submodule update
-	$ make
+```
+$ git submodule update --init --recursive
+$ make
+```