diff --git a/modules/nodejs.nix b/modules/nodejs.nix index 538f1a4..6c52e2b 100644 --- a/modules/nodejs.nix +++ b/modules/nodejs.nix @@ -1,7 +1,9 @@ { lib, pkgs }: -pkgs.mkShell { - packages = with pkgs; [ +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)" ''; } diff --git a/modules/php82.nix b/modules/php82.nix index e8b95b0..514a378 100644 --- a/modules/php82.nix +++ b/modules/php82.nix @@ -5,16 +5,15 @@ ... }: -pkgs.mkShell { - packages = - with pkgs; - [ - php82 - php82Packages.composer - ] - ++ commonPhpPackages; +with pkgs; + +mkShell { + packages = [ + php82 + php82Packages.composer + ] ++ commonPhpPackages; shellHook = '' - ${lib.getExe pkgs.php82} --version + ${lib.getExe php82} --version ''; } diff --git a/modules/php83.nix b/modules/php83.nix index 637c4ae..5af6f44 100644 --- a/modules/php83.nix +++ b/modules/php83.nix @@ -4,16 +4,15 @@ pkgs, }: -pkgs.mkShell { - packages = - with pkgs; - [ - php83 - php83Packages.composer - ] - ++ commonPhpPackages; +with pkgs; + +mkShell { + packages = [ + php83 + php83Packages.composer + ] ++ commonPhpPackages; shellHook = '' - ${lib.getExe pkgs.php83} --version + ${lib.getExe php83} --version ''; } diff --git a/modules/tailwindcss.nix b/modules/tailwindcss.nix index 63a3a2f..1eebf52 100644 --- a/modules/tailwindcss.nix +++ b/modules/tailwindcss.nix @@ -1,13 +1,15 @@ { lib, pkgs }: -pkgs.mkShell { - packages = with pkgs; [ +with pkgs; + +mkShell { + packages = [ tailwindcss-language-server tailwindcss_4 watchman ]; shellHook = '' - ${lib.getExe pkgs.tailwindcss_4} --help + ${lib.getExe tailwindcss_4} --help ''; }