Format with nixfmt

flake.nix

@@ -7,34 +7,23 @@
     nixd-nightly.url = "github:nix-community/nixd";
   };
 
-  outputs = inputs @ {
+  outputs = inputs@{ self, flake-parts, ... }:
-    self,
+    flake-parts.lib.mkFlake { inherit inputs; } {
-    flake-parts,
+      flake = { lib = import ./lib { inherit inputs; }; };
-    ...
-  }:
-    flake-parts.lib.mkFlake {inherit inputs;} {
-      flake = {
-        lib = import ./lib {inherit inputs;};
-      };
 
-      systems = ["x86_64-linux"];
+      systems = [ "x86_64-linux" ];
 
-      perSystem = {
+      perSystem = { pkgs, self', system, ... }:
-        pkgs,
+        let
-        self',
+          default = self.lib.mkVimPlugin { inherit system; };
-        system,
+          neovim = self.lib.mkNeovim { inherit system; };
-        ...
-      }: let
-        default = self.lib.mkVimPlugin {inherit system;};
-        neovim = self.lib.mkNeovim {inherit system;};
         in {
-        devShells.default = pkgs.mkShell {
+          devShells.default =
-          nativeBuildInputs = [pkgs.just];
+            pkgs.mkShell { nativeBuildInputs = [ pkgs.just pkgs.nixfmt ]; };
-        };
 
-        packages = {inherit default neovim;};
+          packages = { inherit default neovim; };
 
-        formatter = pkgs.alejandra;
+          formatter = pkgs.nixfmt;
         };
     };
 }

lib/default.nix

@@ -1,13 +1,13 @@
-{inputs}: let
+{ inputs }:
-  inherit (inputs.nixpkgs) legacyPackages;
+let inherit (inputs.nixpkgs) legacyPackages;
 in rec {
-  mkVimPlugin = {system}: let
+  mkVimPlugin = { system }:
+    let
       inherit (pkgs) vimUtils;
       inherit (vimUtils) buildVimPlugin;
 
       pkgs = legacyPackages.${system};
-  in
+    in buildVimPlugin {
-    buildVimPlugin {
       name = "opdavies";
       postInstall = ''
         rm -rf $out/.envrc
@@ -24,7 +24,8 @@ in rec {
       src = ../.;
     };
 
-  mkNeovimPlugins = {system}: let
+  mkNeovimPlugins = { system }:
+    let
       inherit (pkgs) php82Packages vimPlugins;
       inherit (pkgs.vimUtils) buildVimPlugin;
 
@@ -98,7 +99,7 @@ in rec {
         };
       };
 
-    opdavies-nvim = mkVimPlugin {inherit system;};
+      opdavies-nvim = mkVimPlugin { inherit system; };
     in [
       customVim.nvim-tmux-navigation
       customVim.tabline-vim
@@ -164,8 +165,7 @@ in rec {
       vimPlugins.nvim-dap-virtual-text
 
       # Treesitter
-    (vimPlugins.nvim-treesitter.withPlugins
+      (vimPlugins.nvim-treesitter.withPlugins (p: [
-      (p: [
         p.bash
         p.comment
         p.css
@@ -256,7 +256,8 @@ in rec {
       opdavies-nvim
     ];
 
-  mkExtraPackages = {system}: let
+  mkExtraPackages = { system }:
+    let
       inherit (inputs) nixd-nightly;
       inherit (pkgs) nodePackages lua54Packages php82Packages;
 
@@ -311,25 +312,27 @@ in rec {
     EOF
   '';
 
-  mkNeovim = {system}: let
+  mkNeovim = { system }:
+    let
       inherit (pkgs) lib neovim;
-    extraPackages = mkExtraPackages {inherit system;};
+      extraPackages = mkExtraPackages { inherit system; };
       pkgs = legacyPackages.${system};
-    start = mkNeovimPlugins {inherit system;};
+      start = mkNeovimPlugins { inherit system; };
-  in
+    in neovim.override {
-    neovim.override {
       configure = {
         customRC = mkExtraConfig;
-        packages.main = {inherit start;};
+        packages.main = { inherit start; };
       };
 
-      extraMakeWrapperArgs = ''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
+      extraMakeWrapperArgs =
+        ''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
     };
 
-  mkHomeManager = {system}: let
+  mkHomeManager = { system }:
+    let
       extraConfig = mkExtraConfig;
-    extraPackages = mkExtraPackages {inherit system;};
+      extraPackages = mkExtraPackages { inherit system; };
-    plugins = mkNeovimPlugins {inherit system;};
+      plugins = mkNeovimPlugins { inherit system; };
     in {
       inherit extraConfig extraPackages plugins;