Refactor

flake.nix

@@ -11,30 +11,20 @@
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [ "x86_64-linux" ];
 
+      imports = [
+        ./modules/nodejs.nix
+        ./modules/php82.nix
+        ./modules/php83.nix
+        ./modules/tailwindcss.nix
+      ];
+
       perSystem =
         { config, pkgs, ... }:
-        let
-          inherit (pkgs) callPackage;
-
-          commonPhpPackages = with pkgs; [
-            phpactor
-          ];
-        in
         {
-          devShells = {
+          devShells.default = pkgs.mkShell {
-            default = pkgs.mkShell {
             packages = with pkgs; [ nixd ];
           };
 
-            nodejs = callPackage ./modules/nodejs.nix { };
-
-            php82 = callPackage ./modules/php82.nix { inherit commonPhpPackages; };
-
-            php83 = callPackage ./modules/php83.nix { inherit commonPhpPackages; };
-
-            tailwindcss = callPackage ./modules/tailwindcss.nix { };
-          };
-
           formatter = pkgs.nixfmt-rfc-style;
         };
     };

modules/nodejs.nix

@@ -1,9 +1,9 @@
-{ lib, pkgs }:
+{
-
+  perSystem =
-with pkgs;
+    { pkgs, ... }:
-
+    {
-mkShell {
+      devShells.nodejs = pkgs.mkShell {
-  packages = [
+        packages = with pkgs; [
           bun
           eslint_d
           nodejs
@@ -13,6 +13,8 @@ mkShell {
         ];
 
         shellHook = ''
-    echo "nodejs $(${lib.getExe nodejs} --version)"
+          echo "nodejs $(node --version)"
         '';
+      };
+    };
 }

modules/php82.nix

@@ -1,19 +1,17 @@
 {
-  commonPhpPackages,
+  perSystem =
-  lib,
+    { pkgs, ... }:
-  pkgs,
+    {
-  ...
+      devShells.php82 = pkgs.mkShell {
-}:
+        packages = with pkgs; [
-
-with pkgs;
-
-mkShell {
-  packages = [
           php82
           php82Packages.composer
-  ] ++ commonPhpPackages;
+          phpactor
+        ];
 
         shellHook = ''
-    ${lib.getExe php82} --version
+          php --version
         '';
+      };
+    };
 }

modules/php83.nix

@@ -1,18 +1,17 @@
 {
-  commonPhpPackages,
+  perSystem =
-  lib,
+    { pkgs, ... }:
-  pkgs,
+    {
-}:
+      devShells.php83 = pkgs.mkShell {
-
+        packages = with pkgs; [
-with pkgs;
-
-mkShell {
-  packages = [
           php83
           php83Packages.composer
-  ] ++ commonPhpPackages;
+          phpactor
+        ];
 
         shellHook = ''
-    ${lib.getExe php83} --version
+          php --version
         '';
+      };
+    };
 }

modules/tailwindcss.nix

@@ -1,15 +1,17 @@
-{ lib, pkgs }:
+{
-
+  perSystem =
-with pkgs;
+    { pkgs, ... }:
-
+    {
-mkShell {
+      devShells.tailwindcss = pkgs.mkShell {
-  packages = [
+        packages = with pkgs; [
           tailwindcss-language-server
           tailwindcss_4
           watchman
         ];
 
         shellHook = ''
-    ${lib.getExe tailwindcss_4} --help
+          tailwindcss --help
         '';
+      };
+    };
 }