From dbe7fdfb4e75c808061dc19cb897ffff1996916f Mon Sep 17 00:00:00 2001 From: derped Date: Sat, 2 Sep 2023 17:24:35 +0200 Subject: [PATCH] Add intelephense lsp to php-mode. --- pkgsets/emacs/lsp.nix | 4 ++++ pkgsets/emacs/php-mode.nix | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgsets/emacs/lsp.nix b/pkgsets/emacs/lsp.nix index f86250a..284077b 100644 --- a/pkgsets/emacs/lsp.nix +++ b/pkgsets/emacs/lsp.nix @@ -23,6 +23,10 @@ mkIf (elem "emacs::lsp" config.machine.pkgs) { (setq lsp-clients-deno-import-map "./import_map.json") (setq lsp-clients-deno-config "./deno.json") ''} + ${optionalString (elem "emacs::php-mode" config.machine.pkgs) '' + (setq lsp-intelephense-php-version "8.2") + (setq lsp-intelephense-server-command `("${pkgs.nodePackages.intelephense}/bin/intelephense" "--stdio")) + ''} ''; }; diff --git a/pkgsets/emacs/php-mode.nix b/pkgsets/emacs/php-mode.nix index fa70cfa..8546a9f 100644 --- a/pkgsets/emacs/php-mode.nix +++ b/pkgsets/emacs/php-mode.nix @@ -4,6 +4,10 @@ with lib; mkIf (elem "emacs::php-mode" config.machine.pkgs) { programs.emacs.init.usePackage = { - php-mode.enable = true; + php-mode = { + enable = true; + hook = lib.optional (elem "emacs::lsp" config.machine.pkgs) + ''(typescript-mode . (lambda () (lsp)))''; + }; }; }