Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into download_threads

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

3 files changed, 12 insertions, 7 deletions

diff --git a/nix/NIX.md b/nix/NIX.md
index 980d20e8..aa945acc 100644
--- a/nix/NIX.md
+++ b/nix/NIX.md
@@ -53,7 +53,8 @@ home.packages = [ pkgs.prismlauncher ];
 
 ### Without flakes-enabled nix
 
-#### Using channels
+<details>
+<summary>Using channels</summary>
 
 ```sh
 nix-channel --add https://github.com/PrismLauncher/PrismLauncher/archive/master.tar.gz prismlauncher
@@ -61,7 +62,10 @@ nix-channel --update prismlauncher
 nix-env -iA prismlauncher
 ```
 
-#### Using the overlay
+</details>
+
+<details>
+<summary>Using the overlay</summary>
 
 ```nix
 # In your configuration.nix:
@@ -74,6 +78,8 @@ nix-env -iA prismlauncher
 }
 ```
 
+</details>
+
 ## Running ad-hoc
 
 If you're on a flakes-enabled nix you can run the launcher in one-line
diff --git a/nix/default.nix b/nix/default.nix
index 7bad1440..47172927 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -24,9 +24,9 @@
   # Supported systems.
   systems = [
     "x86_64-linux"
-    "x86_64-darwin"
     "aarch64-linux"
-    # Disabled due to qtbase being currently broken for "aarch64-darwin."
+    # Disabled due to our packages not supporting darwin yet.
+    # "x86_64-darwin"
     # "aarch64-darwin"
   ];
 }
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"];
           };
         };
       };