diff --git a/modules/home/default.nix b/modules/home/default.nix
index caf9c10..cc01f83 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -23,6 +23,7 @@
 		./ssh.nix
 		./starship.nix
 		./zellij.nix
+		./zk.nix
 		./zoxide.nix
 		./zsh.nix
 	];
diff --git a/modules/home/neovim/mappings.nix b/modules/home/neovim/mappings.nix
index 23bf9b5..0f06cdf 100644
--- a/modules/home/neovim/mappings.nix
+++ b/modules/home/neovim/mappings.nix
@@ -231,5 +231,66 @@
 			action = ":lua require('harpoon'):list():select(4)<CR>";
 			options.desc = "Go to harpoon 4";
 		}
+		# z - zk (notes)
+		{
+			mode = "n";
+			key = "<leader>zn";
+			action = ":ZkNew { title = vim.fn.input('Title: ') }<CR>";
+			options.desc = "New note";
+		}
+		{
+			mode = "n";
+			key = "<leader>zo";
+			action = ":ZkNotes { sort = { 'modified' } }<CR>";
+			options.desc = "Open notes";
+		}
+		{
+			mode = "n";
+			key = "<leader>zt";
+			action = ":ZkTags<CR>";
+			options.desc = "Browse tags";
+		}
+		{
+			mode = "n";
+			key = "<leader>zf";
+			action = ":ZkNotes { sort = { 'modified' }, match = { vim.fn.input('Search: ') } }<CR>";
+			options.desc = "Find notes";
+		}
+		{
+			mode = "v";
+			key = "<leader>zf";
+			action = ":'<,'>ZkMatch<CR>";
+			options.desc = "Find notes matching selection";
+		}
+		{
+			mode = "n";
+			key = "<leader>zb";
+			action = ":ZkBacklinks<CR>";
+			options.desc = "Backlinks";
+		}
+		{
+			mode = "n";
+			key = "<leader>zl";
+			action = ":ZkLinks<CR>";
+			options.desc = "Outbound links";
+		}
+		{
+			mode = "n";
+			key = "<leader>zi";
+			action = ":ZkInsertLink<CR>";
+			options.desc = "Insert link";
+		}
+		{
+			mode = "v";
+			key = "<leader>zi";
+			action = ":'<,'>ZkInsertLinkAtSelection<CR>";
+			options.desc = "Insert link at selection";
+		}
+		{
+			mode = "v";
+			key = "<leader>zc";
+			action = ":'<,'>ZkNewFromTitleSelection<CR>";
+			options.desc = "Create note from selection";
+		}
 	];
 }
diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix
index 48ad0fc..6d543a2 100644
--- a/modules/home/neovim/plugins/lsp.nix
+++ b/modules/home/neovim/plugins/lsp.nix
@@ -9,6 +9,7 @@
 				dockerls.enable = true;
 				yamlls.enable = true;
 				vtsls.enable = true;
+				zk.enable = true;
 			};
 		};
 	};
diff --git a/modules/home/neovim/plugins/treesitter.nix b/modules/home/neovim/plugins/treesitter.nix
index 4ab907c..8465731 100644
--- a/modules/home/neovim/plugins/treesitter.nix
+++ b/modules/home/neovim/plugins/treesitter.nix
@@ -11,10 +11,11 @@
 			fish
 			heex
 			json
+			markdown
 			nix
 			toml
+			tsx
 			typescript
-			vue
 			yaml
 		];
 	};
diff --git a/modules/home/neovim/plugins/zk.nix b/modules/home/neovim/plugins/zk.nix
new file mode 100644
index 0000000..783af8e
--- /dev/null
+++ b/modules/home/neovim/plugins/zk.nix
@@ -0,0 +1,7 @@
+{
+	programs.nixvim.plugins.zk = {
+		enable = true;
+		settings = {
+		};
+	};
+}
diff --git a/modules/home/zk.nix b/modules/home/zk.nix
new file mode 100644
index 0000000..338337e
--- /dev/null
+++ b/modules/home/zk.nix
@@ -0,0 +1,16 @@
+{
+	programs.zk = {
+		enable = true;
+		settings = {
+			notebook = {
+				path = "~/Projects/Personal/Zettelkasten";
+			};
+			note = {
+				language = "en";
+			};
+			extra = {
+				author = "Christoph Schmatzler";
+			};
+		};
+	};
+}