Merge branch 'lazypm' of https://git.terminallychill.xyz/clint/dotfiles into lazypm

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

@@ -18,6 +18,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/settings.lua

@@ -29,7 +29,3 @@ vim.g.slime_default_config = {
   socket_name = vim.api.nvim_eval('get(split($TMUX, ","), 0)'),
   target_pane = "{bottom}",
 }
-
--- Airline
-vim.g.airline_powerline_fonts = 1
-vim.g.airline_extensions_tabline_enabled = 1

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

@@ -1,7 +1,8 @@
 require('lualine').setup {
 	options = {
 		icons_enabled = true,
-	    theme = 'auto',
+		-- theme = 'auto',
+		theme = 'gruvbox',
 		component_separators = { left = '', right = '' },
 		section_separators = { left = '', right = '' },
 		disabled_filetypes = {
@@ -20,10 +21,10 @@
 	sections = {
 		lualine_a = { 'mode' },
 		lualine_b = { 'branch', 'diff', 'diagnostics' },
-	    lualine_c = {'filename'},
+		lualine_c = { { 'filename', path = 1, file_status = true } },
-	    lualine_x = {'encoding', 'fileformat', 'filetype'},
+		lualine_x = { 'encoding', 'fileformat', },
-	    lualine_y = {'progress'},
+		lualine_y = { 'filetype' },
-	    lualine_z = {'location'}
+		lualine_z = {}
 	},
 	inactive_sections = {
 		lualine_a = {},
@@ -40,4 +41,3 @@
 	inactive_winbar = {},
 	extensions = {}
 }
-

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

@@ -37,12 +37,12 @@ return {
 
 	{ 'ayu-theme/ayu-vim' },
 	{ 'morhetz/gruvbox' },
-	{ 'dikiaap/minimalist' },
 	{ 'jacoborus/tender.vim' },
 	{ 'jpo/vim-railscasts-theme' },
 	{ 'rainux/vim-desert-warm-256' },
 	{ 'ajmwagar/vim-deus' },
 	{ "rebelot/kanagawa.nvim" },
+	{ "glepnir/oceanic-material" },
 
 	--------------------
 	-- Utility
@@ -50,6 +50,19 @@ return {
 
 	-- Git
 	{ 'kdheepak/lazygit.nvim' },
+	{ '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" },
@@ -118,11 +131,19 @@ return {
 		}
 	},
 
+	{ 'akinsho/toggleterm.nvim',
+		version = "*",
+		config = {
+			open_mapping = [[<c-\>]],
+			-- direction = 'float'
+		}
+	},
+
 	--------------------
 	-- Aesthetics
 	--------------------
 
-	-- airline
+	-- status line 
 	{ 'nvim-lualine/lualine.nvim' },
 
 	-- Devicons