lock, helix tweaks and minor kanata changes

flake.lock

@@ -419,11 +419,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1734533540,
-        "narHash": "sha256-Ip8nwS/DMyoTnj0A1q5QoPOZ+Dt8ywyKeGC5p+fZ2J0=",
+        "lastModified": 1734542518,
+        "narHash": "sha256-9hBhC7sVQFyK6AyUR615/hCRgZ/KjltR776oXx5UQiY=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "13e5a2ee5a9368f9355700ad1bec744a407612cd",
+        "rev": "9e4da4b95052ecfc759d33d78255eb9956279d15",
         "type": "github"
       },
       "original": {
@@ -659,11 +659,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1734535477,
-        "narHash": "sha256-knNjkaPKoeEC3EzlS+W0idgpclIfyKYAVNdE/dDYWuU=",
+        "lastModified": 1734549344,
+        "narHash": "sha256-8UyePAumPdoSQ3lbZtvnQs3owsqPB49xJXwoXGa0qdg=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "80a4852266643c622ec68969b39c5abc3c610f30",
+        "rev": "df06cb4d71a291171c02467c384471f90832d23b",
         "type": "github"
       },
       "original": {
@@ -797,11 +797,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734535685,
-        "narHash": "sha256-dvypPICYuwIiGUvPZG9j6gdeAn26qhoTjzzB9jZyqvg=",
+        "lastModified": 1734549001,
+        "narHash": "sha256-bL55yOCX9SHwzkgApfpcDu8dru2HOSc37xuoVvkiSCY=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "058830668e92e92b3179319090b5d523ba4d59a4",
+        "rev": "d12b4a7fbaf570fbe9322c09a777c124fbf15306",
         "type": "github"
       },
       "original": {

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

@@ -48,7 +48,7 @@
 
 (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