diff --git a/hmModules/helix/default.nix b/hmModules/helix/default.nix
index 4e724e2..5816637 100644
--- a/hmModules/helix/default.nix
+++ b/hmModules/helix/default.nix
@@ -1,4 +1,13 @@
+{ pkgs, ... }:
 {
+  home.packages = with pkgs; [
+    zk
+    nixd
+    terraform-ls
+    python3Packages.python-lsp-server
+    nodePackages.typescript-language-server
+  ];
+
   programs.helix = {
     enable = true;
     defaultEditor = true;
@@ -11,6 +20,7 @@
           normal = "block";
           select = "underline";
         };
+        color-modes = true;
         true-color = true; # to make colors coherent when in ssh
         # inline-diagnostic = {
         #   cursor-line = "hint";
@@ -23,6 +33,7 @@
         {
           name = "nix";
           language-servers = [ "nixd" ];
+          formatter.command = "nixfmt";
         }
         {
           name = "markdown";
@@ -35,10 +46,6 @@
       ];
       language-server = {
         nixd.command = "nixd";
-        vtsls = {
-          command = "vtsls";
-          args = [ "--stdio" ];
-        };
         zk = {
           command = "zk";
           args = [ "lsp" ];
diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index cf7f76a..64f955e 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -254,12 +254,7 @@
         "picard"
       ])
       [
-        nixd # TODO probably not the best place
-        terraform-lsp # TODO probably not best place
-        python3Packages.jedi-language-server # TODO probably not best place
-        nodePackages.typescript-language-server # TODO probably not best place
         cntr # TODO probably not best place
-        nom # FIXME disable on aarch64-linux, breaks everything :(
       ]
     );
 }
diff --git a/hmModules/zk/default.nix b/hmModules/zk/default.nix
new file mode 100644
index 0000000..1f65116
--- /dev/null
+++ b/hmModules/zk/default.nix
@@ -0,0 +1,42 @@
+{
+  programs.bat.enable = true;
+  programs.fzf.enable = true;
+  programs.zk = {
+    enable = true;
+    settings = {
+      notebook.dir = "~/notebook";
+      note = {
+        language = "en";
+        default-title = "Untitled";
+        filename = "{{id}}";
+        extension = "md";
+        template = "default.md";
+      };
+      group.journal = {
+        paths = [ "journal" ];
+        note = {
+          filename = "{{format-date now}}";
+          template = "journal.md";
+        };
+      };
+      format.markdown = {
+        hashtags = false;
+        colon-tags = true;
+        multiword-tags = false;
+      };
+      tool = {
+        pager = "less -FIRX";
+        fzf-preview = "bat --color always {-1}";
+      };
+      lsp.diagnostics = {
+        wiki-title = "hint";
+        dead-link = "error";
+      };
+      lsp.completion = {
+        note-label = "{{title-or-path}}";
+        note-filter-text = "{{title}} {{path}}";
+        note-detail = "{{filename-stem}}";
+      };
+    };
+  };
+}
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index e5c0374..8f4be62 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -85,6 +85,7 @@
       "calibre"
       "reinstall-magisk-on-lineage"
       "vscode-server"
+      "zk"
     ];
     extraGroups = [ ];
     backupPaths = [ ];