gitblame and formatting

This commit is contained in:
c 2023-01-11 17:05:54 -06:00
parent 21b3c18f93
commit 3f6193eb3c
4 changed files with 60 additions and 46 deletions

View File

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

View File

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

View File

@ -20,7 +20,7 @@
sections = { sections = {
lualine_a = { 'mode' }, lualine_a = { 'mode' },
lualine_b = { 'branch', 'diff', 'diagnostics' }, lualine_b = { 'branch', 'diff', 'diagnostics' },
lualine_c = {'filename'}, lualine_c = { { 'filename', path = 1 } },
lualine_x = { 'encoding', 'fileformat', 'filetype' }, lualine_x = { 'encoding', 'fileformat', 'filetype' },
lualine_y = { 'progress' }, lualine_y = { 'progress' },
lualine_z = { 'location' } lualine_z = { 'location' }
@ -40,4 +40,3 @@
inactive_winbar = {}, inactive_winbar = {},
extensions = {} extensions = {}
} }

View File

@ -37,7 +37,6 @@ return {
{ 'ayu-theme/ayu-vim' }, { 'ayu-theme/ayu-vim' },
{ 'morhetz/gruvbox' }, { 'morhetz/gruvbox' },
{ 'dikiaap/minimalist' },
{ 'jacoborus/tender.vim' }, { 'jacoborus/tender.vim' },
{ 'jpo/vim-railscasts-theme' }, { 'jpo/vim-railscasts-theme' },
{ 'rainux/vim-desert-warm-256' }, { 'rainux/vim-desert-warm-256' },
@ -51,7 +50,19 @@ return {
-- Git -- Git
{ 'kdheepak/lazygit.nvim' }, { '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 -- Sessions
{ "tpope/vim-obsession" }, { "tpope/vim-obsession" },
@ -120,6 +131,8 @@ return {
} }
}, },
{ 'akinsho/toggleterm.nvim', version = "*", config = true },
-------------------- --------------------
-- Aesthetics -- Aesthetics
-------------------- --------------------
@ -128,7 +141,7 @@ return {
{ 'nvim-lualine/lualine.nvim' }, { 'nvim-lualine/lualine.nvim' },
-- Devicons -- Devicons
{ 'kyazdani42/nvim-web-devicons' }, { 'nvim-tree/nvim-web-devicons' },
-- Indent lines -- Indent lines
{ "lukas-reineke/indent-blankline.nvim" }, { "lukas-reineke/indent-blankline.nvim" },