lock, helix tweaks and minor kanata changes

modules/home/programs/helix/lang.nix

@@ -56,16 +56,6 @@
           auto-format = true;
           language-servers = ["dprint" "typescript-language-server"];
         }
-        {
-          name = "nix";
-          auto-format = true;
-          file-types = ["nix"];
-          language-servers = ["nixd"];
-          formatter = {
-            command = lib.getExe pkgs.alejandra;
-            args = ["-q"];
-          };
-        }
         {
           name = "json";
           formatter = deno "json";
@@ -80,6 +70,15 @@
           auto-format = true;
           formatter = deno "md";
         }
+        {
+          name = "nix";
+          auto-format = true;
+          language-servers = ["nil"];
+          formatter = {
+            command = "${pkgs.alejandra}/bin/alejandra";
+            args = ["-q"];
+          };
+        }
         {
           name = "python";
           language-servers = ["pylsp"];
@@ -96,6 +95,10 @@
         {
           name = "php";
           auto-format = true;
+          language-servers = ["phpactor"];
+          formatter = {
+            command = lib.getExe pkgs.php84Packages.php-cs-fixer;
+          };
         }
         {
           name = "css";
@@ -115,6 +118,11 @@
       ++ prettierLangs langs;
 
     language-server = {
+      phpactor = {
+        command = lib.getExe pkgs.phpactor;
+        args = ["language-server"];
+      };
+
       bash-language-server = {
         command = lib.getExe pkgs.bash-language-server;
         args = ["start"];
@@ -161,14 +169,6 @@
         args = ["lsp"];
       };
 
-      nil = {
-        command = lib.getExe pkgs.nil;
-      };
-
-      nixd = {
-        command = lib.getExe pkgs.nixd;
-      };
-
       pyright = {
         command = "${pkgs.pyright}/bin/pyright-langserver";
         args = ["--stdio"];