NvChad / base46

NvChad's base46 theme plugin with caching ( Total re-write )
Other
187 stars 194 forks source link

Request: Neogit Integration #299

Closed teoshibin closed 4 months ago

teoshibin commented 6 months ago

Color integration for neogit, here's an awful image of commit diff image

siduck commented 6 months ago

load git integration in your neogit config function or load it after gitsigns.nvim

dofile(vim.g.base46_cache..'git')

andradei commented 4 months ago

@siduck I did that and still have a pretty bad diff color

-- lua/configs/neogit.lua

local options = {
  signs = {
    -- { CLOSED, OPENED }
    hunk = { "", "" },
    item = { "󰁔", "󰁅" },
    section = { "", "" },
  },
}

-- Get correct diff highlighting
dofile(vim.g.base46_cache .. "git")

require("neogit").setup(options)

-- lua/plugins/init.lua

 {
    "NeogitOrg/neogit",
    cmd = "Neogit",
    dependencies = {
      "nvim-lua/plenary.nvim", -- required
      "sindrets/diffview.nvim", -- optional - Diff integration
      "nvim-telescope/telescope.nvim",
    },
    config = function()
      require "configs.neogit"
    end,
  },

The theme is flexoki-light and this is what is looks like:

image

siduck commented 4 months ago

@andradei does it happen with other themes?

andradei commented 4 months ago

Was about to test, but neovim 0.10 just landed and neogit upgraded, breaking for me until I am able to upgrade neovim. I decided to use lazygit instead :)

Frestein commented 4 months ago

@andradei does it happen with other themes?

Yeah, it's happening. I'm having the same problem. image image

siduck commented 4 months ago

i have a lost conversation of this issue, so show me how normal neogit looks vs ours , i'll fix it on weekend :)

Frestein commented 4 months ago

i have a lost conversation of this issue, so show me how normal neogit looks vs ours , i'll fix it on weekend :)

All the highlight groups are here: https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/lib/hl.lua

siduck commented 4 months ago

i have a lost conversation of this issue, so show me how normal neogit looks vs ours , i'll fix it on weekend :)

All the highlight groups are here: https://github.com/NeogitOrg/neogit/blob/master/lua/neogit/lib/hl.lua

wow thats a lot! i'll add it on sunday

siduck commented 4 months ago

@Frestein

M.base46 = {
  integrations = { "neogit" },
}

  {
    "NeogitOrg/neogit",
    cmd = "Neogit",
    dependencies = {
      "sindrets/diffview.nvim", -- optional - Diff integration
    },
    config = function()
      require("neogit").setup()
      dofile(vim.g.base46_cache .. "git")
      dofile(vim.g.base46_cache .. "neogit")
    end,
  }