diff --git a/home/clang-format b/home/clang-format
index 0b174ac..330f4e7 100644
--- a/home/clang-format
+++ b/home/clang-format
@@ -1,4 +1,3 @@
-BasedOnStyle: Google
 AccessModifierOffset: -4
 AlignArrayOfStructures: Right
 AlignConsecutiveAssignments: true
@@ -8,10 +7,12 @@ AllowShortBlocksOnASingleLine: Empty
 AllowShortCaseLabelsOnASingleLine: true
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: Inline
+BasedOnStyle: Google
 BinPackArguments: false
 BinPackParameters: false
-BreakBeforeBinaryOperators: NonAssignment
+# BreakBeforeBinaryOperators: NonAssignment  # TODO: enable on clang-format v20
 BreakBeforeBraces: WebKit
+BreakBinaryOperations: OnePerLine
 BreakConstructorInitializers: BeforeComma
 BreakInheritanceList: BeforeComma
 ContinuationIndentWidth: 8