From 21b3c18f938a20939d0ff532f75000ba01802467 Mon Sep 17 00:00:00 2001 From: c Date: Tue, 10 Jan 2023 20:55:05 -0600 Subject: [PATCH 1/4] new color :) --- nvim/.config/nvim/lua/plugins/init.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 1520879..868ffdb 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -43,6 +43,7 @@ return { { 'rainux/vim-desert-warm-256' }, { 'ajmwagar/vim-deus' }, { "rebelot/kanagawa.nvim" }, + { "glepnir/oceanic-material" }, -------------------- -- Utility @@ -50,6 +51,7 @@ return { -- Git { 'kdheepak/lazygit.nvim' }, + { 'lewis6991/gitsigns.nvim', config = true }, -- Sessions { "tpope/vim-obsession" }, From 3f6193eb3c69d3220668fd6019aa52cd1a16ec74 Mon Sep 17 00:00:00 2001 From: c Date: Wed, 11 Jan 2023 17:05:54 -0600 Subject: [PATCH 2/4] gitblame and formatting --- nvim/.config/nvim/after/plugin/which-key.lua | 1 + nvim/.config/nvim/lua/clint/keybindings.lua | 1 + nvim/.config/nvim/lua/clint/statusline.lua | 85 ++++++++++---------- nvim/.config/nvim/lua/plugins/init.lua | 19 ++++- 4 files changed, 60 insertions(+), 46 deletions(-) diff --git a/nvim/.config/nvim/after/plugin/which-key.lua b/nvim/.config/nvim/after/plugin/which-key.lua index 8f3da0f..e36a0f3 100644 --- a/nvim/.config/nvim/after/plugin/which-key.lua +++ b/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", diff --git a/nvim/.config/nvim/lua/clint/keybindings.lua b/nvim/.config/nvim/lua/clint/keybindings.lua index 4abb156..d474528 100644 --- a/nvim/.config/nvim/lua/clint/keybindings.lua +++ b/nvim/.config/nvim/lua/clint/keybindings.lua @@ -66,6 +66,7 @@ keymap("n", "s", [[:%s/\<\>//gI]], -- Git keymap('n', 'gg', ':LazyGit', default_ops) keymap('n', 'gf', ':Telescope git_files', default_ops) +keymap('n', 'gb', ':Gitsigns toggle_deleted', default_ops) -- File Explorer keymap('n', 'e', ':NeoTreeFocusToggle', default_ops) diff --git a/nvim/.config/nvim/lua/clint/statusline.lua b/nvim/.config/nvim/lua/clint/statusline.lua index 0732f9a..64d9d83 100644 --- a/nvim/.config/nvim/lua/clint/statusline.lua +++ b/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 = {} +} diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 868ffdb..e7caedd 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/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" }, From c9f18d83dfe0ebbef26da7b1c5d3c1a30648bc06 Mon Sep 17 00:00:00 2001 From: c Date: Wed, 11 Jan 2023 18:11:14 -0600 Subject: [PATCH 3/4] remove airline stuff --- nvim/.config/nvim/lua/clint/settings.lua | 4 ---- nvim/.config/nvim/lua/clint/statusline.lua | 11 ++++++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/nvim/.config/nvim/lua/clint/settings.lua b/nvim/.config/nvim/lua/clint/settings.lua index 5202b91..8d588af 100644 --- a/nvim/.config/nvim/lua/clint/settings.lua +++ b/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 diff --git a/nvim/.config/nvim/lua/clint/statusline.lua b/nvim/.config/nvim/lua/clint/statusline.lua index 64d9d83..31bae49 100644 --- a/nvim/.config/nvim/lua/clint/statusline.lua +++ b/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 @@ require('lualine').setup { 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' } + lualine_c = { { 'filename', path = 1, file_status = true } }, + lualine_x = { 'encoding', 'fileformat', }, + lualine_y = { 'filetype' }, + lualine_z = {} }, inactive_sections = { lualine_a = {}, From 3e0a3be243ba806e158f71341bfb85998bf879a5 Mon Sep 17 00:00:00 2001 From: c Date: Thu, 12 Jan 2023 16:38:49 -0600 Subject: [PATCH 4/4] asdf --- nvim/.config/nvim/lua/plugins/init.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index e7caedd..6aadab2 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -131,13 +131,19 @@ return { } }, - { 'akinsho/toggleterm.nvim', version = "*", config = true }, + { 'akinsho/toggleterm.nvim', + version = "*", + config = { + open_mapping = [[]], + -- direction = 'float' + } + }, -------------------- -- Aesthetics -------------------- - -- airline + -- status line { 'nvim-lualine/lualine.nvim' }, -- Devicons