gitblame and formatting

nvim/.config/nvim/after/plugin/which-key.lua

@@ -17,6 +17,7 @@ wk.register({
 			name = "+git",
 			g = "LazyGit",
 			f = "Git Files",
+			b = "Git Blame",
 		},
 		-- Misc
 		c = "Change Color Scheme",

nvim/.config/nvim/lua/clint/keybindings.lua

@@ -66,6 +66,7 @@ keymap("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]],
 -- Git
 keymap('n', '<Leader>gg', ':LazyGit<CR>', default_ops)
 keymap('n', '<Leader>gf', ':Telescope git_files<CR>', default_ops)
+keymap('n', '<Leader>gb', ':Gitsigns toggle_deleted<CR>', default_ops)
 
 -- File Explorer
 keymap('n', '<Leader>e', ':NeoTreeFocusToggle<CR>', default_ops)

nvim/.config/nvim/lua/clint/statusline.lua

@@ -1,43 +1,42 @@
- 	require('lualine').setup {
-	  options = {
-	    icons_enabled = true,
-	    theme = 'auto',
-	    component_separators = { left = '', right = ''},
-	    section_separators = { left = '', right = ''},
-	    disabled_filetypes = {
-	      statusline = {},
-	      winbar = {},
-	    },
-	    ignore_focus = {},
-	    always_divide_middle = true,
-	    globalstatus = false,
-	    refresh = {
-	      statusline = 1000,
-	      tabline = 1000,
-	      winbar = 1000,
-	    }
-	  },
-	  sections = {
-	    lualine_a = {'mode'},
-	    lualine_b = {'branch', 'diff', 'diagnostics'},
-	    lualine_c = {'filename'},
-	    lualine_x = {'encoding', 'fileformat', 'filetype'},
-	    lualine_y = {'progress'},
-	    lualine_z = {'location'}
-	  },
-	  inactive_sections = {
-	    lualine_a = {},
-	    lualine_b = {},
-	    lualine_c = {'filename'},
-	    lualine_x = {'location'},
-	    lualine_y = {},
-	    lualine_z = {}
-	  },
-	  tabline = {
-		  lualine_a = {'buffers'}
-	  },
-	  winbar = {},
-	  inactive_winbar = {},
-	  extensions = {}
-	}
-
+require('lualine').setup {
+	options = {
+		icons_enabled = true,
+		theme = 'auto',
+		component_separators = { left = '', right = '' },
+		section_separators = { left = '', right = '' },
+		disabled_filetypes = {
+			statusline = {},
+			winbar = {},
+		},
+		ignore_focus = {},
+		always_divide_middle = true,
+		globalstatus = false,
+		refresh = {
+			statusline = 1000,
+			tabline = 1000,
+			winbar = 1000,
+		}
+	},
+	sections = {
+		lualine_a = { 'mode' },
+		lualine_b = { 'branch', 'diff', 'diagnostics' },
+		lualine_c = { { 'filename', path = 1 } },
+		lualine_x = { 'encoding', 'fileformat', 'filetype' },
+		lualine_y = { 'progress' },
+		lualine_z = { 'location' }
+	},
+	inactive_sections = {
+		lualine_a = {},
+		lualine_b = {},
+		lualine_c = { 'filename' },
+		lualine_x = { 'location' },
+		lualine_y = {},
+		lualine_z = {}
+	},
+	tabline = {
+		lualine_a = { 'buffers' }
+	},
+	winbar = {},
+	inactive_winbar = {},
+	extensions = {}
+}

nvim/.config/nvim/lua/plugins/init.lua

@@ -37,7 +37,6 @@ return {
 
 	{ 'ayu-theme/ayu-vim' },
 	{ 'morhetz/gruvbox' },
-	{ 'dikiaap/minimalist' },
 	{ 'jacoborus/tender.vim' },
 	{ 'jpo/vim-railscasts-theme' },
 	{ 'rainux/vim-desert-warm-256' },
@@ -51,7 +50,19 @@ return {
 
 	-- Git
 	{ 'kdheepak/lazygit.nvim' },
-	{ 'lewis6991/gitsigns.nvim', config = true },
+	{ 'lewis6991/gitsigns.nvim', config = {
+		signs = {
+			add          = { hl = 'GitSignsAdd', text = '+', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
+			change       = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
+			delete       = { hl = 'GitSignsDelete', text = '-', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
+			topdelete    = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
+			changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
+			untracked    = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
+		},
+		current_line_blame = true,
+		show_deleted = true,
+	}
+	},
 
 	-- Sessions
 	{ "tpope/vim-obsession" },
@@ -120,6 +131,8 @@ return {
 		}
 	},
 
+	{ 'akinsho/toggleterm.nvim', version = "*", config = true },
+
 	--------------------
 	-- Aesthetics
 	--------------------
@@ -128,7 +141,7 @@ return {
 	{ 'nvim-lualine/lualine.nvim' },
 
 	-- Devicons
-	{ 'kyazdani42/nvim-web-devicons' },
+	{ 'nvim-tree/nvim-web-devicons' },
 
 	-- Indent lines
 	{ "lukas-reineke/indent-blankline.nvim" },