diff --git a/devshell/flake.nix b/devshell/flake.nix
index 9242191..50e8278 100644
--- a/devshell/flake.nix
+++ b/devshell/flake.nix
@@ -4,14 +4,20 @@
     utils.url = "github:numtide/flake-utils";
     devshell.url = "github:numtide/devshell";
   };
-  outputs = { self, nixpkgs, utils, devshell }:
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+    devshell,
+  }:
     utils.lib.eachDefaultSystem (system: {
       devShells.default = let
         pkgs = import nixpkgs {
           inherit system;
 
-          overlays = [ devshell.overlay ];
+          overlays = [devshell.overlay];
         };
-      in pkgs.devshell.mkShell { packages = with pkgs; [ ]; };
+      in
+        pkgs.devshell.mkShell {packages = with pkgs; [];};
     });
 }
diff --git a/flake.nix b/flake.nix
index a71cd23..2984555 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,12 @@
 {
   description = "Samw's Nix flake templates";
-  inputs = { utils.url = "github:numtide/flake-utils"; };
+  inputs = {utils.url = "github:numtide/flake-utils";};
 
-  outputs = { self, utils, nixpkgs }:
+  outputs = {
+    self,
+    utils,
+    nixpkgs,
+  }:
     {
       templates = {
         rust = {
@@ -18,7 +22,8 @@
           description = "A basic devshell setup";
         };
       };
-    } // utils.lib.eachDefaultSystem (system:
-      let pkgs = import nixpkgs { inherit system; };
-      in { formatter = pkgs.nixfmt; });
+    }
+    // utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {inherit system;};
+    in {formatter = pkgs.alejandra;});
 }
diff --git a/go/flake.nix b/go/flake.nix
index 9462954..72704bd 100644
--- a/go/flake.nix
+++ b/go/flake.nix
@@ -7,28 +7,32 @@
     inputs.flake-utils.follows = "flake-utils";
   };
 
-  outputs = { self, nixpkgs, utils, devshell }:
-    utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ devshell.overlay ];
-        };
-      in rec {
-        packages.default = pkgs.buildGoModule {
-          name = "my-project";
-          src = self;
-          vendorSha256 = "";
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+    devshell,
+  }:
+    utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [devshell.overlay];
+      };
+    in rec {
+      packages.default = pkgs.buildGoModule {
+        name = "my-project";
+        src = self;
+        vendorSha256 = "";
 
-          # Inject the git version if you want
-          #ldflags = ''
-          #  -X main.version=${if self ? rev then self.rev else "dirty"}
-          #'';
-        };
+        # Inject the git version if you want
+        #ldflags = ''
+        #  -X main.version=${if self ? rev then self.rev else "dirty"}
+        #'';
+      };
 
-        apps.default = utils.lib.mkApp { drv = packages.default; };
+      apps.default = utils.lib.mkApp {drv = packages.default;};
 
-        devShells.default =
-          pkgs.devshell.mkShell { packages = with pkgs; [ go gopls ]; };
-      });
+      devShells.default =
+        pkgs.devshell.mkShell {packages = with pkgs; [go gopls];};
+    });
 }
diff --git a/rust/flake.nix b/rust/flake.nix
index 4d10283..fb5a68f 100644
--- a/rust/flake.nix
+++ b/rust/flake.nix
@@ -8,35 +8,42 @@
     rust-overlay.url = "github:oxalica/rust-overlay";
   };
 
-  outputs = { self, nixpkgs, utils, naersk, devshell, rust-overlay }:
-    utils.lib.eachDefaultSystem (system:
-      let
+  outputs = {
+    self,
+    nixpkgs,
+    utils,
+    naersk,
+    devshell,
+    rust-overlay,
+  }:
+    utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [(import rust-overlay)];
+      };
+      rust = pkgs.rust-bin.stable.latest.default;
+      # Override naersk to use our chosen rust version from rust-overlay
+      naersk-lib = naersk.lib.${system}.override {
+        cargo = rust;
+        rustc = rust;
+      };
+    in rec {
+      packages.default = naersk-lib.buildPackage {
+        pname = "cool-rust-disaster";
+        root = ./.;
+      };
+
+      apps.default = utils.lib.mkApp {drv = packages.default;};
+
+      # Provide a dev env with rust and rls
+      devShells.default = let
         pkgs = import nixpkgs {
           inherit system;
-          overlays = [ (import rust-overlay) ];
+          overlays = [devshell.overlay];
         };
-        rust = pkgs.rust-bin.stable.latest.default;
-        # Override naersk to use our chosen rust version from rust-overlay
-        naersk-lib = naersk.lib.${system}.override {
-          cargo = rust;
-          rustc = rust;
+      in
+        pkgs.devshell.mkShell {
+          packages = with pkgs; [(rust.override {extensions = ["rls"];})];
         };
-      in rec {
-        packages.default = naersk-lib.buildPackage {
-          pname = "cool-rust-disaster";
-          root = ./.;
-        };
-
-        apps.default = utils.lib.mkApp { drv = packages.default; };
-
-        # Provide a dev env with rust and rls
-        devShells.default = let
-          pkgs = import nixpkgs {
-            inherit system;
-            overlays = [ devshell.overlay ];
-          };
-        in pkgs.devshell.mkShell {
-          packages = with pkgs; [ (rust.override { extensions = [ "rls" ]; }) ];
-        };
-      });
+    });
 }