diff --git a/.config/nvim/after/plugin/git-blame.nvim.lua b/.config/nvim/after/plugin/git-blame.nvim.lua
deleted file mode 100644
index 1ad254c..0000000
--- a/.config/nvim/after/plugin/git-blame.nvim.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-local gitblame = require("gitblame")
-
-gitblame.setup({
-  enabled = false,
-  date_format = "%r",
-  message_template = "  [<date> (<author>) <sha> <summary>]",
-  message_when_not_committed = "  [Uncommitted changes]",
-  delay = 250,
-})
-
--- vim.g.gitblame_virtual_text_column = 80
diff --git a/.config/nvim/after/plugin/gitsigns.nvim.lua b/.config/nvim/after/plugin/gitsigns.nvim.lua
new file mode 100644
index 0000000..e0839e1
--- /dev/null
+++ b/.config/nvim/after/plugin/gitsigns.nvim.lua
@@ -0,0 +1,8 @@
+local gitsigns = require("gitsigns")
+
+gitsigns.setup({
+  current_line_blame_opts = { delay = 0 },
+  current_line_blame_formatter = "<author>, <author_time:%R> - <summary>",
+})
+
+vim.api.nvim_create_user_command("Blame", gitsigns.toggle_current_line_blame, { nargs = "?" })
diff --git a/.config/nvim/lua/paq-setup.lua b/.config/nvim/lua/paq-setup.lua
index f252998..6deeba1 100644
--- a/.config/nvim/lua/paq-setup.lua
+++ b/.config/nvim/lua/paq-setup.lua
@@ -63,7 +63,7 @@ bootstrap_paq({
   { "JoosepAlviste/nvim-ts-context-commentstring" }, -- commentstring based on cursor position (e.g. for Svelte)
   { "Wansmer/treesj" },
   { "michaelb/sniprun", build = "sh install.sh" },
-  { "f-person/git-blame.nvim" },
+  { "lewis6991/gitsigns.nvim" },
   { "brenoprata10/nvim-highlight-colors" },
   { "razak17/tailwind-fold.nvim" },
   { "rmagatti/auto-session" },