Add nixd to flake.nix and legacyPackages.nix.

flake.nix

@@ -1,91 +1,100 @@
 {
   description = "A neovim flake with a modular configuration";
-  outputs = {
-    flake-parts,
-    self,
-    ...
-  } @ inputs: let
-    # call the extedended library with `inputs`
-    # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function
-    lib = import ./lib/stdlib-extended.nix inputs;
-  in
-    flake-parts.lib.mkFlake {
-      inherit inputs;
-      specialArgs = {inherit lib;};
-    } {
-      # Allow users to bring their own systems.
-      # «https://github.com/nix-systems/nix-systems»
-      systems = import inputs.systems;
-      imports = [
-        ./flake/apps.nix
-        ./flake/legacyPackages.nix
-        ./flake/overlays.nix
-        ./flake/packages.nix
-      ];
-
-      flake = {
-        lib = {
-          inherit (lib) nvim;
-          inherit (lib.nvim) neovimConfiguration;
+  outputs =
+    {
+      flake-parts,
+      self,
+      ...
+    }@inputs:
+    let
+      # call the extedended library with `inputs`
+      # inputs is used to get the original standard library, and to pass inputs to the plugin autodiscovery function
+      lib = import ./lib/stdlib-extended.nix inputs;
+    in
+    flake-parts.lib.mkFlake
+      {
+        inherit inputs;
+        specialArgs = {
+          inherit lib;
         };
+      }
+      {
+        # Allow users to bring their own systems.
+        # «https://github.com/nix-systems/nix-systems»
+        systems = import inputs.systems;
+        imports = [
+          ./flake/apps.nix
+          ./flake/legacyPackages.nix
+          ./flake/overlays.nix
+          ./flake/packages.nix
+        ];
+
+        flake = {
+          lib = {
+            inherit (lib) nvim;
+            inherit (lib.nvim) neovimConfiguration;
+          };
 
-        homeManagerModules = {
-          neovim-flake =
-            lib.warn ''
+          homeManagerModules = {
+            neovim-flake = lib.warn ''
               homeManagerModules.neovim-flake has been deprecated.
               Plese use the homeManagerModules.nvf instead
-            ''
-            self.homeManagerModules.nvf;
+            '' self.homeManagerModules.nvf;
 
-          nvf = import ./flake/modules/home-manager.nix self.packages lib;
+            nvf = import ./flake/modules/home-manager.nix self.packages lib;
 
-          default = self.homeManagerModules.nvf;
-        };
+            default = self.homeManagerModules.nvf;
+          };
 
-        nixosModules = {
-          neovim-flake =
-            lib.warn ''
+          nixosModules = {
+            neovim-flake = lib.warn ''
               nixosModules.neovim-flake has been deprecated.
               Please use the nixosModules.nvf instead
-            ''
-            self.nixosModules.nvf;
+            '' self.nixosModules.nvf;
 
-          nvf = import ./flake/modules/nixos.nix self.packages lib;
-
-          default = self.nixosModules.nvf;
-        };
-      };
+            nvf = import ./flake/modules/nixos.nix self.packages lib;
 
-      perSystem = {
-        self',
-        config,
-        pkgs,
-        ...
-      }: {
-        devShells = {
-          default = self'.devShells.lsp;
-          nvim-nix = pkgs.mkShell {packages = [config.packages.nix];};
-          lsp = pkgs.mkShell {
-            packages = with pkgs; [nil statix deadnix alejandra];
+            default = self.nixosModules.nvf;
           };
         };
 
-        # Provide the default formatter. `nix fmt` in project root
-        # will format available files with the correct formatter.
-        # P.S: Please do not format with nixfmt! It messes with many
-        # syntax elements and results in unreadable code.
-        formatter = pkgs.alejandra;
-
-        # Check if codebase is properly formatted.
-        # This can be initiated with `nix build .#checks.<system>.nix-fmt`
-        # or with `nix flake check`
-        checks = {
-          nix-fmt = pkgs.runCommand "nix-fmt-check" {nativeBuildInputs = [pkgs.alejandra];} ''
-            alejandra --check ${self} < /dev/null | tee $out
-          '';
-        };
+        perSystem =
+          {
+            self',
+            config,
+            pkgs,
+            ...
+          }:
+          {
+            devShells = {
+              default = self'.devShells.lsp;
+              nvim-nix = pkgs.mkShell { packages = [ config.packages.nix ]; };
+              lsp = pkgs.mkShell {
+                packages = with pkgs; [
+                  nil
+                  statix
+                  deadnix
+                  alejandra
+                ];
+              };
+            };
+
+            # Provide the default formatter. `nix fmt` in project root
+            # will format available files with the correct formatter.
+            # P.S: Please do not format with nixfmt! It messes with many
+            # syntax elements and results in unreadable code.
+            formatter = pkgs.alejandra;
+
+            # Check if codebase is properly formatted.
+            # This can be initiated with `nix build .#checks.<system>.nix-fmt`
+            # or with `nix flake check`
+            checks = {
+              nix-fmt = pkgs.runCommand "nix-fmt-check" { nativeBuildInputs = [ pkgs.alejandra ]; } ''
+                alejandra --check ${self} < /dev/null | tee $out
+              '';
+            };
+          };
       };
-    };
 
   # Flake inputs
   inputs = {
@@ -111,6 +120,10 @@
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.flake-utils.follows = "flake-utils";
     };
+    nixd = {
+      url = "github:nix-community/nixd";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     ## Plugins
     # LSP plugins

flake/legacyPackages.nix

@@ -1,18 +1,22 @@
-{inputs, ...}: {
-  perSystem = {
-    system,
-    inputs',
-    ...
-  }: {
-    legacyPackages = import inputs.nixpkgs {
-      inherit system;
-      overlays = [
-        inputs.self.overlays.default
-        (_: _: {
-          rnix-lsp = inputs'.rnix-lsp.defaultPackage;
-          nil = inputs'.nil.packages.default;
-        })
-      ];
+{ inputs, ... }:
+{
+  perSystem =
+    {
+      system,
+      inputs',
+      ...
+    }:
+    {
+      legacyPackages = import inputs.nixpkgs {
+        inherit system;
+        overlays = [
+          inputs.self.overlays.default
+          (_: _: {
+            rnix-lsp = inputs'.rnix-lsp.defaultPackage;
+            nil = inputs'.nil.packages.default;
+            nixd = inputs'.nixd.packages.default;
+          })
+        ];
+      };
     };
-  };
 }