Refactor

modules/nodejs.nix

@@ -1,18 +1,20 @@
-{ lib, pkgs }:
+{
+  perSystem =
+    { pkgs, ... }:
+    {
+      devShells.nodejs = pkgs.mkShell {
+        packages = with pkgs; [
+          bun
+          eslint_d
+          nodejs
+          nodePackages.pnpm
+          nodePackages.yarn
+          prettier
+        ];
 
-with pkgs;
-
-mkShell {
-  packages = [
-    bun
-    eslint_d
-    nodejs
-    nodePackages.pnpm
-    nodePackages.yarn
-    prettier
-  ];
-
-  shellHook = ''
-    echo "nodejs $(${lib.getExe nodejs} --version)"
-  '';
+        shellHook = ''
+          echo "nodejs $(node --version)"
+        '';
+      };
+    };
 }

modules/php82.nix

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

modules/php83.nix

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

modules/tailwindcss.nix

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