From 9d5818916af39b32f64e20381a4530efa6247e38 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 28 Jul 2023 16:09:43 +0200 Subject: fix(nix): enable clang-format Signed-off-by: Sefa Eyeoglu --- nix/dev.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nix/dev.nix') diff --git a/nix/dev.nix b/nix/dev.nix index 635c6bb4..e42ac5b4 100644 --- a/nix/dev.nix +++ b/nix/dev.nix @@ -19,8 +19,7 @@ nil.enable = true; clang-format = { - enable = - false; # As most of the codebase is **not** formatted, we don't want clang-format yet + enable = true; types_or = ["c" "c++"]; }; }; -- cgit From 076c189948b89787b34a2a4aded7a9c88f580ee1 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 29 Jul 2023 11:30:33 +0200 Subject: fix: format all languages using clang-format Signed-off-by: Sefa Eyeoglu --- .clang-format | 9 +++++---- nix/dev.nix | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'nix/dev.nix') 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"]; }; }; }; -- cgit