aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-07-29 11:30:33 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2023-08-02 18:35:08 +0200
commit076c189948b89787b34a2a4aded7a9c88f580ee1 (patch)
tree233a488ce712a8828e1084b32c274cf0951cd367
parent9f66f6495ad1f91d7cdb1677431069f27bc24f58 (diff)
downloadPrismLauncher-076c189948b89787b34a2a4aded7a9c88f580ee1.tar.gz
PrismLauncher-076c189948b89787b34a2a4aded7a9c88f580ee1.tar.bz2
PrismLauncher-076c189948b89787b34a2a4aded7a9c88f580ee1.zip
fix: format all languages using clang-format
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
-rw-r--r--.clang-format9
-rw-r--r--nix/dev.nix2
2 files changed, 6 insertions, 5 deletions
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"];
};
};
};