xonecas.io
56101
Df

dotfiles / commit 7bc5c0e

refactor: replace oil.nvim and diffview with nvim-tree, fugitive, and bufferline

- Replace oil.nvim with nvim-tree for VSCode-like file tree sidebar
- Replace diffview with vim-fugitive for simple git diff viewing
- Add bufferline for visual tab bar with mouse support
- Configure ANSI color theme for bufferline and nvim-tree
- Enable global statusline and disable redundant mode message
- Remove buffer navigation keybindings (replaced by tab bar)

xonecas2026-01-30 7bc5c0ea02912c9200424e9c6a86486ee7b4db23 parent 82d0126

9 files changed

nvim/colors/ansi.vim+14−0
@@ -206,3 +206,17 @@ hi link @markup.list Special
206206 hi link @diff.plus diffAdded
207207 hi link @diff.minus diffRemoved
208208 hi link @diff.delta diffChanged
209+
210+" nvim-tree colors
211+hi NvimTreeNormal ctermfg=15 ctermbg=0
212+hi NvimTreeFolderIcon ctermfg=4
213+hi NvimTreeFolderName ctermfg=4
214+hi NvimTreeOpenedFolderName ctermfg=4
215+hi NvimTreeGitDirty ctermfg=3
216+hi NvimTreeGitStaged ctermfg=2
217+hi NvimTreeGitDeleted ctermfg=1
218+hi NvimTreeGitNew ctermfg=6
219+hi NvimTreeGitIgnored ctermfg=8
220+hi NvimTreeSpecialFile ctermfg=13 cterm=underline
221+hi NvimTreeSymlink ctermfg=6 cterm=italic
222+hi NvimTreeRootFolder ctermfg=11 cterm=bold
nvim/init.lua+3−6
@@ -41,6 +41,9 @@ vim.opt.tabstop = 2
4141 vim.opt.shiftwidth = 2
4242 vim.opt.softtabstop = 2
4343
44+-- Statusline settings
45+vim.opt.showmode = false -- Don't show mode in command line (lualine shows it)
46+
4447 -- Set leader key to space (must be set before lazy.nvim)
4548 vim.g.mapleader = ' '
4649 vim.g.maplocalleader = ' '
@@ -70,12 +73,6 @@ require('lazy').setup('plugins', {
7073 local keymap = vim.keymap.set
7174 local opts = { noremap = true, silent = true }
7275
73--- Buffer navigation
74-keymap('n', '<leader>]', ':bnext<CR>', opts)
75-keymap('n', '<leader>[', ':bprev<CR>', opts)
76-keymap('n', '<leader>e', ':e#<CR>', opts)
77-keymap('n', '<leader>x', ':bdelete<CR>', opts)
78-
7976 -- Search highlighting
8077 keymap('n', '<leader>h', ':nohlsearch<CR>', opts)
8178
nvim/lazy-lock.json+7−6
@@ -1,12 +1,13 @@
11 {
22 "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
3- "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
4- "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" },
3+ "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
4+ "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" },
55 "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
66 "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
7- "mason-lspconfig.nvim": { "branch": "main", "commit": "c55bd8a8fb191e24176c206a7af1dd51ce7276a5" },
8- "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
9- "nvim-lspconfig": { "branch": "master", "commit": "7af6f57d517d8cc68f249e0d27364c188a097812" },
7+ "mason-lspconfig.nvim": { "branch": "main", "commit": "fb179adb7161b53ec998b1139002473434586c3f" },
8+ "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
9+ "nvim-lspconfig": { "branch": "master", "commit": "ff9c0af8f9b2097fdd2695058db7e04c193908aa" },
10+ "nvim-tree.lua": { "branch": "master", "commit": "c07ce43527e5f0242121f4eb1feb7ac0ecea8275" },
1011 "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" },
11- "oil.nvim": { "branch": "master", "commit": "f55b25e493a7df76371cfadd0ded5004cb9cd48a" }
12+ "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }
1213 }
nvim/lua/plugins/bufferline.lua+99−0
@@ -0,0 +1,99 @@
1+-- bufferline.nvim - VSCode-like buffer tabs
2+return {
3+ 'akinsho/bufferline.nvim',
4+ version = '*',
5+ dependencies = { 'nvim-tree/nvim-web-devicons' },
6+ config = function()
7+ require('bufferline').setup({
8+ options = {
9+ -- Mouse support for clicking tabs
10+ mode = 'buffers',
11+ numbers = 'none',
12+ close_command = 'bdelete! %d',
13+ right_mouse_command = 'bdelete! %d',
14+ left_mouse_command = 'buffer %d',
15+ middle_mouse_command = nil,
16+ -- Show close button on tabs
17+ show_buffer_close_icons = true,
18+ show_close_icon = false,
19+ -- Show modified indicator
20+ modified_icon = '●',
21+ -- Show icons
22+ show_buffer_icons = true,
23+ -- Tab appearance
24+ separator_style = 'thin',
25+ always_show_bufferline = true,
26+ -- Integration with nvim-tree
27+ offsets = {
28+ {
29+ filetype = 'NvimTree',
30+ text = 'File Explorer',
31+ text_align = 'left',
32+ separator = true,
33+ },
34+ },
35+ },
36+ -- ANSI color theme (matches colors/ansi.vim)
37+ highlights = {
38+ -- Background fill
39+ fill = {
40+ ctermbg = 'NONE',
41+ },
42+ -- Inactive buffers (not visible)
43+ background = {
44+ ctermfg = 7,
45+ ctermbg = 0,
46+ },
47+ -- Visible buffers (visible but not selected)
48+ buffer_visible = {
49+ ctermfg = 15,
50+ ctermbg = 8,
51+ },
52+ -- Selected buffer
53+ buffer_selected = {
54+ ctermfg = 0,
55+ ctermbg = 11,
56+ },
57+ -- Modified indicator
58+ modified = {
59+ ctermfg = 7,
60+ ctermbg = 0,
61+ },
62+ modified_visible = {
63+ ctermfg = 15,
64+ ctermbg = 8,
65+ },
66+ modified_selected = {
67+ ctermfg = 0,
68+ ctermbg = 11,
69+ },
70+ -- Separators
71+ separator = {
72+ ctermfg = 8,
73+ ctermbg = 0,
74+ },
75+ separator_visible = {
76+ ctermfg = 8,
77+ ctermbg = 8,
78+ },
79+ separator_selected = {
80+ ctermfg = 8,
81+ ctermbg = 11,
82+ },
83+ -- Close buttons
84+ close_button = {
85+ ctermfg = 7,
86+ ctermbg = 0,
87+ },
88+ close_button_visible = {
89+ ctermfg = 15,
90+ ctermbg = 8,
91+ },
92+ close_button_selected = {
93+ ctermfg = 0,
94+ ctermbg = 11,
95+ },
96+ },
97+ })
98+ end,
99+}
nvim/lua/plugins/diffview.lua+0−30
@@ -1,30 +0,0 @@
1--- diffview.nvim - Single tabpage interface for cycling through diffs
2-return {
3- 'sindrets/diffview.nvim',
4- dependencies = { 'nvim-tree/nvim-web-devicons' },
5- config = function()
6- require('diffview').setup({
7- diff_binaries = false, -- Show diffs for binaries
8- enhanced_diff_hl = true, -- Use nvim's builtin diff highlighting
9- use_icons = true, -- Requires nvim-web-devicons
10- view = {
11- -- Configure the layout and behavior of different types of views
12- default = {
13- layout = 'diff2_horizontal',
14- },
15- },
16- file_panel = {
17- listing_style = 'list', -- 'list' or 'tree'
18- },
19- keymaps = {
20- disable_defaults = false, -- Disable default keymaps
21- },
22- })
23-
24- -- Keybindings
25- vim.keymap.set('n', '<leader>dv', '<CMD>DiffviewOpen<CR>', { desc = 'Open diffview' })
26- vim.keymap.set('n', '<leader>dc', '<CMD>DiffviewClose<CR>', { desc = 'Close diffview' })
27- vim.keymap.set('n', '<leader>dh', '<CMD>DiffviewFileHistory %<CR>', { desc = 'File history (current file)' })
28- vim.keymap.set('n', '<leader>df', '<CMD>DiffviewFileHistory<CR>', { desc = 'File history (all files)' })
29- end,
30-}
nvim/lua/plugins/fugitive.lua+8−0
@@ -0,0 +1,8 @@
1+-- vim-fugitive - Git integration
2+return {
3+ 'tpope/vim-fugitive',
4+ config = function()
5+ -- Keybinding for git diff - opens in current buffer
6+ vim.keymap.set('n', '<leader>d', ':Git ++curwin --paginate diff<CR>', { noremap = true, silent = true, desc = 'Git diff' })
7+ end,
8+}
nvim/lua/plugins/lualine.lua+2−2
@@ -10,12 +10,12 @@ return {
1010 component_separators = { left = '|', right = '|' },
1111 section_separators = { left = '', right = '' },
1212 disabled_filetypes = {
13- statusline = {},
13+ statusline = {'NvimTree'},
1414 winbar = {},
1515 },
1616 ignore_focus = {},
1717 always_divide_middle = true,
18- globalstatus = false,
18+ globalstatus = true,
1919 refresh = {
2020 statusline = 1000,
2121 tabline = 1000,
nvim/lua/plugins/nvim-tree.lua+60−0
@@ -0,0 +1,60 @@
1+-- nvim-tree.lua - File explorer tree
2+return {
3+ 'nvim-tree/nvim-tree.lua',
4+ dependencies = { 'nvim-tree/nvim-web-devicons' },
5+ config = function()
6+ -- Disable netrw (nvim's default file explorer)
7+ vim.g.loaded_netrw = 1
8+ vim.g.loaded_netrwPlugin = 1
9+
10+ require('nvim-tree').setup({
11+ -- Open tree on startup
12+ view = {
13+ width = 30,
14+ side = 'left',
15+ },
16+ -- Git integration
17+ git = {
18+ enable = true,
19+ ignore = false,
20+ },
21+ -- Show git status icons
22+ renderer = {
23+ icons = {
24+ show = {
25+ git = true,
26+ folder = true,
27+ file = true,
28+ folder_arrow = true,
29+ },
30+ glyphs = {
31+ git = {
32+ unstaged = "✗",
33+ staged = "✓",
34+ unmerged = "",
35+ renamed = "➜",
36+ untracked = "★",
37+ deleted = "",
38+ ignored = "◌",
39+ },
40+ },
41+ },
42+ },
43+ -- Automatically open on startup
44+ actions = {
45+ open_file = {
46+ quit_on_open = false,
47+ },
48+ },
49+ })
50+
51+ -- Keybinding to toggle tree
52+ vim.keymap.set('n', '<leader>e', ':NvimTreeToggle<CR>', { noremap = true, silent = true, desc = 'Toggle file explorer' })
53+
54+ -- Auto-open on startup
55+ local function open_nvim_tree()
56+ require('nvim-tree.api').tree.open()
57+ end
58+ vim.api.nvim_create_autocmd({ 'VimEnter' }, { callback = open_nvim_tree })
59+ end,
60+}
nvim/lua/plugins/oil.lua+0−67
@@ -1,67 +0,0 @@
1--- oil.nvim - Edit your filesystem like a buffer
2-return {
3- 'stevearc/oil.nvim',
4- dependencies = { 'nvim-tree/nvim-web-devicons' },
5- config = function()
6- require('oil').setup({
7- -- Oil will take over directory buffers (e.g. `vim .` or `:e src/`)
8- default_file_explorer = true,
9- -- Columns to show in oil buffer
10- columns = {
11- 'icon',
12- -- 'permissions',
13- -- 'size',
14- -- 'mtime',
15- },
16- -- Buffer-local options to use for oil buffers
17- buf_options = {
18- buflisted = false,
19- bufhidden = 'hide',
20- },
21- -- Window-local options to use for oil buffers
22- win_options = {
23- wrap = false,
24- signcolumn = 'no',
25- cursorcolumn = false,
26- foldcolumn = '0',
27- spell = false,
28- list = false,
29- conceallevel = 3,
30- concealcursor = 'nvic',
31- },
32- -- Send deleted files to the trash instead of permanently deleting them
33- delete_to_trash = false,
34- -- Skip confirmation for simple operations
35- skip_confirm_for_simple_edits = false,
36- -- Keymaps in oil buffer
37- keymaps = {
38- ['g?'] = 'actions.show_help',
39- ['<CR>'] = 'actions.select',
40- ['<C-s>'] = 'actions.select_vsplit',
41- ['<C-h>'] = 'actions.select_split',
42- ['<C-t>'] = 'actions.select_tab',
43- ['<C-p>'] = 'actions.preview',
44- ['<C-c>'] = 'actions.close',
45- ['<C-l>'] = 'actions.refresh',
46- ['-'] = 'actions.parent',
47- ['_'] = 'actions.open_cwd',
48- ['`'] = 'actions.cd',
49- ['~'] = 'actions.tcd',
50- ['gs'] = 'actions.change_sort',
51- ['gx'] = 'actions.open_external',
52- ['g.'] = 'actions.toggle_hidden',
53- ['g\\'] = 'actions.toggle_trash',
54- },
55- -- Set to false to disable all of the above keymaps
56- use_default_keymaps = true,
57- view_options = {
58- -- Show files and directories that start with "."
59- show_hidden = false,
60- },
61- })
62-
63- -- Keybindings
64- vim.keymap.set('n', '-', '<CMD>Oil<CR>', { desc = 'Open parent directory' })
65- vim.keymap.set('n', '<leader>n', '<CMD>Oil<CR>', { desc = 'Open oil file explorer' })
66- end,
67-}