Skip to content
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

plugins/catppuccin!: update integrations #670

Merged
merged 8 commits into from
Nov 13, 2023
Merged

plugins/catppuccin!: update integrations #670

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
13a7d14
plugins/catppuccin: update integrations
mrtnvgr Oct 25, 2023
3647347
add TODOs
mrtnvgr Oct 25, 2023
49bcec6
update mini integration
mrtnvgr Oct 26, 2023
066e8c7
fix indent_blankline.scope_color
mrtnvgr Oct 26, 2023
5d4fad8
sort; update values
mrtnvgr Oct 26, 2023
22930d8
fix ci
mrtnvgr Oct 26, 2023
939df0e
NormalNvim
mrtnvgr Nov 7, 2023
f5d7994
update todos
mrtnvgr Nov 9, 2023
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
190 changes: 116 additions & 74 deletions plugins/colorschemes/catppuccin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,21 +144,52 @@ 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 = ;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You still have a few TODOs left

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These TODOs are special integrations which require additional setup in other plugins. I need help to implement them

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let's leave them as is for now.


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: requires additional setup
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 @@ -172,23 +203,92 @@ 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
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: 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 @@ -199,6 +299,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 @@ -210,6 +314,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 @@ -218,8 +324,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 @@ -233,7 +342,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 @@ -242,74 +351,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
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@
cmp = true;
gitsigns = true;
nvimtree = true;
telescope = true;
telescope = {
enabled = true;
};
notify = false;
mini = false;
mini = {
enabled = false;
};
};
};
};
Expand All @@ -62,18 +66,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