remove web-devicons and add git blame

wongsingfo · Nov 4, 2023 · 3cc21ae · 3cc21ae
1 parent 6dbc79a
commit 3cc21ae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/stow-dotfiles/nvim/.config/nvim/lazy-lock.json b/stow-dotfiles/nvim/.config/nvim/lazy-lock.json
@@ -5,11 +5,12 @@
   "codeium.nvim": { "branch": "main", "commit": "b36eaadec45858606a2a22e79cf681cd7511d272" },
   "diffview.nvim": { "branch": "main", "commit": "e91110d2a7f8e2f667666aba6ea089ff823f8748" },
   "fidget.nvim": { "branch": "legacy", "commit": "90c22e47be057562ee9566bad313ad42d622c1d3" },
+  "git-blame.nvim": { "branch": "master", "commit": "1792125237260dc2a03ba57d31c39179e6049f07" },
   "gitsigns.nvim": { "branch": "main", "commit": "5d73da785a3c05fd63ac31769079db05169a6ec7" },
   "gruvbox": { "branch": "master", "commit": "bf2885a95efdad7bd5e4794dd0213917770d79b7" },
   "guard-collection": { "branch": "main", "commit": "41d4e036e350c44316c00eeaa651bb00ac24916f" },
   "guard.nvim": { "branch": "main", "commit": "71a5e4861fc65dd6298bdb6e6d3027e81c134708" },
-  "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" },
+  "lazy.nvim": { "branch": "main", "commit": "16603c6917435d8446f7357cb61095138a417085" },
   "lsp_signature.nvim": { "branch": "master", "commit": "58d4e810801da74c29313da86075d6aea537501f" },
   "lspkind.nvim": { "branch": "master", "commit": "57610d5ab560c073c465d6faf0c19f200cb67e6e" },
   "lspsaga.nvim": { "branch": "main", "commit": "d42fe8162356f3b55c24044f94e1880a4c317a95" },
@@ -20,7 +21,6 @@
   "nvim-osc52": { "branch": "main", "commit": "3e96035d62290183fe7a11418db2b254fcfcaee3" },
   "nvim-treesitter": { "branch": "master", "commit": "4fd6d9dc175f367cdcec87630d8a3950ba7daef4" },
   "nvim-treesitter-context": { "branch": "master", "commit": "6f8f788738b968f24a108ee599c5be0031f94f06" },
-  "nvim-web-devicons": { "branch": "master", "commit": "efbfed0567ef4bfac3ce630524a0f6c8451c5534" },
   "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "rnvimr": { "branch": "main", "commit": "5f0483d1c107ab1fe7e0af08cdf7900aa0dcb40e" },
   "tcomment_vim": { "branch": "master", "commit": "b4930f9da28647e5417d462c341013f88184be7e" },

diff --git a/stow-dotfiles/nvim/.config/nvim/lua/core/keybindings.lua b/stow-dotfiles/nvim/.config/nvim/lua/core/keybindings.lua
@@ -193,6 +193,9 @@ map('n', '<leader>lg', '<cmd>LazyGit<cr>', opt)
 -- Rnvimr (ranger)
 map('n', '<leader>ra', '<cmd>RnvimrToggle<cr>', opt)
 
+-- GitBlame
+map('n', '<leader>gb', '<cmd>GitBlameToggle<cr>', opt)
+
 wk.register({
 	["<c-n>"] = "NvimTreeToggle",
 	["<c-p>"] = "Telescope find_files",

diff --git a/stow-dotfiles/nvim/.config/nvim/lua/core/plugins.lua b/stow-dotfiles/nvim/.config/nvim/lua/core/plugins.lua
@@ -36,12 +36,25 @@ require('lazy').setup({
 	"tpope/vim-sleuth",
 	"ojroques/nvim-osc52",
 	"tpope/vim-vinegar",
-	-- 'f-person/git-blame.nvim',
+	{
+		'f-person/git-blame.nvim',
+		config = function()
+			require'gitblame'.setup({
+				enabled = false
+			})
+		end
+	},
 	{
 		'lewis6991/gitsigns.nvim',
 		opts = {},
 	},
-	"sindrets/diffview.nvim",
+	{
+		"sindrets/diffview.nvim",
+		opts = {
+			-- Requires nvim-web-devicons
+			use_icons = false,
+		}
+	},
 
 	-- UI
 	-- {