diff --git a/nvim/init.lua b/nvim/init.lua
index 76c8e05..2240c40 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -15,3 +15,4 @@ require("thomas.plugins.gitsigns")
 require("thomas.plugins.copilot_plugin")
 require("thomas.plugins.nvim-tree")
 require("thomas.plugins.rainbow-delimiters")
+require("thomas.plugins.gitblame")
diff --git a/nvim/lua/thomas/plugins-setup.lua b/nvim/lua/thomas/plugins-setup.lua
index 8785e98..a753937 100644
--- a/nvim/lua/thomas/plugins-setup.lua
+++ b/nvim/lua/thomas/plugins-setup.lua
@@ -29,17 +29,21 @@ end
 -- plugins to install
 return packer.startup(function(use)
 	-- packer can manage itself
+
 	use("wbthomason/packer.nvim")
+	-- git
+	use("kdheepak/lazygit.nvim")
+	use("tpope/vim-fugitive")
+	use("f-person/git-blame.nvim")
+	use("lewis6991/gitsigns.nvim") -- show line modifications on left hand side
 	use("joshdick/onedark.vim")
 	use("junegunn/vim-easy-align")
 	use("junegunn/rainbow_parentheses.vim")
 	use("HiPhish/rainbow-delimiters.nvim")
-	use("tpope/vim-fugitive")
 	use("junegunn/gv.vim")
 	use("ap/vim-css-color")
 	use("wakatime/vim-wakatime")
 	use("psliwka/vim-smoothie")
-	use("kdheepak/lazygit.nvim")
 	use("nvim-lua/plenary.nvim")
 	use("szw/vim-maximizer")
 	use("tpope/vim-commentary")
@@ -95,9 +99,6 @@ return packer.startup(function(use)
 	use("windwp/nvim-autopairs") -- autoclose parens, brackets, quotes, etc...
 	use({ "windwp/nvim-ts-autotag", after = "nvim-treesitter" }) -- autoclose tags
 
-	-- git integration
-	use("lewis6991/gitsigns.nvim") -- show line modifications on left hand side
-
 	-- GitHub Copilot
 
 	use({
diff --git a/nvim/lua/thomas/plugins/gitblame.lua b/nvim/lua/thomas/plugins/gitblame.lua
new file mode 100644
index 0000000..deb8a93
--- /dev/null
+++ b/nvim/lua/thomas/plugins/gitblame.lua
@@ -0,0 +1,12 @@
+-- import gitblame safely
+local gitblame_status, gitblame = pcall(require, "gitblame")
+if not gitblame then
+	return
+end
+
+gitblame.setup({
+	message_template = "  <author> • <date> • <summary> • <sha>",
+	date_format = "%r (%x)",
+	message_when_not_committed = "",
+	gitblame_use_blame_commit_file_urls = true,
+})