From 0cbe91d02e1946a748ed04ffce69a59be5b04ba1 Mon Sep 17 00:00:00 2001 From: Nikola Savic Date: Thu, 12 Sep 2024 12:46:58 +0200 Subject: [PATCH] v1.4 --- init.lua | 8 +++++++- lua/custom/plugins/misc.lua | 25 +++++++++++++++++++++++++ lua/custom/plugins/neotree.lua | 6 +++--- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index 3710e7fd..aad49986 100644 --- a/init.lua +++ b/init.lua @@ -217,7 +217,13 @@ vim.keymap.set('n', 'N', 'Nzzzv', opts) vim.keymap.set('n', 'v', 'v', opts) -- split window vertically vim.keymap.set('n', 'h', 's', opts) -- split window horizontally vim.keymap.set('n', 'se', '=', opts) -- make split windows equal width & height -vim.keymap.set('n', 'xs', ':close', opts) -- close current split window +-- vim.keymap.set('n', 'xs', ':close', opts) -- close current split windowleader>xs + +-- Resize splits +vim.keymap.set('n', '+', '+', { noremap = true, silent = true }) -- increase height +vim.keymap.set('n', '-', '-', { noremap = true, silent = true }) -- decrease height +vim.keymap.set('n', '>', '>', { noremap = true, silent = true }) -- increase width +vim.keymap.set('n', '<', '<', { noremap = true, silent = true }) -- decrease width -- Navigate between splits vim.keymap.set('n', '', ':wincmd k', opts) diff --git a/lua/custom/plugins/misc.lua b/lua/custom/plugins/misc.lua index 9c56994c..68d8fd74 100644 --- a/lua/custom/plugins/misc.lua +++ b/lua/custom/plugins/misc.lua @@ -110,4 +110,29 @@ return { vim.cmd [[highlight NotifyBackground guibg=#000000]] end, }, + { 'fladson/vim-kitty' }, + { + 'f-person/git-blame.nvim', + -- load the plugin at startup + event = 'VeryLazy', + -- Because of the keys part, you will be lazy loading this plugin. + -- The plugin wil only load once one of the keys is used. + -- If you want to load the plugin at startup, add something like event = "VeryLazy", + -- or lazy = false. One of both options will work. + opts = { + -- your configuration comes here + -- for example + enabled = true, -- if you want to enable the plugin + message_template = ' • <>', -- template for the blame message, check the Message template section for more options + date_format = '%m-%d-%Y %H:%M:%S', -- template for the date, check Date format section for more options + virtual_text_column = 1, -- virtual text start column, check Start virtual text at column section for more options + }, + }, + { + 'FabijanZulj/blame.nvim', + init = function() + vim.api.nvim_set_keymap('n', 'gB', ':BlameToggle', { noremap = true, silent = true }) + end, + config = true, + }, } diff --git a/lua/custom/plugins/neotree.lua b/lua/custom/plugins/neotree.lua index 01b67254..c712a8c2 100644 --- a/lua/custom/plugins/neotree.lua +++ b/lua/custom/plugins/neotree.lua @@ -135,11 +135,11 @@ return { required_width = 122, -- min width of window required to show this column }, last_modified = { - enabled = true, + enabled = false, required_width = 88, -- min width of window required to show this column }, created = { - enabled = true, + enabled = false, required_width = 110, -- min width of window required to show this column }, symlink_target = { @@ -215,7 +215,7 @@ return { filesystem = { filtered_items = { visible = false, -- when true, they will just be displayed differently than normal items - hide_dotfiles = true, + hide_dotfiles = false, hide_gitignored = true, hide_hidden = true, -- only works on Windows for hidden files/directories hide_by_name = {