diff --git a/tasks/neovim.yml b/tasks/neovim.yml
index f6e0696..ef4b2e3 100644
--- a/tasks/neovim.yml
+++ b/tasks/neovim.yml
@@ -123,3 +123,6 @@
 
     - src: 'templates/nvim/lua/formatting.lua.j2'
       dest: '{{ xdg_config_dir }}/nvim/lua/formatting.lua'
+
+    - src: 'templates/nvim/lua/diagnostic.lua.j2'
+      dest: '{{ xdg_config_dir }}/nvim/lua/diagnostic.lua'
diff --git a/templates/nvim/init.lua.j2 b/templates/nvim/init.lua.j2
index 309c912..d017527 100644
--- a/templates/nvim/init.lua.j2
+++ b/templates/nvim/init.lua.j2
@@ -12,3 +12,4 @@ require('_nvim-tree')
 require('lua-line')
 require('_source-link')
 require('formatting')
+require('diagnostic')
diff --git a/templates/nvim/lua/diagnostic.lua.j2 b/templates/nvim/lua/diagnostic.lua.j2
new file mode 100644
index 0000000..97baa9e
--- /dev/null
+++ b/templates/nvim/lua/diagnostic.lua.j2
@@ -0,0 +1,11 @@
+-- {{ ansible_managed }}
+
+vim.diagnostic.config {
+  float = {
+    suffix = function(diagnostic)
+      return (' %s | [%s]'):format(diagnostic.code, diagnostic.source)
+    end
+  },
+
+  virtual_text = { current_line = true }
+}
diff --git a/templates/nvim/lua/lsp.lua.j2 b/templates/nvim/lua/lsp.lua.j2
index b324de2..55da53c 100644
--- a/templates/nvim/lua/lsp.lua.j2
+++ b/templates/nvim/lua/lsp.lua.j2
@@ -186,11 +186,3 @@ cmp.setup {
     end,
   },
 }
-
-vim.diagnostic.config {
-  float = {
-    suffix = function(diagnostic)
-      return (' %s | [%s]'):format(diagnostic.code, diagnostic.source)
-    end
-  },
-}