Reformat and add formatters to nix env

flake.nix

@@ -1,5 +1,6 @@
 {
-  description = "Ready-made templates for easily creating flake-driven environments";
+  description =
+    "Ready-made templates for easily creating flake-driven environments";
 
   outputs = { self }: {
     templates = {

gleam/flake.nix

@@ -16,15 +16,12 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = [
+            buildInputs = [ gleamPkg ];
-              gleamPkg
-            ];
 
             shellHook = ''
               ${gleamPkg}/bin/gleam --version
             '';
           };
         };
-      }
+      });
-    );
 }

go1.17/flake.nix

@@ -46,6 +46,5 @@
             '';
           };
         };
-      }
+      });
-    );
 }

go1.18/flake.nix

@@ -46,6 +46,5 @@
             '';
           };
         };
-      }
+      });
-    );
 }

java/flake.nix

@@ -19,15 +19,12 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = [
+            buildInputs = [ java ] ++ buildTools;
-              java
-            ] ++ buildTools;
 
             shellHook = ''
               ${java}/bin/java -version
             '';
           };
         };
-      }
+      });
-    );
 }

nix/flake.nix

@@ -13,7 +13,7 @@
 
         nix = pkgs.nixUnstable;
 
-        helpers = with pkgs; [ nixpkgs-fmt statix ];
+        helpers = with pkgs; [ nixfmt nixpkgs-fmt statix ];
 
         inherit (pkgs) mkShell;
       in {
@@ -26,6 +26,5 @@
             '';
           };
         };
-      }
+      });
-    );
 }

node/flake.nix

@@ -19,17 +19,12 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = [
+            buildInputs = [ nodejs pnpm (yarn.override { inherit nodejs; }) ];
-              nodejs
-              pnpm
-              (yarn.override { inherit nodejs; })
-            ];
 
             shellHook = ''
               echo "node `${nodejs}/bin/node --version`"
             '';
           };
         };
-      }
+      });
-    );
 }

rust/flake.nix

@@ -10,13 +10,9 @@
   outputs = { self, nixpkgs, flake-utils, rust-overlay }:
     flake-utils.lib.eachDefaultSystem (system:
       let
-        overlays = [
+        overlays = [ (import rust-overlay) ];
-          (import rust-overlay)
-        ];
 
-        pkgs = import nixpkgs {
+        pkgs = import nixpkgs { inherit system overlays; };
-          inherit system overlays;
-        };
 
         rust = pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
 
@@ -30,15 +26,12 @@
 
         devShells = {
           default = mkShell {
-            buildInputs = [
+            buildInputs = [ rust ] ++ helpers;
-              rust
-            ] ++ helpers;
 
             shellHook = ''
               ${rust}/bin/cargo --version
             '';
           };
         };
-      }
+      });
-    );
 }

scala/flake.nix

@@ -14,12 +14,8 @@
 
         config = {
           packageOverrides = p: {
-            sbt = p.sbt.override {
+            sbt = p.sbt.override { jre = p.${jdk}; };
-              jre = p.${jdk};
+            scala_3 = p.scala_3.override { jre = p.${jdk}; };
-            };
-            scala_3 = p.scala_3.override {
-              jre = p.${jdk};
-            };
           };
         };
 
@@ -33,16 +29,12 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = [
+            buildInputs = [ scala jdkPkg ] ++ buildTools;
-              scala
-              jdkPkg
-            ] ++ buildTools;
 
             shellHook = ''
               ${scala}/bin/scala -version
             '';
           };
         };
-      }
+      });
-    );
 }

zig/flake.nix

@@ -16,15 +16,12 @@
       in {
         devShells = {
           default = pkgs.mkShell {
-            buildInputs = [
+            buildInputs = [ zigPkg ];
-              zigPkg
-            ];
 
             shellHook = ''
               ${zigPkg}/bin/zig version
             '';
           };
         };
-      }
+      });
-    );
 }