From 4b8c8dbf9162de1a2689c886eb6d636e7d20723f Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:55:41 -0300 Subject: [PATCH 01/34] flake/dev/new-plugin: add colorscheme support --- flake/dev/new-plugin.py | 74 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/flake/dev/new-plugin.py b/flake/dev/new-plugin.py index a88de0bd..7513a092 100755 --- a/flake/dev/new-plugin.py +++ b/flake/dev/new-plugin.py @@ -5,7 +5,7 @@ import os import re from argparse import ArgumentParser -# Template for default.nix +# Template for default.nix (plugin) # TODO: conditionally include parts of the template based on args default_nix_template = """{{ lib, ... }}: lib.nixvim.plugins.mkNeovimPlugin {{ @@ -24,7 +24,28 @@ lib.nixvim.plugins.mkNeovimPlugin {{ }} """ -# Template for test file +# Template for default.nix (colorscheme) +colorscheme_nix_template = """{{ lib, ... }}: +lib.nixvim.plugins.mkNeovimPlugin {{ + name = "{name}"; + moduleName = "LUA_MODULE_NAME"; # TODO replace (or remove entirely if it is the same as `name`) + package = "{package}"; + + isColorscheme = true; + colorscheme = "COLORSCHEME_NAME"; # TODO replace (or set to null if it has multiple colorschemes or doesn't need to set colorscheme, or remove completely if same as name) + + {maintainer_todo}maintainers = [ lib.maintainers.{maintainer} ]; + + # TODO provide an example for the `settings` option (or remove entirely if there is no useful example) + # NOTE you can use `lib.literalExpression` or `lib.literalMD` if needed + settingsExample = {{ + foo = 42; + bar.__raw = "function() print('hello') end"; + }}; +}} +""" + +# Template for test file (plugin) test_nix_template = """{{ empty = {{ plugins.{name}.enable = true; @@ -42,6 +63,27 @@ test_nix_template = """{{ }} """ +# Template for test file (colorscheme) +colorscheme_test_nix_template = """{{ + empty = {{ + colorscheme = "COLORSCHEME_NAME"; # TODO replace (or remove completely if doesn't need to set colorscheme) + colorschemes.{name}.enable = true; + }}; + + defaults = {{ + colorscheme = "COLORSCHEME_NAME"; # TODO replace (or remove completely if doesn't need to set colorscheme) + + colorschemes.{name} = {{ + enable = true; + settings = {{ + foo = 42; + bar.__raw = "function() print('hello') end"; + }}; + }}; + }}; +}} +""" + def to_kebab_case(input_string): """ @@ -163,15 +205,15 @@ def find_project_root(root_identifier): # TODO: support interactive unmanaged args def main(): """ - Main function to generate default.nix and test files for a new plugin. + Main function to generate default.nix and test files for a new plugin or colorscheme. """ DEFAULT_MAINTAINER = "YOUR_NAME" parser = ArgumentParser( - description="Generate default.nix and test files for a new plugin" + description="Generate default.nix and test files for a new plugin or colorscheme" ) parser.add_argument( - "originalName", type=str, help="Original name of the new plugin" + "originalName", type=str, help="Original name of the new plugin or colorscheme" ) parser.add_argument( "--package", @@ -186,6 +228,12 @@ def main(): help="Maintainer name (from lib.maintainers)", default=DEFAULT_MAINTAINER, ) + parser.add_argument( + "--colorscheme", + "-c", + action="store_true", + help="Create a colorscheme instead of a plugin", + ) parser.add_argument( "--dry-run", "-d", @@ -207,13 +255,21 @@ def main(): root_identifier = "flake.nix" root_dir = find_project_root(root_identifier) - plugin_path = f"{root_dir}/plugins/by-name/{name}/default.nix" - test_path = f"{root_dir}/tests/test-sources/plugins/by-name/{name}/default.nix" + if args.colorscheme: + plugin_template = colorscheme_nix_template + test_template = colorscheme_test_nix_template + plugin_path = f"{root_dir}/colorschemes/{name}/default.nix" + test_path = f"{root_dir}/tests/test-sources/colorschemes/{name}/default.nix" + else: + plugin_template = default_nix_template + test_template = test_nix_template + plugin_path = f"{root_dir}/plugins/by-name/{name}/default.nix" + test_path = f"{root_dir}/tests/test-sources/plugins/by-name/{name}/default.nix" # Create files create_nix_file( plugin_path, - default_nix_template, + plugin_template, name, args.originalName, package, @@ -223,7 +279,7 @@ def main(): ) create_test_file( test_path, - test_nix_template, + test_template, name, args.dry_run, ) From 269147983c5aec7d41b5e88b6682451a46b0654a Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:57:00 -0300 Subject: [PATCH 02/34] modules/plugins: add colorschemes by-name support --- modules/plugins.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/plugins.nix b/modules/plugins.nix index f2f5228c..9eb2f576 100644 --- a/modules/plugins.nix +++ b/modules/plugins.nix @@ -2,15 +2,21 @@ let inherit (builtins) readDir; inherit (lib.attrsets) foldlAttrs; - inherit (lib.lists) optional; - by-name = ../plugins/by-name; + inherit (lib.lists) optional concatMap; + + mkByName = + dir: + foldlAttrs ( + prev: name: type: + prev ++ optional (type == "directory") (dir + "/${name}") + ) [ ] (readDir dir); in { imports = [ ../plugins ] - ++ foldlAttrs ( - prev: name: type: - prev ++ optional (type == "directory") (by-name + "/${name}") - ) [ ] (readDir by-name); + ++ concatMap mkByName [ + ../colorschemes + ../plugins/by-name + ]; } From bf957e1e0b3de7ffe502a8755a90a9bbffbe36c2 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:36 -0300 Subject: [PATCH 03/34] colorschemes/ayu: migrate to by-name --- plugins/colorschemes/ayu.nix => colorschemes/ayu/default.nix | 0 plugins/default.nix | 1 - .../colorschemes/ayu.nix => colorschemes/ayu/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/ayu.nix => colorschemes/ayu/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/ayu.nix => colorschemes/ayu/default.nix} (100%) diff --git a/plugins/colorschemes/ayu.nix b/colorschemes/ayu/default.nix similarity index 100% rename from plugins/colorschemes/ayu.nix rename to colorschemes/ayu/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 856cb764..a8e0cba9 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/ayu.nix ./colorschemes/bamboo.nix ./colorschemes/base16 ./colorschemes/catppuccin.nix diff --git a/tests/test-sources/plugins/colorschemes/ayu.nix b/tests/test-sources/colorschemes/ayu/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/ayu.nix rename to tests/test-sources/colorschemes/ayu/default.nix From 81419647b032f928091560cfc2fee1a048108326 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:36 -0300 Subject: [PATCH 04/34] colorschemes/bamboo: migrate to by-name --- .../colorschemes/bamboo.nix => colorschemes/bamboo/default.nix | 0 plugins/default.nix | 1 - .../colorschemes/bamboo.nix => colorschemes/bamboo/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/bamboo.nix => colorschemes/bamboo/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/bamboo.nix => colorschemes/bamboo/default.nix} (100%) diff --git a/plugins/colorschemes/bamboo.nix b/colorschemes/bamboo/default.nix similarity index 100% rename from plugins/colorschemes/bamboo.nix rename to colorschemes/bamboo/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index a8e0cba9..dffda5e2 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/bamboo.nix ./colorschemes/base16 ./colorschemes/catppuccin.nix ./colorschemes/cyberdream.nix diff --git a/tests/test-sources/plugins/colorschemes/bamboo.nix b/tests/test-sources/colorschemes/bamboo/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/bamboo.nix rename to tests/test-sources/colorschemes/bamboo/default.nix From 50c9d03d67578dcbc5f53754079219e814d25b30 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:37 -0300 Subject: [PATCH 05/34] colorschemes/base16: migrate to by-name --- {plugins/colorschemes => colorschemes}/base16/default.nix | 0 {plugins/colorschemes => colorschemes}/base16/theme-list.nix | 0 plugins/default.nix | 1 - .../colorschemes/base16.nix => colorschemes/base16/default.nix} | 0 4 files changed, 1 deletion(-) rename {plugins/colorschemes => colorschemes}/base16/default.nix (100%) rename {plugins/colorschemes => colorschemes}/base16/theme-list.nix (100%) rename tests/test-sources/{plugins/colorschemes/base16.nix => colorschemes/base16/default.nix} (100%) diff --git a/plugins/colorschemes/base16/default.nix b/colorschemes/base16/default.nix similarity index 100% rename from plugins/colorschemes/base16/default.nix rename to colorschemes/base16/default.nix diff --git a/plugins/colorschemes/base16/theme-list.nix b/colorschemes/base16/theme-list.nix similarity index 100% rename from plugins/colorschemes/base16/theme-list.nix rename to colorschemes/base16/theme-list.nix diff --git a/plugins/default.nix b/plugins/default.nix index dffda5e2..5835c146 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/base16 ./colorschemes/catppuccin.nix ./colorschemes/cyberdream.nix ./colorschemes/dracula-nvim.nix diff --git a/tests/test-sources/plugins/colorschemes/base16.nix b/tests/test-sources/colorschemes/base16/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/base16.nix rename to tests/test-sources/colorschemes/base16/default.nix From 4de632520bd9dc47b94528332660beb0b4a8d390 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:38 -0300 Subject: [PATCH 06/34] colorschemes/catppuccin: migrate to by-name --- .../catppuccin.nix => colorschemes/catppuccin/default.nix | 0 plugins/default.nix | 1 - .../catppuccin.nix => colorschemes/catppuccin/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/catppuccin.nix => colorschemes/catppuccin/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/catppuccin.nix => colorschemes/catppuccin/default.nix} (100%) diff --git a/plugins/colorschemes/catppuccin.nix b/colorschemes/catppuccin/default.nix similarity index 100% rename from plugins/colorschemes/catppuccin.nix rename to colorschemes/catppuccin/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 5835c146..a10b336b 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/catppuccin.nix ./colorschemes/cyberdream.nix ./colorschemes/dracula-nvim.nix ./colorschemes/dracula.nix diff --git a/tests/test-sources/plugins/colorschemes/catppuccin.nix b/tests/test-sources/colorschemes/catppuccin/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/catppuccin.nix rename to tests/test-sources/colorschemes/catppuccin/default.nix From 6509900055c5b38adceb2c93854749deb7f3abca Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:38 -0300 Subject: [PATCH 07/34] colorschemes/cyberdream: migrate to by-name --- .../cyberdream.nix => colorschemes/cyberdream/default.nix | 0 plugins/default.nix | 1 - .../cyberdream.nix => colorschemes/cyberdream/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/cyberdream.nix => colorschemes/cyberdream/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/cyberdream.nix => colorschemes/cyberdream/default.nix} (100%) diff --git a/plugins/colorschemes/cyberdream.nix b/colorschemes/cyberdream/default.nix similarity index 100% rename from plugins/colorschemes/cyberdream.nix rename to colorschemes/cyberdream/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index a10b336b..2127a9cb 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/cyberdream.nix ./colorschemes/dracula-nvim.nix ./colorschemes/dracula.nix ./colorschemes/everforest.nix diff --git a/tests/test-sources/plugins/colorschemes/cyberdream.nix b/tests/test-sources/colorschemes/cyberdream/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/cyberdream.nix rename to tests/test-sources/colorschemes/cyberdream/default.nix From 89e0e286ebd8d053ddc733985a14e73bdab56268 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:38 -0300 Subject: [PATCH 08/34] colorschemes/dracula-nvim: migrate to by-name --- .../dracula-nvim.nix => colorschemes/dracula-nvim/default.nix | 0 plugins/default.nix | 1 - .../dracula-nvim.nix => colorschemes/dracula-nvim/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/dracula-nvim.nix => colorschemes/dracula-nvim/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/dracula-nvim.nix => colorschemes/dracula-nvim/default.nix} (100%) diff --git a/plugins/colorschemes/dracula-nvim.nix b/colorschemes/dracula-nvim/default.nix similarity index 100% rename from plugins/colorschemes/dracula-nvim.nix rename to colorschemes/dracula-nvim/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 2127a9cb..cccd6304 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/dracula-nvim.nix ./colorschemes/dracula.nix ./colorschemes/everforest.nix ./colorschemes/github-theme.nix diff --git a/tests/test-sources/plugins/colorschemes/dracula-nvim.nix b/tests/test-sources/colorschemes/dracula-nvim/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/dracula-nvim.nix rename to tests/test-sources/colorschemes/dracula-nvim/default.nix From 48c550442c4bd5a57c9a82d7af5bfe60eb5fb1f6 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:39 -0300 Subject: [PATCH 09/34] colorschemes/dracula: migrate to by-name --- .../colorschemes/dracula.nix => colorschemes/dracula/default.nix | 0 plugins/default.nix | 1 - .../dracula.nix => colorschemes/dracula/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/dracula.nix => colorschemes/dracula/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/dracula.nix => colorschemes/dracula/default.nix} (100%) diff --git a/plugins/colorschemes/dracula.nix b/colorschemes/dracula/default.nix similarity index 100% rename from plugins/colorschemes/dracula.nix rename to colorschemes/dracula/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index cccd6304..2dda0346 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/dracula.nix ./colorschemes/everforest.nix ./colorschemes/github-theme.nix ./colorschemes/gruvbox.nix diff --git a/tests/test-sources/plugins/colorschemes/dracula.nix b/tests/test-sources/colorschemes/dracula/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/dracula.nix rename to tests/test-sources/colorschemes/dracula/default.nix From 5cbafef4edfd76c3978832a5867913f80dcf6f91 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:39 -0300 Subject: [PATCH 10/34] colorschemes/everforest: migrate to by-name --- .../everforest.nix => colorschemes/everforest/default.nix | 0 plugins/default.nix | 1 - .../everforest.nix => colorschemes/everforest/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/everforest.nix => colorschemes/everforest/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/everforest.nix => colorschemes/everforest/default.nix} (100%) diff --git a/plugins/colorschemes/everforest.nix b/colorschemes/everforest/default.nix similarity index 100% rename from plugins/colorschemes/everforest.nix rename to colorschemes/everforest/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 2dda0346..5cb66ac8 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/everforest.nix ./colorschemes/github-theme.nix ./colorschemes/gruvbox.nix ./colorschemes/gruvbox-baby.nix diff --git a/tests/test-sources/plugins/colorschemes/everforest.nix b/tests/test-sources/colorschemes/everforest/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/everforest.nix rename to tests/test-sources/colorschemes/everforest/default.nix From c578925cd7613fe909b1790431a25e2e2c624b2a Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:40 -0300 Subject: [PATCH 11/34] colorschemes/github-theme: migrate to by-name --- .../github-theme.nix => colorschemes/github-theme/default.nix | 0 plugins/default.nix | 1 - .../github-theme.nix => colorschemes/github-theme/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/github-theme.nix => colorschemes/github-theme/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/github-theme.nix => colorschemes/github-theme/default.nix} (100%) diff --git a/plugins/colorschemes/github-theme.nix b/colorschemes/github-theme/default.nix similarity index 100% rename from plugins/colorschemes/github-theme.nix rename to colorschemes/github-theme/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 5cb66ac8..7b71e322 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/github-theme.nix ./colorschemes/gruvbox.nix ./colorschemes/gruvbox-baby.nix ./colorschemes/gruvbox-material.nix diff --git a/tests/test-sources/plugins/colorschemes/github-theme.nix b/tests/test-sources/colorschemes/github-theme/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/github-theme.nix rename to tests/test-sources/colorschemes/github-theme/default.nix From 712ee8b31d179cfb98685f32019dfb958fc10c83 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:40 -0300 Subject: [PATCH 12/34] colorschemes/gruvbox: migrate to by-name --- .../colorschemes/gruvbox.nix => colorschemes/gruvbox/default.nix | 0 plugins/default.nix | 1 - .../gruvbox.nix => colorschemes/gruvbox/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/gruvbox.nix => colorschemes/gruvbox/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/gruvbox.nix => colorschemes/gruvbox/default.nix} (100%) diff --git a/plugins/colorschemes/gruvbox.nix b/colorschemes/gruvbox/default.nix similarity index 100% rename from plugins/colorschemes/gruvbox.nix rename to colorschemes/gruvbox/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 7b71e322..eb6f6ca3 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/gruvbox.nix ./colorschemes/gruvbox-baby.nix ./colorschemes/gruvbox-material.nix ./colorschemes/gruvbox-material-nvim.nix diff --git a/tests/test-sources/plugins/colorschemes/gruvbox.nix b/tests/test-sources/colorschemes/gruvbox/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/gruvbox.nix rename to tests/test-sources/colorschemes/gruvbox/default.nix From e943cb743ca73c3f1e05af622a3939d315bd6074 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:41 -0300 Subject: [PATCH 13/34] colorschemes/gruvbox-baby: migrate to by-name --- .../gruvbox-baby.nix => colorschemes/gruvbox-baby/default.nix | 0 plugins/default.nix | 1 - .../gruvbox-baby.nix => colorschemes/gruvbox-baby/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/gruvbox-baby.nix => colorschemes/gruvbox-baby/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/gruvbox-baby.nix => colorschemes/gruvbox-baby/default.nix} (100%) diff --git a/plugins/colorschemes/gruvbox-baby.nix b/colorschemes/gruvbox-baby/default.nix similarity index 100% rename from plugins/colorschemes/gruvbox-baby.nix rename to colorschemes/gruvbox-baby/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index eb6f6ca3..348d9570 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/gruvbox-baby.nix ./colorschemes/gruvbox-material.nix ./colorschemes/gruvbox-material-nvim.nix ./colorschemes/kanagawa.nix diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-baby.nix b/tests/test-sources/colorschemes/gruvbox-baby/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/gruvbox-baby.nix rename to tests/test-sources/colorschemes/gruvbox-baby/default.nix From 89c0e0a8c51c0d4b093b07a9e4eb3eb40fdafd5e Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:41 -0300 Subject: [PATCH 14/34] colorschemes/gruvbox-material: migrate to by-name --- .../gruvbox-material/default.nix | 0 plugins/default.nix | 1 - .../gruvbox-material/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/gruvbox-material.nix => colorschemes/gruvbox-material/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/gruvbox-material.nix => colorschemes/gruvbox-material/default.nix} (100%) diff --git a/plugins/colorschemes/gruvbox-material.nix b/colorschemes/gruvbox-material/default.nix similarity index 100% rename from plugins/colorschemes/gruvbox-material.nix rename to colorschemes/gruvbox-material/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 348d9570..523b466b 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/gruvbox-material.nix ./colorschemes/gruvbox-material-nvim.nix ./colorschemes/kanagawa.nix ./colorschemes/kanagawa-paper.nix diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-material.nix b/tests/test-sources/colorschemes/gruvbox-material/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/gruvbox-material.nix rename to tests/test-sources/colorschemes/gruvbox-material/default.nix From 842d748a74f10d19df2675b79fc9f2ef9d564b49 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:42 -0300 Subject: [PATCH 15/34] colorschemes/gruvbox-material-nvim: migrate to by-name --- .../gruvbox-material-nvim/default.nix | 0 plugins/default.nix | 1 - .../gruvbox-material-nvim/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/gruvbox-material-nvim.nix => colorschemes/gruvbox-material-nvim/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/gruvbox-material-nvim.nix => colorschemes/gruvbox-material-nvim/default.nix} (100%) diff --git a/plugins/colorschemes/gruvbox-material-nvim.nix b/colorschemes/gruvbox-material-nvim/default.nix similarity index 100% rename from plugins/colorschemes/gruvbox-material-nvim.nix rename to colorschemes/gruvbox-material-nvim/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 523b466b..caebfd7a 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/gruvbox-material-nvim.nix ./colorschemes/kanagawa.nix ./colorschemes/kanagawa-paper.nix ./colorschemes/melange.nix diff --git a/tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix b/tests/test-sources/colorschemes/gruvbox-material-nvim/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/gruvbox-material-nvim.nix rename to tests/test-sources/colorschemes/gruvbox-material-nvim/default.nix From 641cc172060e03a687f1a7a773bebe3e147b3af4 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:42 -0300 Subject: [PATCH 16/34] colorschemes/kanagawa: migrate to by-name --- .../kanagawa.nix => colorschemes/kanagawa/default.nix | 0 plugins/default.nix | 1 - .../kanagawa.nix => colorschemes/kanagawa/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/kanagawa.nix => colorschemes/kanagawa/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/kanagawa.nix => colorschemes/kanagawa/default.nix} (100%) diff --git a/plugins/colorschemes/kanagawa.nix b/colorschemes/kanagawa/default.nix similarity index 100% rename from plugins/colorschemes/kanagawa.nix rename to colorschemes/kanagawa/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index caebfd7a..2c5e4644 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/kanagawa.nix ./colorschemes/kanagawa-paper.nix ./colorschemes/melange.nix ./colorschemes/mini-base16.nix diff --git a/tests/test-sources/plugins/colorschemes/kanagawa.nix b/tests/test-sources/colorschemes/kanagawa/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/kanagawa.nix rename to tests/test-sources/colorschemes/kanagawa/default.nix From 7e31814abca68841a9728a42e888e8083006228b Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:43 -0300 Subject: [PATCH 17/34] colorschemes/kanagawa-paper: migrate to by-name --- .../kanagawa-paper/default.nix | 0 plugins/default.nix | 1 - .../kanagawa-paper/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/kanagawa-paper.nix => colorschemes/kanagawa-paper/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/kanagawa-paper.nix => colorschemes/kanagawa-paper/default.nix} (100%) diff --git a/plugins/colorschemes/kanagawa-paper.nix b/colorschemes/kanagawa-paper/default.nix similarity index 100% rename from plugins/colorschemes/kanagawa-paper.nix rename to colorschemes/kanagawa-paper/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 2c5e4644..0ef0ca05 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/kanagawa-paper.nix ./colorschemes/melange.nix ./colorschemes/mini-base16.nix ./colorschemes/mini-hues.nix diff --git a/tests/test-sources/plugins/colorschemes/kanagawa-paper.nix b/tests/test-sources/colorschemes/kanagawa-paper/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/kanagawa-paper.nix rename to tests/test-sources/colorschemes/kanagawa-paper/default.nix From 51acaf871fbdd0e14f5a7f86202bfbe2274fb2f8 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:43 -0300 Subject: [PATCH 18/34] colorschemes/melange: migrate to by-name --- .../colorschemes/melange.nix => colorschemes/melange/default.nix | 0 plugins/default.nix | 1 - .../melange.nix => colorschemes/melange/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/melange.nix => colorschemes/melange/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/melange.nix => colorschemes/melange/default.nix} (100%) diff --git a/plugins/colorschemes/melange.nix b/colorschemes/melange/default.nix similarity index 100% rename from plugins/colorschemes/melange.nix rename to colorschemes/melange/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 0ef0ca05..f006a838 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/melange.nix ./colorschemes/mini-base16.nix ./colorschemes/mini-hues.nix ./colorschemes/modus.nix diff --git a/tests/test-sources/plugins/colorschemes/melange.nix b/tests/test-sources/colorschemes/melange/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/melange.nix rename to tests/test-sources/colorschemes/melange/default.nix From e04b02a01a7cf00f3a8a2c6ec4cb58a489e310b4 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:44 -0300 Subject: [PATCH 19/34] colorschemes/mini-base16: migrate to by-name --- .../mini-base16.nix => colorschemes/mini-base16/default.nix | 0 plugins/default.nix | 1 - .../mini-base16.nix => colorschemes/mini-base16/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/mini-base16.nix => colorschemes/mini-base16/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/mini-base16.nix => colorschemes/mini-base16/default.nix} (100%) diff --git a/plugins/colorschemes/mini-base16.nix b/colorschemes/mini-base16/default.nix similarity index 100% rename from plugins/colorschemes/mini-base16.nix rename to colorschemes/mini-base16/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index f006a838..c79042bb 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/mini-base16.nix ./colorschemes/mini-hues.nix ./colorschemes/modus.nix ./colorschemes/monokai-pro.nix diff --git a/tests/test-sources/plugins/colorschemes/mini-base16.nix b/tests/test-sources/colorschemes/mini-base16/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/mini-base16.nix rename to tests/test-sources/colorschemes/mini-base16/default.nix From 36103c436cea19f9917829f94ae8b291384c24ea Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:44 -0300 Subject: [PATCH 20/34] colorschemes/mini-hues: migrate to by-name --- .../mini-hues.nix => colorschemes/mini-hues/default.nix | 0 plugins/default.nix | 1 - .../mini-hues.nix => colorschemes/mini-hues/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/mini-hues.nix => colorschemes/mini-hues/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/mini-hues.nix => colorschemes/mini-hues/default.nix} (100%) diff --git a/plugins/colorschemes/mini-hues.nix b/colorschemes/mini-hues/default.nix similarity index 100% rename from plugins/colorschemes/mini-hues.nix rename to colorschemes/mini-hues/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index c79042bb..4de94b6b 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/mini-hues.nix ./colorschemes/modus.nix ./colorschemes/monokai-pro.nix ./colorschemes/moonfly.nix diff --git a/tests/test-sources/plugins/colorschemes/mini-hues.nix b/tests/test-sources/colorschemes/mini-hues/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/mini-hues.nix rename to tests/test-sources/colorschemes/mini-hues/default.nix From 0844790396308161141882988236c9b06bf5536e Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:45 -0300 Subject: [PATCH 21/34] colorschemes/modus: migrate to by-name --- plugins/colorschemes/modus.nix => colorschemes/modus/default.nix | 0 plugins/default.nix | 1 - .../colorschemes/modus.nix => colorschemes/modus/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/modus.nix => colorschemes/modus/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/modus.nix => colorschemes/modus/default.nix} (100%) diff --git a/plugins/colorschemes/modus.nix b/colorschemes/modus/default.nix similarity index 100% rename from plugins/colorschemes/modus.nix rename to colorschemes/modus/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 4de94b6b..ee12edd3 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/modus.nix ./colorschemes/monokai-pro.nix ./colorschemes/moonfly.nix ./colorschemes/nightfox.nix diff --git a/tests/test-sources/plugins/colorschemes/modus.nix b/tests/test-sources/colorschemes/modus/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/modus.nix rename to tests/test-sources/colorschemes/modus/default.nix From a098c523eddf44100d7450dae95a110b3b2526ea Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:45 -0300 Subject: [PATCH 22/34] colorschemes/monokai-pro: migrate to by-name --- .../monokai-pro.nix => colorschemes/monokai-pro/default.nix | 0 plugins/default.nix | 1 - .../monokai-pro.nix => colorschemes/monokai-pro/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/monokai-pro.nix => colorschemes/monokai-pro/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/monokai-pro.nix => colorschemes/monokai-pro/default.nix} (100%) diff --git a/plugins/colorschemes/monokai-pro.nix b/colorschemes/monokai-pro/default.nix similarity index 100% rename from plugins/colorschemes/monokai-pro.nix rename to colorschemes/monokai-pro/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index ee12edd3..fb127115 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/monokai-pro.nix ./colorschemes/moonfly.nix ./colorschemes/nightfox.nix ./colorschemes/nord.nix diff --git a/tests/test-sources/plugins/colorschemes/monokai-pro.nix b/tests/test-sources/colorschemes/monokai-pro/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/monokai-pro.nix rename to tests/test-sources/colorschemes/monokai-pro/default.nix From 8739bc0376b935f391e7dd2622a05b9aecfd4d20 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:46 -0300 Subject: [PATCH 23/34] colorschemes/moonfly: migrate to by-name --- .../colorschemes/moonfly.nix => colorschemes/moonfly/default.nix | 0 plugins/default.nix | 1 - .../moonfly.nix => colorschemes/moonfly/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/moonfly.nix => colorschemes/moonfly/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/moonfly.nix => colorschemes/moonfly/default.nix} (100%) diff --git a/plugins/colorschemes/moonfly.nix b/colorschemes/moonfly/default.nix similarity index 100% rename from plugins/colorschemes/moonfly.nix rename to colorschemes/moonfly/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index fb127115..2d30f06c 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/moonfly.nix ./colorschemes/nightfox.nix ./colorschemes/nord.nix ./colorschemes/one.nix diff --git a/tests/test-sources/plugins/colorschemes/moonfly.nix b/tests/test-sources/colorschemes/moonfly/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/moonfly.nix rename to tests/test-sources/colorschemes/moonfly/default.nix From 082a8b9823392f67554ea5b7804b1ecbf0422d29 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:46 -0300 Subject: [PATCH 24/34] colorschemes/nightfox: migrate to by-name --- .../nightfox.nix => colorschemes/nightfox/default.nix | 0 plugins/default.nix | 1 - .../nightfox.nix => colorschemes/nightfox/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/nightfox.nix => colorschemes/nightfox/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/nightfox.nix => colorschemes/nightfox/default.nix} (100%) diff --git a/plugins/colorschemes/nightfox.nix b/colorschemes/nightfox/default.nix similarity index 100% rename from plugins/colorschemes/nightfox.nix rename to colorschemes/nightfox/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 2d30f06c..0a1a2292 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/nightfox.nix ./colorschemes/nord.nix ./colorschemes/one.nix ./colorschemes/onedark.nix diff --git a/tests/test-sources/plugins/colorschemes/nightfox.nix b/tests/test-sources/colorschemes/nightfox/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/nightfox.nix rename to tests/test-sources/colorschemes/nightfox/default.nix From 156890521226e6ce89475ff8cb6bcb830a028df7 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:47 -0300 Subject: [PATCH 25/34] colorschemes/nord: migrate to by-name --- plugins/colorschemes/nord.nix => colorschemes/nord/default.nix | 0 plugins/default.nix | 1 - .../colorschemes/nord.nix => colorschemes/nord/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/nord.nix => colorschemes/nord/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/nord.nix => colorschemes/nord/default.nix} (100%) diff --git a/plugins/colorschemes/nord.nix b/colorschemes/nord/default.nix similarity index 100% rename from plugins/colorschemes/nord.nix rename to colorschemes/nord/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 0a1a2292..ed58cc5e 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/nord.nix ./colorschemes/one.nix ./colorschemes/onedark.nix ./colorschemes/oxocarbon.nix diff --git a/tests/test-sources/plugins/colorschemes/nord.nix b/tests/test-sources/colorschemes/nord/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/nord.nix rename to tests/test-sources/colorschemes/nord/default.nix From 13f8fc39fb2c858c2de1b8305ecb77554ff2ea2d Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:47 -0300 Subject: [PATCH 26/34] colorschemes/one: migrate to by-name --- plugins/colorschemes/one.nix => colorschemes/one/default.nix | 0 plugins/default.nix | 1 - .../colorschemes/one.nix => colorschemes/one/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/one.nix => colorschemes/one/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/one.nix => colorschemes/one/default.nix} (100%) diff --git a/plugins/colorschemes/one.nix b/colorschemes/one/default.nix similarity index 100% rename from plugins/colorschemes/one.nix rename to colorschemes/one/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index ed58cc5e..51ae9355 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/one.nix ./colorschemes/onedark.nix ./colorschemes/oxocarbon.nix ./colorschemes/palette.nix diff --git a/tests/test-sources/plugins/colorschemes/one.nix b/tests/test-sources/colorschemes/one/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/one.nix rename to tests/test-sources/colorschemes/one/default.nix From 1e4d773a639b3836608175c94591af48bf04a87a Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:48 -0300 Subject: [PATCH 27/34] colorschemes/onedark: migrate to by-name --- .../colorschemes/onedark.nix => colorschemes/onedark/default.nix | 0 plugins/default.nix | 1 - .../onedark.nix => colorschemes/onedark/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/onedark.nix => colorschemes/onedark/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/onedark.nix => colorschemes/onedark/default.nix} (100%) diff --git a/plugins/colorschemes/onedark.nix b/colorschemes/onedark/default.nix similarity index 100% rename from plugins/colorschemes/onedark.nix rename to colorschemes/onedark/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 51ae9355..402b13bd 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/onedark.nix ./colorschemes/oxocarbon.nix ./colorschemes/palette.nix ./colorschemes/poimandres.nix diff --git a/tests/test-sources/plugins/colorschemes/onedark.nix b/tests/test-sources/colorschemes/onedark/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/onedark.nix rename to tests/test-sources/colorschemes/onedark/default.nix From 52ff6cf06a62d4a59c848208450e4ac294c97ae9 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:48 -0300 Subject: [PATCH 28/34] colorschemes/oxocarbon: migrate to by-name --- .../oxocarbon.nix => colorschemes/oxocarbon/default.nix | 0 plugins/default.nix | 1 - .../oxocarbon.nix => colorschemes/oxocarbon/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/oxocarbon.nix => colorschemes/oxocarbon/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/oxocarbon.nix => colorschemes/oxocarbon/default.nix} (100%) diff --git a/plugins/colorschemes/oxocarbon.nix b/colorschemes/oxocarbon/default.nix similarity index 100% rename from plugins/colorschemes/oxocarbon.nix rename to colorschemes/oxocarbon/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 402b13bd..09faa5f0 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/oxocarbon.nix ./colorschemes/palette.nix ./colorschemes/poimandres.nix ./colorschemes/rose-pine.nix diff --git a/tests/test-sources/plugins/colorschemes/oxocarbon.nix b/tests/test-sources/colorschemes/oxocarbon/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/oxocarbon.nix rename to tests/test-sources/colorschemes/oxocarbon/default.nix From 88c1a4dbfae9d3bad22b72a2c1a1733745ae2f27 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:49 -0300 Subject: [PATCH 29/34] colorschemes/palette: migrate to by-name --- .../colorschemes/palette.nix => colorschemes/palette/default.nix | 0 plugins/default.nix | 1 - .../palette.nix => colorschemes/palette/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/palette.nix => colorschemes/palette/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/palette.nix => colorschemes/palette/default.nix} (100%) diff --git a/plugins/colorschemes/palette.nix b/colorschemes/palette/default.nix similarity index 100% rename from plugins/colorschemes/palette.nix rename to colorschemes/palette/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 09faa5f0..1f036bd9 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/palette.nix ./colorschemes/poimandres.nix ./colorschemes/rose-pine.nix ./colorschemes/solarized-osaka.nix diff --git a/tests/test-sources/plugins/colorschemes/palette.nix b/tests/test-sources/colorschemes/palette/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/palette.nix rename to tests/test-sources/colorschemes/palette/default.nix From 9fd6528aed2b803a5ddcc916f8149c02be319a1c Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:49 -0300 Subject: [PATCH 30/34] colorschemes/poimandres: migrate to by-name --- .../poimandres.nix => colorschemes/poimandres/default.nix | 0 plugins/default.nix | 1 - .../poimandres.nix => colorschemes/poimandres/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/poimandres.nix => colorschemes/poimandres/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/poimandres.nix => colorschemes/poimandres/default.nix} (100%) diff --git a/plugins/colorschemes/poimandres.nix b/colorschemes/poimandres/default.nix similarity index 100% rename from plugins/colorschemes/poimandres.nix rename to colorschemes/poimandres/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 1f036bd9..21163a5d 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/poimandres.nix ./colorschemes/rose-pine.nix ./colorschemes/solarized-osaka.nix ./colorschemes/tokyonight.nix diff --git a/tests/test-sources/plugins/colorschemes/poimandres.nix b/tests/test-sources/colorschemes/poimandres/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/poimandres.nix rename to tests/test-sources/colorschemes/poimandres/default.nix From c6565a995e6a50e23b6eb5a3c9c335bb227a5de7 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:50 -0300 Subject: [PATCH 31/34] colorschemes/rose-pine: migrate to by-name --- .../rose-pine.nix => colorschemes/rose-pine/default.nix | 0 plugins/default.nix | 1 - .../rose-pine.nix => colorschemes/rose-pine/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/rose-pine.nix => colorschemes/rose-pine/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/rose-pine.nix => colorschemes/rose-pine/default.nix} (100%) diff --git a/plugins/colorschemes/rose-pine.nix b/colorschemes/rose-pine/default.nix similarity index 100% rename from plugins/colorschemes/rose-pine.nix rename to colorschemes/rose-pine/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 21163a5d..99cdef71 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/rose-pine.nix ./colorschemes/solarized-osaka.nix ./colorschemes/tokyonight.nix ./colorschemes/vscode.nix diff --git a/tests/test-sources/plugins/colorschemes/rose-pine.nix b/tests/test-sources/colorschemes/rose-pine/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/rose-pine.nix rename to tests/test-sources/colorschemes/rose-pine/default.nix From 204f7646b89d6f57bf729ced1c8f5a3fe8151881 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:46:50 -0300 Subject: [PATCH 32/34] colorschemes/solarized-osaka: migrate to by-name --- .../solarized-osaka/default.nix | 0 plugins/default.nix | 1 - .../solarized-osaka/default.nix} | 0 3 files changed, 1 deletion(-) rename plugins/colorschemes/solarized-osaka.nix => colorschemes/solarized-osaka/default.nix (100%) rename tests/test-sources/{plugins/colorschemes/solazized-osaka.nix => colorschemes/solarized-osaka/default.nix} (100%) diff --git a/plugins/colorschemes/solarized-osaka.nix b/colorschemes/solarized-osaka/default.nix similarity index 100% rename from plugins/colorschemes/solarized-osaka.nix rename to colorschemes/solarized-osaka/default.nix diff --git a/plugins/default.nix b/plugins/default.nix index 99cdef71..1ccd4b7b 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,7 +2,6 @@ imports = [ ./cmp - ./colorschemes/solarized-osaka.nix ./colorschemes/tokyonight.nix ./colorschemes/vscode.nix diff --git a/tests/test-sources/plugins/colorschemes/solazized-osaka.nix b/tests/test-sources/colorschemes/solarized-osaka/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/solazized-osaka.nix rename to tests/test-sources/colorschemes/solarized-osaka/default.nix From 467013b45c74e279a597c425a9edea3577f296a2 Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:47:19 -0300 Subject: [PATCH 33/34] colorschemes/tokyonight: migrate to by-name --- .../tokyonight/default.nix | 0 plugins/colorschemes/vscode.nix | 32 ---------------- plugins/default.nix | 3 -- .../tokyonight/default.nix} | 0 .../plugins/colorschemes/vscode.nix | 37 ------------------- 5 files changed, 72 deletions(-) rename plugins/colorschemes/tokyonight.nix => colorschemes/tokyonight/default.nix (100%) delete mode 100644 plugins/colorschemes/vscode.nix rename tests/test-sources/{plugins/colorschemes/tokyonight.nix => colorschemes/tokyonight/default.nix} (100%) delete mode 100644 tests/test-sources/plugins/colorschemes/vscode.nix diff --git a/plugins/colorschemes/tokyonight.nix b/colorschemes/tokyonight/default.nix similarity index 100% rename from plugins/colorschemes/tokyonight.nix rename to colorschemes/tokyonight/default.nix diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix deleted file mode 100644 index 8f8a42f6..00000000 --- a/plugins/colorschemes/vscode.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - ... -}: -lib.nixvim.plugins.mkNeovimPlugin { - name = "vscode"; - isColorscheme = true; - package = "vscode-nvim"; - colorscheme = null; # Color scheme is set by `require.("vscode").load()` - callSetup = false; - - maintainers = [ lib.maintainers.loicreynier ]; - - settingsExample = { - transparent = true; - italic_comments = true; - italic_inlayhints = true; - underline_links = true; - terminal_colors = true; - color_overrides = { - vscLineNumber = "#FFFFFF"; - }; - }; - - extraConfig = cfg: { - colorschemes.vscode.luaConfig.content = '' - local _vscode = require("vscode") - _vscode.setup(${lib.nixvim.toLuaObject cfg.settings}) - _vscode.load() - ''; - }; -} diff --git a/plugins/default.nix b/plugins/default.nix index 1ccd4b7b..998879ee 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -2,9 +2,6 @@ imports = [ ./cmp - ./colorschemes/tokyonight.nix - ./colorschemes/vscode.nix - ./lsp ./pluginmanagers/lazy.nix diff --git a/tests/test-sources/plugins/colorschemes/tokyonight.nix b/tests/test-sources/colorschemes/tokyonight/default.nix similarity index 100% rename from tests/test-sources/plugins/colorschemes/tokyonight.nix rename to tests/test-sources/colorschemes/tokyonight/default.nix diff --git a/tests/test-sources/plugins/colorschemes/vscode.nix b/tests/test-sources/plugins/colorschemes/vscode.nix deleted file mode 100644 index 93103aac..00000000 --- a/tests/test-sources/plugins/colorschemes/vscode.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - empty = { - colorschemes.vscode.enable = true; - }; - - defaults = { - colorschemes.vscode = { - enable = true; - settings = { - transparent = false; - italic_comments = false; - italic_inlayhints = false; - underline_links = false; - color_overrides = false; - group_overrides = { }; - disable_nvimtree_bg = true; - terminal_colors = true; - }; - }; - }; - - example = { - colorschemes.vscode = { - enable = true; - settings = { - transparent = true; - italic_comments = true; - italic_inhayhints = true; - underline_links = true; - terminal_colors = true; - color_overrides = { - vscLineNumber = "#FFFFFF"; - }; - }; - }; - }; -} From 941a9f79464f835532c941dcfc7f4b4c0a6b56cd Mon Sep 17 00:00:00 2001 From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com> Date: Sun, 2 Nov 2025 19:47:20 -0300 Subject: [PATCH 34/34] colorschemes/vscode: migrate to by-name --- colorschemes/vscode/default.nix | 32 ++++++++++++++++ .../colorschemes/vscode/default.nix | 37 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 colorschemes/vscode/default.nix create mode 100644 tests/test-sources/colorschemes/vscode/default.nix diff --git a/colorschemes/vscode/default.nix b/colorschemes/vscode/default.nix new file mode 100644 index 00000000..8f8a42f6 --- /dev/null +++ b/colorschemes/vscode/default.nix @@ -0,0 +1,32 @@ +{ + lib, + ... +}: +lib.nixvim.plugins.mkNeovimPlugin { + name = "vscode"; + isColorscheme = true; + package = "vscode-nvim"; + colorscheme = null; # Color scheme is set by `require.("vscode").load()` + callSetup = false; + + maintainers = [ lib.maintainers.loicreynier ]; + + settingsExample = { + transparent = true; + italic_comments = true; + italic_inlayhints = true; + underline_links = true; + terminal_colors = true; + color_overrides = { + vscLineNumber = "#FFFFFF"; + }; + }; + + extraConfig = cfg: { + colorschemes.vscode.luaConfig.content = '' + local _vscode = require("vscode") + _vscode.setup(${lib.nixvim.toLuaObject cfg.settings}) + _vscode.load() + ''; + }; +} diff --git a/tests/test-sources/colorschemes/vscode/default.nix b/tests/test-sources/colorschemes/vscode/default.nix new file mode 100644 index 00000000..93103aac --- /dev/null +++ b/tests/test-sources/colorschemes/vscode/default.nix @@ -0,0 +1,37 @@ +{ + empty = { + colorschemes.vscode.enable = true; + }; + + defaults = { + colorschemes.vscode = { + enable = true; + settings = { + transparent = false; + italic_comments = false; + italic_inlayhints = false; + underline_links = false; + color_overrides = false; + group_overrides = { }; + disable_nvimtree_bg = true; + terminal_colors = true; + }; + }; + }; + + example = { + colorschemes.vscode = { + enable = true; + settings = { + transparent = true; + italic_comments = true; + italic_inhayhints = true; + underline_links = true; + terminal_colors = true; + color_overrides = { + vscLineNumber = "#FFFFFF"; + }; + }; + }; + }; +}