From 320f503b1e1eda63f2a2dd9e8b112e425ec1e404 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 8 Jan 2025 20:34:03 +0000
Subject: [PATCH] Standardise PHP versions
---
nix/modules/home-manager/features/cli/neovim.nix | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/nix/modules/home-manager/features/cli/neovim.nix b/nix/modules/home-manager/features/cli/neovim.nix
index 125617aa..effbb007 100644
--- a/nix/modules/home-manager/features/cli/neovim.nix
+++ b/nix/modules/home-manager/features/cli/neovim.nix
@@ -8,6 +8,10 @@
with lib;
+let
+ php = pkgs.php82;
+ phpPackages = pkgs.php82Packages;
+in
{
options.features.cli.neovim.enable = mkEnableOption "Enable neovim";
@@ -130,7 +134,7 @@ with lib;
# Languages
nodePackages.typescript
nodejs-slim
- php81
+ php
# Language servers
gopls
@@ -162,8 +166,8 @@ with lib;
html-tidy
nodePackages.jsonlint
nodePackages.markdownlint-cli
- php82Packages.php-codesniffer
- php82Packages.phpstan
+ phpPackages.php-codesniffer
+ phpPackages.phpstan
proselint
shellcheck
yamllint