style(nix): format with nixfmt

Signed-off-by: seth <getchoo@tuta.io>

default.nix

@@ -1,6 +1,4 @@
-(
+(import (
-  import
-  (
   let
     lock = builtins.fromJSON (builtins.readFile ./flake.lock);
   in
@@ -8,7 +6,4 @@
     url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
     sha256 = lock.nodes.flake-compat.locked.narHash;
   }
-  )
+) { src = ./.; }).defaultNix
-  {src = ./.;}
-)
-.defaultNix

flake.nix

@@ -2,8 +2,8 @@
   description = "A custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once (Fork of MultiMC)";
 
   nixConfig = {
-    extra-substituters = ["https://cache.garnix.io"];
+    extra-substituters = [ "https://cache.garnix.io" ];
-    extra-trusted-public-keys = ["cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="];
+    extra-trusted-public-keys = [ "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g=" ];
   };
 
   inputs = {
@@ -30,12 +30,9 @@
     };
   };
 
-  outputs = {
+  outputs =
-    flake-parts,
+    { flake-parts, pre-commit-hooks, ... }@inputs:
-    pre-commit-hooks,
+    flake-parts.lib.mkFlake { inherit inputs; } {
-    ...
-  } @ inputs:
-    flake-parts.lib.mkFlake {inherit inputs;} {
       imports = [
         pre-commit-hooks.flakeModule
 

nix/README.md

@@ -15,7 +15,6 @@ to temporarily enable it when using `nix` commands.
 Example (NixOS):
 
 ```nix
-{...}:
 {
   nix.settings = {
     trusted-substituters = [
@@ -39,6 +38,7 @@ Example:
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     prismlauncher = {
       url = "github:PrismLauncher/PrismLauncher";
       # Optional: Override the nixpkgs input of prismlauncher to use the same revision as the rest of your flake
@@ -47,19 +47,24 @@ Example:
     };
   };
 
-  outputs = {nixpkgs, prismlauncher}: {
+  outputs =
+    { nixpkgs, prismlauncher }:
+    {
       nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-
         modules = [
-        ({pkgs, ...}: {
+          ./configuration.nix
-          nixpkgs.overlays = [prismlauncher.overlays.default];
 
-          environment.systemPackages = [pkgs.prismlauncher];
+          (
-        })
+            { pkgs, ... }:
+            {
+              nixpkgs.overlays = [ prismlauncher.overlays.default ];
+
+              environment.systemPackages = [ pkgs.prismlauncher ];
+            }
+          )
         ];
       };
-  }
+    };
 }
 ```
 
@@ -74,6 +79,7 @@ Example:
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
     prismlauncher = {
       url = "github:PrismLauncher/PrismLauncher";
       # Optional: Override the nixpkgs input of prismlauncher to use the same revision as the rest of your flake
@@ -82,17 +88,22 @@ Example:
     };
   };
 
-  outputs = {nixpkgs, prismlauncher}: {
+  outputs =
+    { nixpkgs, prismlauncher }:
+    {
       nixosConfigurations.foo = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-
         modules = [
-        ({pkgs, ...}: {
+          ./configuration.nix
-          environment.systemPackages = [prismlauncher.packages.${pkgs.system}.prismlauncher];
+
-        })
+          (
+            { pkgs, ... }:
+            {
+              environment.systemPackages = [ prismlauncher.packages.${pkgs.system}.prismlauncher ];
+            }
+          )
         ];
       };
-  }
+    };
 }
 ```
 
@@ -118,7 +129,6 @@ If you want to avoid rebuilds you may add the garnix cache to your substitutors.
 Example (NixOS):
 
 ```nix
-{...}:
 {
   nix.settings = {
     trusted-substituters = [
@@ -139,10 +149,15 @@ We use flake-compat to allow using this Flake on a system that doesn't use flake
 Example:
 
 ```nix
-{pkgs, ...}: {
+{ pkgs, ... }:
-  nixpkgs.overlays = [(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).overlays.default];
+{
+  nixpkgs.overlays = [
+    (import (
+      builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz"
+    )).overlays.default
+  ];
 
-  environment.systemPackages = [pkgs.prismlauncher];
+  environment.systemPackages = [ pkgs.prismlauncher ];
 }
 ```
 
@@ -154,8 +169,13 @@ This way the installed package is fully reproducible.
 Example:
 
 ```nix
-{pkgs, ...}: {
+{ pkgs, ... }:
-  environment.systemPackages = [(import (builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz")).packages.${pkgs.system}.prismlauncher];
+{
+  environment.systemPackages = [
+    (import (
+      builtins.fetchTarball "https://github.com/PrismLauncher/PrismLauncher/archive/develop.tar.gz"
+    )).packages.${pkgs.system}.prismlauncher
+  ];
 }
 ```
 

nix/dev.nix

@@ -1,10 +1,12 @@
 {
-  perSystem = {
+  perSystem =
+    {
       config,
       lib,
       pkgs,
       ...
-  }: {
+    }:
+    {
       pre-commit.settings = {
         hooks = {
           markdownlint.enable = true;
@@ -15,7 +17,13 @@
 
           clang-format = {
             enable = true;
-          types_or = ["c" "c++" "java" "json" "objective-c"];
+            types_or = [
+              "c"
+              "c++"
+              "java"
+              "json"
+              "objective-c"
+            ];
           };
         };
 
@@ -27,8 +35,11 @@
           ${config.pre-commit.installationScript}
         '';
 
-      inputsFrom = [config.packages.prismlauncher-unwrapped];
+        inputsFrom = [ config.packages.prismlauncher-unwrapped ];
-      buildInputs = with pkgs; [ccache ninja];
+        buildInputs = with pkgs; [
+          ccache
+          ninja
+        ];
       };
 
       formatter = pkgs.nixfmt-rfc-style;

nix/distribution.nix

@@ -1,29 +1,25 @@
+{ inputs, self, ... }:
 {
-  inputs,
+  perSystem =
-  self,
+    { lib, pkgs, ... }:
-  ...
+    {
-}: {
+      packages =
-  perSystem = {
+        let
-    lib,
-    pkgs,
-    ...
-  }: {
-    packages = let
           ourPackages = lib.fix (final: self.overlays.default final pkgs);
-    in {
+        in
-      inherit
+        {
-        (ourPackages)
+          inherit (ourPackages) prismlauncher-unwrapped prismlauncher;
-        prismlauncher-unwrapped
-        prismlauncher
-        ;
           default = ourPackages.prismlauncher;
         };
     };
 
   flake = {
-    overlays.default = final: prev: let
+    overlays.default =
+      final: prev:
+      let
         version = builtins.substring 0 8 self.lastModifiedDate or "dirty";
-    in {
+      in
+      {
         prismlauncher-unwrapped = prev.callPackage ./pkg {
           inherit (inputs) libnbtplusplus;
           inherit version;

nix/pkg/default.nix

@@ -18,16 +18,19 @@
   version,
   libnbtplusplus,
 }:
+
 assert lib.assertMsg (
   gamemodeSupport -> stdenv.isLinux
 ) "gamemodeSupport is only available on Linux.";
-  stdenv.mkDerivation {
+
+stdenv.mkDerivation {
   pname = "prismlauncher-unwrapped";
   inherit version;
 
   src = lib.fileset.toSource {
     root = ../../.;
-      fileset = lib.fileset.unions (map (fileName: ../../${fileName}) [
+    fileset = lib.fileset.unions (
+      map (fileName: ../../${fileName}) [
         "buildconfig"
         "cmake"
         "launcher"
@@ -36,7 +39,8 @@ assert lib.assertMsg (
         "tests"
         "COPYING.md"
         "CMakeLists.txt"
-      ]);
+      ]
+    );
   };
 
   postUnpack = ''
@@ -62,15 +66,13 @@ assert lib.assertMsg (
       tomlplusplus
       zlib
     ]
-      ++ lib.optionals stdenv.isDarwin [darwin.apple_sdk.frameworks.Cocoa]
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
     ++ lib.optional gamemodeSupport gamemode;
 
-    hardeningEnable = lib.optionals stdenv.isLinux ["pie"];
+  hardeningEnable = lib.optionals stdenv.isLinux [ "pie" ];
 
   cmakeFlags =
-      [
+    [ (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs") ]
-        (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
-      ]
     ++ lib.optionals (msaClientID != null) [
       (lib.cmakeFeature "Launcher_MSA_CLIENT_ID" (toString msaClientID))
     ]
@@ -103,4 +105,4 @@ assert lib.assertMsg (
     mainProgram = "prismlauncher";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-  }
+}

nix/pkg/wrapper.nix

@@ -22,8 +22,8 @@
   udev,
   vulkan-loader,
   xorg,
-  additionalLibs ? [],
+  additionalLibs ? [ ],
-  additionalPrograms ? [],
+  additionalPrograms ? [ ],
   controllerSupport ? stdenv.isLinux,
   gamemodeSupport ? stdenv.isLinux,
   jdks ? [
@@ -42,24 +42,29 @@
   # itself can take slightly longer to start
   withWaylandGLFW ? false,
 }:
+
 assert lib.assertMsg (
   controllerSupport -> stdenv.isLinux
 ) "controllerSupport only has an effect on Linux.";
+
 assert lib.assertMsg (
   textToSpeechSupport -> stdenv.isLinux
 ) "textToSpeechSupport only has an effect on Linux.";
+
 assert lib.assertMsg (
   withWaylandGLFW -> stdenv.isLinux
-) "withWaylandGLFW is only available on Linux."; let
+) "withWaylandGLFW is only available on Linux.";
-  prismlauncher' = prismlauncher-unwrapped.override {inherit msaClientID gamemodeSupport;};
+
+let
+  prismlauncher' = prismlauncher-unwrapped.override { inherit msaClientID gamemodeSupport; };
 in
-  symlinkJoin {
+symlinkJoin {
   name = "prismlauncher-${prismlauncher'.version}";
 
-    paths = [prismlauncher'];
+  paths = [ prismlauncher' ];
 
   nativeBuildInputs =
-      [kdePackages.wrapQtAppsHook]
+    [ kdePackages.wrapQtAppsHook ]
     # purposefully using a shell wrapper here for variable expansion
     # see https://github.com/NixOS/nixpkgs/issues/172583
     ++ lib.optional withWaylandGLFW makeWrapper;
@@ -71,8 +76,7 @@ in
     ]
     ++ lib.optional (
       lib.versionAtLeast kdePackages.qtbase.version "6" && stdenv.isLinux
-      )
+    ) kdePackages.qtwayland;
-      kdePackages.qtwayland;
 
   env = {
     waylandPreExec = lib.optionalString withWaylandGLFW ''
@@ -90,7 +94,8 @@ in
       wrapQtAppsHook
     '';
 
-    qtWrapperArgs = let
+  qtWrapperArgs =
+    let
       runtimeLibs =
         [
           # lwjgl
@@ -115,23 +120,20 @@ in
         ++ lib.optional controllerSupport libusb1
         ++ additionalLibs;
 
-      runtimePrograms =
+      runtimePrograms = [
-        [
         glxinfo
         pciutils # need lspci
         xorg.xrandr # needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
-        ]
+      ] ++ additionalPrograms;
-        ++ additionalPrograms;
     in
-      ["--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}"]
+    [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
     ++ lib.optionals stdenv.isLinux [
       "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
       "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
     ];
 
   meta = {
-      inherit
+    inherit (prismlauncher'.meta)
-        (prismlauncher'.meta)
       description
       longDescription
       homepage
@@ -142,4 +144,4 @@ in
       platforms
       ;
   };
-  }
+}