diff --git a/config/languages.nix b/config/languages.nix
index 78200efb2469237fd985878a5291523e7b2866cc..f1e6505cbf6a03c156336ed5005b90059e8f996b 100644
--- a/config/languages.nix
+++ b/config/languages.nix
@@ -16,7 +16,7 @@     {
       name = "nix";
       auto-format = true;
       formatter = {
-        command = "${lib.getExe nixfmt}";
+        command = "${lib.getExe nixfmt-rfc-style}";
         args = [ "-q" ];
       };
     }
diff --git a/default.nix b/default.nix
index 03a5d0a985579cb4d413bee904afef638fd14166..5cf7c3e3ba3b08587430f4f0680a8779dd681c0b 100644
--- a/default.nix
+++ b/default.nix
@@ -84,19 +84,19 @@         mkdir $out
         ln -s ${pkgs.helix}/* $out
         rm $out/bin
 
-        #rm $out/lib
-        #mkdir -p $out/lib/runtime
-        #ln -s ${pkgs.helix}/lib/runtime/* $out/lib/runtime
+        rm $out/lib
+        mkdir -p $out/lib/runtime
+        ln -s ${pkgs.helix}/lib/runtime/* $out/lib/runtime
 
-        #rm $out/lib/runtime/grammars
-        #mkdir $out/lib/runtime/grammars
-        #ln -s ${pkgs.helix}/lib/runtime/grammars/* $out/lib/runtime/grammars
-        #${builtins.concatStringsSep "\n" grammarLinks}
+        rm $out/lib/runtime/grammars
+        mkdir $out/lib/runtime/grammars
+        ln -s ${pkgs.helix}/lib/runtime/grammars/* $out/lib/runtime/grammars
+        ${builtins.concatStringsSep "\n" grammarLinks}
 
-        #rm $out/lib/runtime/queries
-        #mkdir $out/lib/runtime/queries
-        #ln -s ${pkgs.helix}/lib/runtime/queries/* $out/lib/runtime/queries
-        #${builtins.concatStringsSep "\n" queryLinks}
+        rm $out/lib/runtime/queries
+        mkdir $out/lib/runtime/queries
+        ln -s ${pkgs.helix}/lib/runtime/queries/* $out/lib/runtime/queries
+        ${builtins.concatStringsSep "\n" queryLinks}
 
         mkdir -p $out/home/helix/themes
         ln -s ${configFile} $out/home/helix/config.toml
@@ -107,8 +107,8 @@         mkdir -p $out/home/git
         ln -s ${ignoreFile} $out/home/git/ignore
 
         makeWrapper ${pkgs.helix}/bin/hx $out/bin/hx \
+          --set HELIX_RUNTIME $out/lib/runtime \
           --set XDG_CONFIG_HOME $out/home \
-          #--set HELIX_RUNTIME $out/lib/runtime \
       '';
 in
 {
diff --git a/flake.lock b/flake.lock
index 98276f8b06c40243e04b8609ece2a3025974d33c..d98c04e60def10190d8d5fc1632ac402882ab57e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@ {
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787111413,
-        "narHash": "sha256-sFosWtq21eHGJRnTc/hvf4M1obRgLEUMNm/IzllkHMA=",
+        "lastModified": 1766025857,
+        "narHash": "sha256-Lav5jJazCW4mdg1iHcROpuXqmM94BWJvabLFWaJVJp0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "afe3d8ac4395617bdcdac9f188ac8717a062e014",
+        "rev": "def3da69945bbe338c373fddad5a1bb49cf199ce",
         "type": "github"
       },
       "original": {