diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..51ca0e1c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,16 @@
+---
+Language:        Cpp
+BasedOnStyle:  Chromium
+IndentWidth: 4
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AllowShortIfStatementsOnASingleLine: false
+BraceWrapping:
+  AfterFunction:   true
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBraces: Custom
+BreakConstructorInitializers: BeforeComma
+ColumnLimit:     140
+Cpp11BracedListStyle: false
diff --git a/.gitignore b/.gitignore
index 2a715656..f5917a46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ CMakeLists.txt.user.*
 /.settings
 /.idea
 /.vscode
-.clang-format
 cmake-build-*/
 Debug