barrett/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix(nvim): oil-git.nvim

Browse source
This commit is contained in:
Barrett Ruth 2026-02-23 00:41:34 -05:00
parent eedcb569a0
commit 6ff56611d4
Signed by: barrett
GPG key ID: A6C96C9349D2FC81
4 changed files with 30 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
config/nvim/lua/config/lines/statuscolumn.lua
View file

@ -36,7 +36,23 @@ return {
end
return ' '
end,
sign = function()
local marks = vim.api.nvim_buf_get_extmarks(
0, -1, { vim.v.lnum - 1, 0 }, { vim.v.lnum - 1, -1 },
{ details = true, type = 'sign' }
)
for _, mark in ipairs(marks) do
local d = mark[4]
if d and d.sign_text then
local text = vim.trim(d.sign_text)
if text ~= '' then
return '%#' .. (d.sign_hl_group or 'SignColumn') .. '#' .. text
end
end
end
return ' '
end,
statuscolumn = function()
return '%s%{%v:lua.require("config.lines.statuscolumn").fold()%}%=%{%v:lua.require("config.lines.statuscolumn").num()%} '
return '%{%v:lua.require("config.lines.statuscolumn").sign()%}%{%v:lua.require("config.lines.statuscolumn").fold()%}%=%{%v:lua.require("config.lines.statuscolumn").num()%} '
end,
}

2
config/nvim/lua/plugins/git.lua
View file

@ -230,7 +230,7 @@ return {
dir = '~/dev/oil-git.nvim',
opts = {
symbol_position = 'signcolumn',
can_use_signcolumn = function() return 'auto' end,
can_use_signcolumn = function() return true end,
show_file_highlights = false,
show_directory_highlights = false,
symbols = {

3
config/nvim/lua/plugins/nvim.lua
View file

@ -295,9 +295,6 @@ return {
skip_confirm_for_simple_edits = true,
prompt_save_on_select_new_entry = false,
float = { border = 'single' },
win_options = {
signcolumn = 'auto',
},
view_options = {
is_hidden_file = function(name, bufnr)
local dir = require("oil").get_current_dir(bufnr)

24
flake.lock generated
View file

@ -25,11 +25,11 @@
]
},
"locked": {
"lastModified": 1771683283,
"narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
"lastModified": 1771756436,
"narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
"rev": "5bd3589390b431a63072868a90c0f24771ff4cbb",
"type": "github"
},
"original": {
@ -46,11 +46,11 @@
]
},
"locked": {
"lastModified": 1771102945,
"narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=",
"lastModified": 1771756436,
"narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ff5e5d882c51f9a032479595cbab40fd04f56399",
"rev": "5bd3589390b431a63072868a90c0f24771ff4cbb",
"type": "github"
},
"original": {
@ -108,11 +108,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"lastModified": 1771369470,
"narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github"
},
"original": {
@ -137,11 +137,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1771719171,
"narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=",
"lastModified": 1771815813,
"narHash": "sha256-Xol2jIwVaLzkv6KMRYXiDvQy8plKBdvbHRmfCtrUkHg=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "2a71f2e720db962f2522b38704e23e11163e91ae",
"rev": "5607e31e1b0c816e182412c966e8ef2f915b0463",
"type": "github"
},
"original": {