From 5d92255275116afdec6bbd3c07f2105b02833ac7 Mon Sep 17 00:00:00 2001 From: Radu Macocian Date: Fri, 10 Oct 2025 08:59:37 +0200 Subject: [PATCH] added scrollbar and gitsigns --- .config/nvim/after/plugin/gitsigns.lua | 51 ++++++++++++++++++++ .config/nvim/after/plugin/nvim-scrollbar.lua | 20 ++++++++ .config/nvim/lazy-lock.json | 7 +-- .config/nvim/lua/wicked/lazy.lua | 11 ++--- 4 files changed, 80 insertions(+), 9 deletions(-) create mode 100644 .config/nvim/after/plugin/gitsigns.lua create mode 100644 .config/nvim/after/plugin/nvim-scrollbar.lua diff --git a/.config/nvim/after/plugin/gitsigns.lua b/.config/nvim/after/plugin/gitsigns.lua new file mode 100644 index 0000000..798221a --- /dev/null +++ b/.config/nvim/after/plugin/gitsigns.lua @@ -0,0 +1,51 @@ +require('gitsigns').setup { + signs = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged = { + add = { text = '┃' }, + change = { text = '┃' }, + delete = { text = '_' }, + topdelete = { text = '‾' }, + changedelete = { text = '~' }, + untracked = { text = '┆' }, + }, + signs_staged_enable = true, + signcolumn = true, -- Toggle with `:Gitsigns toggle_signs` + numhl = false, -- Toggle with `:Gitsigns toggle_numhl` + linehl = false, -- Toggle with `:Gitsigns toggle_linehl` + word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff` + watch_gitdir = { + follow_files = true + }, + auto_attach = true, + attach_to_untracked = false, + current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + current_line_blame_opts = { + virt_text = true, + virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' + delay = 1000, + ignore_whitespace = false, + virt_text_priority = 100, + use_focus = true, + }, + current_line_blame_formatter = ', - ', + sign_priority = 6, + update_debounce = 100, + status_formatter = nil, -- Use default + max_file_length = 40000, -- Disable if file is longer than this (in lines) + preview_config = { + -- Options passed to nvim_open_win + style = 'minimal', + relative = 'cursor', + row = 0, + col = 1 + }, +} + +vim.keymap.set('n', 'gb', ':Gitsigns blame_line', { desc = '[G]it [B]lame' }) diff --git a/.config/nvim/after/plugin/nvim-scrollbar.lua b/.config/nvim/after/plugin/nvim-scrollbar.lua new file mode 100644 index 0000000..13ec46d --- /dev/null +++ b/.config/nvim/after/plugin/nvim-scrollbar.lua @@ -0,0 +1,20 @@ +require("scrollbar").setup({ + -- Shows marks for gitsigns (add, change, delete) + handlers = { + gitsigns = true, + }, + -- You can customize the marks used + marks = { + GitAdd = { color = "#39993A" }, + GitChange = { color = "#61AFEF" }, + GitDelete = { color = "#E06C75" }, + DiagnosticError = { color = "#E06C75" }, + DiagnosticWarn = { color = "#E5C07B" }, + DiagnosticInfo = { color = "#61AFEF" }, + DiagnosticHint = { color = "#C678DD" }, + }, + handle = { color = "#a7c979", }, +}) + +vim.api.nvim_set_hl(0, "Scrollbar", { bg = "#2d353b" }) +vim.api.nvim_set_hl(0, "ScrollbarHandle", { bg = "#7fbbb3" }) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 405618c..71f33ce 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -4,8 +4,9 @@ "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "everforest-nvim": { "branch": "main", "commit": "d2936185a6d266def29fd7b523d296384580ef08" }, + "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, "harpoon": { "branch": "master", "commit": "1bc17e3e42ea3c46b33c0bbad6a880792692a1b3" }, - "lazy.nvim": { "branch": "main", "commit": "59334064f8604ca073791c25dcc5c9698865406e" }, + "lazy.nvim": { "branch": "main", "commit": "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, @@ -14,8 +15,9 @@ "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" }, "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lspconfig": { "branch": "master", "commit": "e688b486fe9291f151eae7e5c0b5a5c4ef980847" }, + "nvim-lspconfig": { "branch": "master", "commit": "cc2f5f2fa28d240574808e78847978ed6ef20d2a" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-scrollbar": { "branch": "main", "commit": "5b103ef0fd2e8b9b4be3878ed38d224522192c6c" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, @@ -23,7 +25,6 @@ "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, - "vim-merginal": { "branch": "develop", "commit": "3dca10fd8bce10edbc2024651db4ffb6dd2d89de" }, "vim-projectionist": { "branch": "master", "commit": "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } } diff --git a/.config/nvim/lua/wicked/lazy.lua b/.config/nvim/lua/wicked/lazy.lua index 5e1c0f1..d8b0cb0 100644 --- a/.config/nvim/lua/wicked/lazy.lua +++ b/.config/nvim/lua/wicked/lazy.lua @@ -30,20 +30,19 @@ require("lazy").setup({ }, { - dir = '/home/odoo/Projects/odoo-neovim', - lazy = false, + dir = '/home/odoo/Projects/odoo-neovim', + lazy = false, }, - --{ - -- 'macocianradu/odoo-neovim', - -- branch = "Nvim_Plugin", - --}, + --'odoo/odoo-neovim', 'nvim-treesitter/nvim-treesitter', 'theprimeagen/harpoon', + 'petertriho/nvim-scrollbar', 'mbbill/undotree', 'tpope/vim-surround', 'nvim-telescope/telescope-ui-select.nvim', 'sphamba/smear-cursor.nvim', 'williamboman/mason.nvim', + 'lewis6991/gitsigns.nvim', 'tpope/vim-projectionist', 'williamboman/mason-lspconfig.nvim', {