Skip to content

fix: improve diff #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2024
Merged

fix: improve diff #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
168593f
fix: improve diff
mcchrish Aug 24, 2024
6c01e4c
fix: add lazy.nvim instructions
mcchrish Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,18 @@ or try the [built-in collection](#usage).

## Installation

Example installation using packer:
Example installation using lazy.nvim:

```lua
use {
{
"zenbones-theme/zenbones.nvim",
-- Optionally install Lush. Allows for more configuration or extending the colorscheme
-- If you don't want to install lush, make sure to set g:zenbones_compat = 1
-- In Vim, compat mode is turned on as Lush only works in Neovim.
requires = "rktjmp/lush.nvim"
dependencies = "rktjmp/lush.nvim",
lazy = false,
priority = 1000,
opts = {},
}
```

Expand Down Expand Up @@ -140,5 +143,5 @@ There are more similar

## Git mirrors

- [Gitlab](https://gitlab.com/mcchris/zenbones.nvim)
- [Codeberg](https://codeberg.org/mcchris/zenbones.nvim)
- [Gitlab](https://gitlab.com/mcchris/zenbones.nvim)
- [Codeberg](https://codeberg.org/mcchris/zenbones.nvim)
12 changes: 6 additions & 6 deletions lua/zenbones/specs/dark.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ local function generate(p, opt)
sym "@markup.list.checked" { sym "@markup.list" },
sym "@markup.list.unchecked" { sym "@markup.list" },

sym "@diff.plus" { fg = p.leaf },
sym "@diff.minus" { fg = p.rose },
sym "@diff.delta" { fg = p.water },
sym "@diff.plus" { DiffAdd },
sym "@diff.minus" { DiffDelete },
sym "@diff.delta" { DiffChange },

sym "@tag" { Special },
sym "@tag.attribute" { sym "@property" },
Expand Down Expand Up @@ -367,9 +367,9 @@ local function generate(p, opt)
sym "@lsp.typemod.variable.static" { sym "@constant" },

-- Syntax
diffAdded { fg = p.leaf },
diffRemoved { fg = p.rose },
diffChanged { fg = p.water },
diffAdded { DiffAdd },
diffRemoved { DiffDelete },
diffChanged { DiffChange },
diffOldFile { fg = p.rose, gui = "italic" },
diffNewFile { fg = p.leaf, gui = "italic" },
diffFile { fg = p.wood, gui = "bold" },
Expand Down
12 changes: 6 additions & 6 deletions lua/zenbones/specs/light.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@ local function generate(p, opt)
sym "@markup.list.checked" { sym "@markup.list" },
sym "@markup.list.unchecked" { sym "@markup.list" },

sym "@diff.plus" { fg = p.leaf },
sym "@diff.minus" { fg = p.rose },
sym "@diff.delta" { fg = p.water },
sym "@diff.plus" { DiffAdd },
sym "@diff.minus" { DiffDelete },
sym "@diff.delta" { DiffChange },

sym "@tag" { Special },
sym "@tag.attribute" { sym "@property" },
Expand Down Expand Up @@ -367,9 +367,9 @@ local function generate(p, opt)
sym "@lsp.typemod.variable.static" { sym "@constant" },

-- Syntax
diffAdded { fg = p.leaf },
diffRemoved { fg = p.rose },
diffChanged { fg = p.water },
diffAdded { DiffAdd },
diffRemoved { DiffDelete },
diffChanged { DiffChange },
diffOldFile { fg = p.rose, gui = "italic" },
diffNewFile { fg = p.leaf, gui = "italic" },
diffFile { fg = p.wood, gui = "bold" },
Expand Down
Loading