diff --git a/after/plugin/obsidian.lua b/after/plugin/obsidian.lua
new file mode 100644
index 0000000..e6a94e2
--- /dev/null
+++ b/after/plugin/obsidian.lua
@@ -0,0 +1,10 @@
+require("obsidian").setup {
+  workspaces = {
+    {
+      name = "wiki",
+      path = "~/Code/gitlab.com/opdavies/wiki",
+    },
+  },
+
+  new_notes_location = "0 - Inbox",
+}
diff --git a/lib/default.nix b/lib/default.nix
index 8ee5294..4521e80 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -49,6 +49,16 @@ in rec {
           };
         };
 
+        obsidian-nvim = buildVimPlugin {
+          name = "obsidian-nvim";
+          src = pkgs.fetchFromGitHub {
+            owner = "epwalsh/";
+            repo = "obsidian.nvim";
+            rev = "be075a1c8d290a383be755f0cb2411be5d065726";
+            sha256 = "ygqCxoXKnSqfV92EkloGRKqe4zklwu9Xu7iG3XKmXFc=";
+          };
+        };
+
         tabline-vim = buildVimPlugin {
           name = "tabline-vim";
           src = pkgs.fetchFromGitHub {
@@ -105,6 +115,7 @@ in rec {
       inherit (vimPlugins) treesj;
     in [
       customVim.nvim-tmux-navigation
+      customVim.obsidian-nvim
       customVim.tabline-vim
       customVim.vim-caser
       customVim.vim-heritage
@@ -270,6 +281,7 @@ in rec {
 
       # Language servers
       lua54Packages.luacheck
+      pkgs.marksman
       nodePackages."@tailwindcss/language-server"
       nodePackages.bash-language-server
       nodePackages.dockerfile-language-server-nodejs
diff --git a/lua/opdavies/lsp/init.lua b/lua/opdavies/lsp/init.lua
index 3519d04..f3dcab4 100644
--- a/lua/opdavies/lsp/init.lua
+++ b/lua/opdavies/lsp/init.lua
@@ -96,6 +96,7 @@ local servers = {
       },
     },
   },
+  marksman = {},
   nil_ls = {},
   tailwindcss = {
     filetypes = { "html", "html.twig", "javascript", "typescript", "vue" },