Skip to content

Commit

Permalink
plugins/catppuccin: update integrations (#670)
Browse files Browse the repository at this point in the history 
* plugins/catppuccin: update integrations

* add TODOs

* update mini integration

* fix indent_blankline.scope_color

* sort; update values

* fix ci

* NormalNvim

* update todos
  • Loading branch information
@mrtnvgr
mrtnvgr authored Nov 13, 2023
1 parent 1286a0f commit 47260b5
Show file tree
Hide file tree
Showing 2 changed files with 151 additions and 79 deletions.
209 changes: 135 additions & 74 deletions plugins/colorschemes/catppuccin.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,21 +146,66 @@ in {
integrations = {
aerial = helpers.defaultNullOpts.mkBool false "";

alpha = helpers.defaultNullOpts.mkBool true "";

barbar = helpers.defaultNullOpts.mkBool config.plugins.barbar.enable "";

barbecue = {
dim_dirname = helpers.defaultNullOpts.mkBool true "";

bold_basename = helpers.defaultNullOpts.mkBool true "";

dim_context = helpers.defaultNullOpts.mkBool false "";

alt_background = helpers.defaultNullOpts.mkBool false "";
};

beacon = helpers.defaultNullOpts.mkBool false "";

# TODO: bufferline needs to be loaded after setting up catppuccin or it will highlight incorrectly
# use "akinsho/bufferline.nvim" {
# after = "catppuccin",
# config = function()
# require("bufferline").setup {
# highlights = require("catppuccin.groups.integrations.bufferline").get()
# }
# end
# }
# bufferline = helpers.defaultNullOpts.mkBool false "";

cmp = helpers.defaultNullOpts.mkBool config.plugins.nvim-cmp.enable "";

coc_nvim = helpers.defaultNullOpts.mkBool false "";

dap = {
enabled = helpers.defaultNullOpts.mkBool false "";

enable_ui = helpers.defaultNullOpts.mkBool false "";
};

dashboard =
helpers.defaultNullOpts.mkBool config.plugins.dashboard.enable "";

dropbar = {
enabled = helpers.defaultNullOpts.mkBool false "";

color_mode = helpers.defaultNullOpts.mkBool false "";
};

# TODO: feline requires additional setup
# local ctp_feline = require("catppuccin.groups.integrations.feline")
# ctp_feline.setup()
# require("feline").setup({
# components = ctp_feline.get(),
# })
# feline = helpers.defaultNullOpts.mkBool false "";

fern = helpers.defaultNullOpts.mkBool false "";

fidget = helpers.defaultNullOpts.mkBool false "";

flash = helpers.defaultNullOpts.mkBool true "";

gitgutter =
helpers.defaultNullOpts.mkBool config.plugins.gitgutter.enable "";

Expand All @@ -174,23 +219,97 @@ in {

hop = helpers.defaultNullOpts.mkBool false "";

illuminate = helpers.defaultNullOpts.mkBool false "";
illuminate = {
enabled = helpers.defaultNullOpts.mkBool config.plugins.illuminate.enable "";

lsp = helpers.defaultNullOpts.mkBool false "";
};

indent_blankline = {
enabled = helpers.defaultNullOpts.mkBool config.plugins.indent-blankline.enable "";

scope_color = helpers.defaultNullOpts.mkStr "" "";

colored_indent_levels = helpers.defaultNullOpts.mkBool false "";
};

leap = helpers.defaultNullOpts.mkBool false "";

lightspeed = helpers.defaultNullOpts.mkBool false "";

# TODO: lspsaga.setup call for custom kinds and colors
# require("lspsaga").setup {
# ui = {
# kind = require("catppuccin.groups.integrations.lsp_saga").custom_kind(),
# },
# }
lsp_saga =
helpers.defaultNullOpts.mkBool config.plugins.lspsaga.enable "";

lsp_trouble =
helpers.defaultNullOpts.mkBool config.plugins.trouble.enable "";

markdown = helpers.defaultNullOpts.mkBool false "";
markdown = helpers.defaultNullOpts.mkBool true "";

mason = helpers.defaultNullOpts.mkBool false "";

mini = helpers.defaultNullOpts.mkBool false "";
mini = {
enabled = helpers.defaultNullOpts.mkBool false "";

indentscope_color = helpers.defaultNullOpts.mkStr "" "";
};

native_lsp = {
enabled = helpers.defaultNullOpts.mkBool config.plugins.lsp.enable "";

virtual_text = {
errors =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

hints =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

warnings =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

information =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";
};

underlines = {
errors =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

hints =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

warnings =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

information =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";
};

inlay_hints = {
background = helpers.defaultNullOpts.mkBool true "";
};
};

# TODO: require("nvim-navic").setup { highlight = true }
# or via nixvim options?: plugins.navic.highlight = true
navic = {
enabled = helpers.defaultNullOpts.mkBool false "";

custom_bg = helpers.defaultNullOpts.mkStr "NONE" "";
};

neogit = helpers.defaultNullOpts.mkBool config.plugins.neogit.enable "";

Expand All @@ -201,6 +320,10 @@ in {

noice = helpers.defaultNullOpts.mkBool config.plugins.noice.enable "";

NormalNvim = helpers.defaultNullOpts.mkBool false "";

notifier = helpers.defaultNullOpts.mkBool false "";

notify = helpers.defaultNullOpts.mkBool config.plugins.notify.enable "";

nvimtree =
Expand All @@ -212,6 +335,8 @@ in {

pounce = helpers.defaultNullOpts.mkBool false "";

rainbow_delimiters = helpers.defaultNullOpts.mkBool true "";

sandwich = helpers.defaultNullOpts.mkBool false "";

semantic_tokens = helpers.defaultNullOpts.mkBool false "";
Expand All @@ -220,8 +345,11 @@ in {

telekasten = helpers.defaultNullOpts.mkBool false "";

telescope =
helpers.defaultNullOpts.mkBool config.plugins.telescope.enable "";
telescope = {
enabled = helpers.defaultNullOpts.mkBool config.plugins.telescope.enable "";

style = helpers.defaultNullOpts.mkStr "" "";
};

treesitter =
helpers.defaultNullOpts.mkBool config.plugins.treesitter.enable "";
Expand All @@ -235,7 +363,7 @@ in {

ts_rainbow2 = helpers.defaultNullOpts.mkBool true "";

rainbow_delimiters = helpers.defaultNullOpts.mkBool true "";
ufo = helpers.defaultNullOpts.mkBool true "";

vim_sneak = helpers.defaultNullOpts.mkBool false "";

Expand All @@ -244,74 +372,7 @@ in {
which_key =
helpers.defaultNullOpts.mkBool config.plugins.which-key.enable "";

barbecue = {
dim_dirname = helpers.defaultNullOpts.mkBool true "";

bold_basename = helpers.defaultNullOpts.mkBool true "";

dim_context = helpers.defaultNullOpts.mkBool false "";

alt_background = helpers.defaultNullOpts.mkBool false "";
};

dap = {
enabled = helpers.defaultNullOpts.mkBool false "";

enable_ui = helpers.defaultNullOpts.mkBool false "";
};
indent_blankline = {
enabled =
helpers.defaultNullOpts.mkBool
config.plugins.indent-blankline.enable "";

colored_indent_levels = helpers.defaultNullOpts.mkBool false "";
};

native_lsp = {
enabled = helpers.defaultNullOpts.mkBool config.plugins.lsp.enable "";

virtual_text = {
errors =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

hints =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

warnings =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";

information =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "italic" ]'' "";
};

underlines = {
errors =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

hints =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

warnings =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";

information =
helpers.defaultNullOpts.mkNullable (types.listOf types.str)
''[ "underline" ]'' "";
};
};

navic = {
enabled = helpers.defaultNullOpts.mkBool false "";

custom_bg = helpers.defaultNullOpts.mkStr "NONE" "";
};
window_picker = helpers.defaultNullOpts.mkBool false "";
};
};
};
Expand Down
21 changes: 16 additions & 5 deletions tests/test-sources/plugins/colorschemes/catppuccin.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@
cmp = true;
gitsigns = true;
nvimtree = true;
telescope = true;
telescope = {
enabled = true;
};
notify = false;
mini = false;
mini = {
enabled = false;
};
};
};
};
Expand All @@ -64,18 +68,25 @@
barbar = true;
fidget = true;
gitsigns = true;
illuminate = true;
illuminate = {
enabled = true;
};
indent_blankline = {
enabled = true;
colored_indent_levels = true;
};
lsp_trouble = true;
mini = true;
mini = {
enabled = true;
};
native_lsp.enabled = true;
navic.enabled = true;
nvimtree = true;
overseer = true;
telescope = true;
telescope = {
enabled = true;
style = "nvchad";
};
treesitter = true;
treesitter_context = true;
ts_rainbow2 = true;
Expand Down

0 comments on commit 47260b5

Please sign in to comment.