Refactor

modules/nodejs.nix

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

modules/php82.nix

@@ -5,16 +5,15 @@
   ...
 }:
 
-pkgs.mkShell {
+with pkgs;
-  packages =
+
-    with pkgs;
+mkShell {
-    [
+  packages = [
-      php82
+    php82
-      php82Packages.composer
+    php82Packages.composer
-    ]
+  ] ++ commonPhpPackages;
-    ++ commonPhpPackages;
 
   shellHook = ''
-    ${lib.getExe pkgs.php82} --version
+    ${lib.getExe php82} --version
   '';
 }

modules/php83.nix

@@ -4,16 +4,15 @@
   pkgs,
 }:
 
-pkgs.mkShell {
+with pkgs;
-  packages =
+
-    with pkgs;
+mkShell {
-    [
+  packages = [
-      php83
+    php83
-      php83Packages.composer
+    php83Packages.composer
-    ]
+  ] ++ commonPhpPackages;
-    ++ commonPhpPackages;
 
   shellHook = ''
-    ${lib.getExe pkgs.php83} --version
+    ${lib.getExe php83} --version
   '';
 }

modules/tailwindcss.nix

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