diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index f45d6b2..7b73891 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -22,6 +22,7 @@
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
   "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
+  "neogen": { "branch": "main", "commit": "4a2f68d3eae0018b04132f1d4590e51484043354" },
   "neogit": { "branch": "master", "commit": "536b4cfc009fc6d8bd771f010f04d48204533fae" },
   "nerdy.nvim": { "branch": "main", "commit": "7c9a4ea4a9ca7063e86dbcf7ce0f233cb59bdc10" },
   "nginx.vim": { "branch": "master", "commit": "cffaec54f0c7f9518de053634413a20e90eac825" },
diff --git a/config/nvim/lua/fschauen/plugins/lsp.lua b/config/nvim/lua/fschauen/plugins/lsp.lua
index 25c428c..c3053e8 100644
--- a/config/nvim/lua/fschauen/plugins/lsp.lua
+++ b/config/nvim/lua/fschauen/plugins/lsp.lua
@@ -30,7 +30,7 @@ local lsp_on_attach = function(--[[client]]_, buffer)
   map("n", "grr",            vim.lsp.buf.rename,          opts)
   map("n", "gt",             vim.lsp.buf.type_definition, opts)
   map("n", "K",              vim.lsp.buf.hover,           opts)
-  map("i", "<c-l>",          vim.lsp.buf.signature_help,  opts)
+  map("i", "<c-,>",          vim.lsp.buf.signature_help,  opts)
   -- stylua: ignore end
 end
 
diff --git a/config/nvim/lua/fschauen/plugins/neogen.lua b/config/nvim/lua/fschauen/plugins/neogen.lua
new file mode 100644
index 0000000..d675965
--- /dev/null
+++ b/config/nvim/lua/fschauen/plugins/neogen.lua
@@ -0,0 +1,38 @@
+return {
+  "danymat/neogen",
+
+  keys = function()
+    local icon = require("fschauen.util.icons").ui.Annotation
+    return {
+      {
+        "<leader>aa",
+        function() require("neogen").generate() end,
+        desc = icon .. " generate [a]nnotation [a]utomatically",
+      },
+      {
+        "<leader>ac",
+        function() require("neogen").generate { type = "class" } end,
+        desc = icon .. " generate [a]nnotation for [c]lass",
+      },
+      {
+        "<leader>af",
+        function() require("neogen").generate { type = "func" } end,
+        desc = icon .. " generate [a]nnotation for [f]unction",
+      },
+      {
+        "<c-l>",
+        function() require("neogen").jump_next() end,
+        mode = "i",
+        desc = icon .. " next annotation placeholder",
+      },
+      {
+        "<c-h>",
+        function() require("neogen").jump_prev() end,
+        mode = "i",
+        desc = icon .. " previous annotation placeholder",
+      },
+    }
+  end,
+
+  config = true,
+}
diff --git a/config/nvim/lua/fschauen/util/icons.lua b/config/nvim/lua/fschauen/util/icons.lua
index 95347e9..3ab70ab 100644
--- a/config/nvim/lua/fschauen/util/icons.lua
+++ b/config/nvim/lua/fschauen/util/icons.lua
@@ -73,6 +73,7 @@ M.kind = {
 }
 
 M.ui = {
+  Annotation            = "",
   Attention             = "",
   Bug                   = "",    -- 
   Checkbox              = "",    --  󰄬 󰄬 