fix some clang-format rules

.clang-format

@@ -1,30 +1,38 @@
-AlignConsecutiveMacros: true
-AlignEscapedNewlines: Left
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: false
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
 BasedOnStyle: LLVM
-BreakBeforeBinaryOperators: None
-BreakStringLiterals: false
-BreakBeforeBraces: Allman
-ColumnLimit: 0
+
+ColumnLimit: 160
+IndentWidth: 4
+UseTab: Never
+
+ReflowComments: true
+
+SortIncludes: true
 IncludeBlocks: Regroup
 IncludeCategories:
     - Regex: '^<.*>$'
       Priority: 1
     - Regex: '^".*"$'
       Priority: 2
+
+AlignConsecutiveMacros: true
+AlignEscapedNewlines: Left
+
 IndentCaseLabels: false
-IndentWidth: 4
 PointerAlignment: Right
-ReflowComments:  true
-SortIncludes: true
-SortUsingDeclarations: true
-SpaceBeforeParens: ControlStatements
+
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+
+AlwaysBreakAfterReturnType: None
+BreakBeforeBinaryOperators: All
+BreakBeforeTernaryOperators: true
+BreakStringLiterals: false
+BreakBeforeBraces: Attach
+
+SpaceBeforeParens: ControlStatementsExceptControlMacros
 SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 SpacesInContainerLiterals: true