From dce4e28c82609549e0419b0fe934a0605f20fb54 Mon Sep 17 00:00:00 2001 From: Barrett Ruth Date: Mon, 23 Feb 2026 09:42:24 -0500 Subject: [PATCH] fix(nvim): oil git nvim refacotr --- config/nvim/lua/plugins/git.lua | 44 ------------------------- config/nvim/lua/plugins/nvim.lua | 56 ++++++++++++++++++++++++++++++-- home/modules/editor.nix | 1 + 3 files changed, 55 insertions(+), 46 deletions(-) diff --git a/config/nvim/lua/plugins/git.lua b/config/nvim/lua/plugins/git.lua index eefe472..bcab21f 100644 --- a/config/nvim/lua/plugins/git.lua +++ b/config/nvim/lua/plugins/git.lua @@ -225,50 +225,6 @@ return { }, }, }, - { - 'malewicz1337/oil-git.nvim', - dir = '~/dev/oil-git.nvim', - opts = { - symbol_position = 'signcolumn', - can_use_signcolumn = function() - return true - end, - show_file_highlights = false, - show_directory_highlights = false, - symbols = { - file = { - added = '│', - modified = '│', - renamed = '│', - deleted = '_', - copied = '│', - conflict = '│', - untracked = '│', - ignored = ' ', - }, - directory = { - added = '│', - modified = '│', - renamed = '│', - deleted = '_', - copied = '│', - conflict = '│', - untracked = '│', - ignored = ' ', - }, - }, - highlights = { - OilGitAdded = { link = 'GitSignsAdd' }, - OilGitModified = { link = 'GitSignsChange' }, - OilGitRenamed = { link = 'GitSignsChange' }, - OilGitDeleted = { link = 'GitSignsDelete' }, - OilGitCopied = { link = 'GitSignsChange' }, - OilGitConflict = { link = 'GitSignsDelete' }, - OilGitUntracked = { link = 'GitSignsAdd' }, - OilGitIgnored = { link = 'Comment' }, - }, - }, - }, { 'lewis6991/gitsigns.nvim', event = 'VeryLazy', diff --git a/config/nvim/lua/plugins/nvim.lua b/config/nvim/lua/plugins/nvim.lua index a8daecb..3477ac4 100644 --- a/config/nvim/lua/plugins/nvim.lua +++ b/config/nvim/lua/plugins/nvim.lua @@ -333,6 +333,52 @@ return { end, }, }, + dependencies = { + { + 'malewicz1337/oil-git.nvim', + dir = '~/dev/oil-git.nvim', + opts = { + symbol_position = 'signcolumn', + can_use_signcolumn = function() + return true + end, + show_file_highlights = false, + show_directory_highlights = false, + symbols = { + file = { + added = '│', + modified = '│', + renamed = '│', + deleted = '_', + copied = '│', + conflict = '│', + untracked = '│', + ignored = ' ', + }, + directory = { + added = '│', + modified = '│', + renamed = '│', + deleted = '_', + copied = '│', + conflict = '│', + untracked = '│', + ignored = ' ', + }, + }, + highlights = { + OilGitAdded = { link = 'GitSignsAdd' }, + OilGitModified = { link = 'GitSignsChange' }, + OilGitRenamed = { link = 'GitSignsChange' }, + OilGitDeleted = { link = 'GitSignsDelete' }, + OilGitCopied = { link = 'GitSignsChange' }, + OilGitConflict = { link = 'GitSignsDelete' }, + OilGitUntracked = { link = 'GitSignsAdd' }, + OilGitIgnored = { link = 'Comment' }, + }, + }, + }, + }, }, { 'echasnovski/mini.misc', @@ -374,7 +420,13 @@ return { }, { 'wallpants/github-preview.nvim', - keys = { 'm', 'GithubPreviewToggle' }, - config = true, + dir = '~/dev/github-preview.nvim', + keys = { { 'm', 'silent GithubPreviewToggle' } }, + opts = { + single_file = true, + cursor_line = { + disable = true, + }, + }, }, } diff --git a/home/modules/editor.nix b/home/modules/editor.nix index 60240f4..3d698fd 100644 --- a/home/modules/editor.nix +++ b/home/modules/editor.nix @@ -42,6 +42,7 @@ in # runtime/tools nodejs + bun luarocks tree-sitter nixfmt-tree