diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index befae1f9c5769d781932999f175e5729e52fe73d..8a73f2e2121c6166e6d90ae1bb7e9b6b88e78c3f 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -42,6 +42,7 @@       gofumpt
 
       # Flake overlays
       jolheiser.git-age
+      jolheiser.templ
       tclip
     ];
     activation.report-changes = config.lib.dag.entryAnywhere ''

diff --git a/apps/nogui/helix.nix b/apps/nogui/helix.nix
index 8d5858833fd2d7657ebb460ca7d2f89e1f771bd6..4a1ec61a759a984a4dcb19c6604e2a43f3290d48 100644
--- a/apps/nogui/helix.nix
+++ b/apps/nogui/helix.nix
@@ -1,4 +1,14 @@
 {
+          };
+  queries = pkgs.fetchFromGitea {
+    domain = "git.jojodev.com";
+    owner = "jolheiser";
+    repo = "templ-helix";
+    rev = "2a47b9c5af0fd9ae8bba8198fd66abc6d07fdf10";
+    sha256 = "sha256-pTdOX9bPup626t+ko6k3Xq/tprAMAZCUBl+xeIBkhfs=";
+  };
+  query = scm: builtins.readFile (queries + "/queries/templ/${scm}.scm");
+in {
   programs.helix = {
     enable = true;
     defaultEditor = true;
@@ -181,6 +191,33 @@             args = ["-qq"];
           };
         }
 {
+        color-modes = true;
+          name = "templ";
+          auto-format = true;
+          scope = "source.templ";
+          injection-regex = "templ";
+          file-types = ["templ"];
+          roots = ["go.mod"];
+          comment-token = "//";
+          language-server = {
+            command = "templ";
+            args = ["lsp"];
+          };
+          formatter = {
+            command = "templ";
+            args = ["fmt"];
+          };
+        }
+      ];
+      grammar = [
+        {
+          name = "templ";
+          source = {
+            git = "https://github.com/vrischmann/tree-sitter-templ";
+            rev = "9f63037ad08a58050d0582ef1ae0009bd0fbf2f1";
+          };
+        }
+{
             "selections"
     };
     themes = {
@@ -201,5 +238,11 @@         inherits = "catppuccin_mocha";
         "ui.background" = {};
       };
     };
+  };
+  xdg.configFile = {
+    "helix/runtime/queries/templ/highlights.scm".text = query "highlights";
+    "helix/runtime/queries/templ/indents.scm".text = query "indents";
+    "helix/runtime/queries/templ/injections.scm".text = query "injections";
+    "helix/runtime/queries/templ/structure.scm".text = query "structure";
   };
 }

diff --git a/flake.lock b/flake.lock
index c3f8e114aaf630b68a4ee6d58c42ee45d25061a0..80925ab5540436dc35c515312e9fb2016ef27502 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,13 +115,13 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1694718292,
+        "lastModified": 1694739610,
+      },
         "darwin": [],
-      "inputs": {
         "ref": "refs/heads/main",
-        "darwin": [],
+      },
         "home-manager": [],
-        "darwin": [],
+      },
         "nixpkgs": [
         "type": "git",
         "url": "https://git.jojodev.com/jolheiser/nur"