diff --git a/flake.lock b/flake.lock
index 178d317..9ca62fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726775926,
-        "narHash": "sha256-5zShvCy9S4tuISFjNSjb+TWpPtORqPbRZ0XwbLbPLho=",
+        "lastModified": 1726842196,
+        "narHash": "sha256-u9h03JQUuQJ607xmti9F9Eh6E96kKUAGP+aXWgwm70o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "624fd86460e482017ed9c3c3c55a3758c06a4e7f",
+        "rev": "51994df8ba24d5db5459ccf17b6494643301ad28",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726823634,
-        "narHash": "sha256-rU8Yy62KSLU8Q2J64F+50OJKORNdogxbXl2w4rFw13o=",
+        "lastModified": 1726902823,
+        "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "4803bf558bdf20cb067aceb8830b7ad70113f4e3",
+        "rev": "14929f7089268481d86b83ed31ffd88713dcd415",
         "type": "github"
       },
       "original": {
@@ -422,11 +422,11 @@
     "lix": {
       "flake": false,
       "locked": {
-        "lastModified": 1726702585,
-        "narHash": "sha256-oBo2DRCazfJV/qUTgUGcS9s694sHNsIs5U09cOszeAc=",
+        "lastModified": 1726905313,
+        "narHash": "sha256-jsOyXonevsNaKxM9burYc2S4JVle+VMCJ8+AAp0MDCc=",
         "ref": "refs/heads/main",
-        "rev": "79246a37337c5df2224dbc2461c722e1e678f6de",
-        "revCount": 16252,
+        "rev": "5f298f74c92402a8390b01c736463b17b36277e3",
+        "revCount": 16254,
         "type": "git",
         "url": "https://git@git.lix.systems/lix-project/lix"
       },
@@ -571,11 +571,11 @@
     },
     "nixosHardware": {
       "locked": {
-        "lastModified": 1726724509,
-        "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
+        "lastModified": 1726905744,
+        "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
+        "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381",
         "type": "github"
       },
       "original": {
@@ -761,11 +761,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1726836432,
-        "narHash": "sha256-fk9P0RY2m7r3vAqqSRaR/MZoQJo6yg6vuv4h7D1I2/8=",
+        "lastModified": 1726930246,
+        "narHash": "sha256-BG4Qyero2a5DsfC4CDT5Jx9l7h4/N0/7JD0agHoBSGk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b3e9ef326d3d60dd97c262c6d16cc255175d4902",
+        "rev": "29768748c8e6ce4e9b1fba2b5a978576ece5b3a4",
         "type": "github"
       },
       "original": {
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/kirk/default.nix b/hosts/kirk/default.nix
index e1fb82d..f2ee46a 100644
--- a/hosts/kirk/default.nix
+++ b/hosts/kirk/default.nix
@@ -33,6 +33,7 @@
       "mount-rock5b"
       "adb"
       "binfmt"
+      "prometheus-exporters"
     ]
     ++ [
       ./disko.nix
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 = [ ];