diff options
| -rw-r--r-- | .clang-format | 9 | ||||
| -rw-r--r-- | nix/dev.nix | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.clang-format b/.clang-format index 51ca0e1c..4f99858a 100644 --- a/.clang-format +++ b/.clang-format @@ -1,16 +1,17 @@ --- -Language: Cpp -BasedOnStyle: Chromium +BasedOnStyle: Chromium IndentWidth: 4 +--- +Language: Cpp AlignConsecutiveMacros: false AlignConsecutiveAssignments: false AllowShortIfStatementsOnASingleLine: false BraceWrapping: - AfterFunction: true + AfterFunction: true SplitEmptyFunction: false SplitEmptyRecord: false SplitEmptyNamespace: false BreakBeforeBraces: Custom BreakConstructorInitializers: BeforeComma -ColumnLimit: 140 +ColumnLimit: 140 Cpp11BracedListStyle: false diff --git a/nix/dev.nix b/nix/dev.nix index e42ac5b4..c39e1565 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -20,7 +20,7 @@ clang-format = { enable = true; - types_or = ["c" "c++"]; + types_or = ["c" "c++" "java" "json" "objective-c"]; }; }; }; |