aboutsummaryrefslogtreecommitdiff
path: root/nix/dev.nix
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-08-16 20:46:16 +0100
committerTheKodeToad <TheKodeToad@proton.me>2023-08-16 22:23:38 +0100
commit3e2733d840d24ce4f46b49bca0b8656d4d6e3d87 (patch)
tree386113207514b8071b0122b318c10439259ca83c /nix/dev.nix
parent57430fd189aed592a170d597de61b3acabaaa43d (diff)
parentc88088c91a92a371a9bc2b7384c2897157772b7e (diff)
downloadPrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.tar.gz
PrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.tar.bz2
PrismLauncher-3e2733d840d24ce4f46b49bca0b8656d4d6e3d87.zip
Merge branch 'develop' into better-launch
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
Diffstat (limited to 'nix/dev.nix')
-rw-r--r--nix/dev.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nix/dev.nix b/nix/dev.nix
index 635c6bb4..c39e1565 100644
--- a/nix/dev.nix
+++ b/nix/dev.nix
@@ -19,9 +19,8 @@
nil.enable = true;
clang-format = {
- enable =
- false; # As most of the codebase is **not** formatted, we don't want clang-format yet
- types_or = ["c" "c++"];
+ enable = true;
+ types_or = ["c" "c++" "java" "json" "objective-c"];
};
};
};