diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000..7f1a0c290c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,23 @@
+---
+BasedOnStyle: Google
+AlignAfterOpenBracket: DontAlign
+AlignConsecutiveDeclarations: Consecutive
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: false
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Always
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeTernaryOperators: false
+BreakConstructorInitializersBeforeComma: true
+BreakStringLiterals: false
+ColumnLimit: 240
+ContinuationIndentWidth: 2
+IndentPPDirectives: BeforeHash
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+ReflowComments: false
+SortIncludes: Never
+SpacesBeforeTrailingComments: 1
diff --git a/.gitignore b/.gitignore
index 8f083e3f6a..cde4390744 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 .cache
-.clang-format
 .direnv
 .DS_Store
 .idea