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"];

modules/nixos/programs/pkgs/default.nix

@@ -55,6 +55,7 @@ in {
         ])
 
         (mkIf cfg.dev.enable [
+          lldb_19
           nfs-utils
           gcc
           rust-analyzer
@@ -62,14 +63,13 @@ in {
           nixd
           nil
           php
-          # php84Packages.php-cs-fixer
+          vscode-langservers-extracted
           # phpactor
           python312Packages.python-lsp-server
           bash-language-server
           clang-tools
           marksman
           pyright
-          # nodePackages_latest.intelephense
 
           # Formatters
           alejandra
@@ -77,6 +77,7 @@ in {
           nodePackages_latest.fixjson
           nodePackages_latest.sql-formatter
           prettierd
+          # php84Packages.php-cs-fixer
           shfmt
           luaformatter
           black

modules/nixos/services/kanata/hhkbse.kbd

@@ -35,7 +35,7 @@
   tab     S-q    S-w    S-e    S-r    S-t    S-y    S-u    S-i    S-o    S-p    S-å    S-¨   bspc
   lctl    S-a    S-s    S-d    S-f    S-g    S-h    S-j    S-k    S-l    S-ö    S-ä    S-ret
   @shift  S-z    S-x    S-c    S-v    S-b    S-n    S-m    S-,    S-.    S--    rsft
-          lalt   lmet           spc            @level3 @ralt
+          lalt   lmet          spc           @level3 @ralt
 )
 
 (deflayer level3
@@ -43,12 +43,12 @@
   tab     q      w      RA-5   r      t      y      u      i      o      ▲      å      RA-¨  bspc
   lctl    a      s      d      f      g      h      j      k      ◀      ▼      ▶      ret
   @shift  RA-S-z RA-S-x c      v      b      n      m      ,      .      -      rsft
-          lalt   lmet           spc            @level3 @ralt
+          lalt   lmet          spc           @level3 @ralt
 )
 
 (deflayer ralt
   esc     1    2    3    4    5    6    7    8    9    0    +     pgdn  pgup  del
-  tab     q    w    e    r    t    y    u    i    o    p    å     `     bspc
+  tab     q    w    e    r    t    y    u    i    o    p    å     S-´   bspc
   lctl    a    s    d    f    g    h    j    k    l    ö    ä     ret
   @shift  z    x    c    v    b    n    m    ,    .    -    rsft
           lalt lmet           spc            @level3 @ralt