diff --git a/.clang-format b/.clang-format
index 51ca0e1c1..4f99858ad 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 e42ac5b4a..c39e15653 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"];
           };
         };
       };