feat: rename colorizer to ccc

This commit is contained in:
NotAShelf 2023-06-04 09:41:10 +03:00
parent bd61b1375a
commit 1cc6bb8b8a
No known key found for this signature in database
GPG key ID: F0D14CCB5ED5AA22
10 changed files with 93 additions and 48 deletions

View file

@ -152,7 +152,7 @@ inputs: let
}; };
vim.utility = { vim.utility = {
colorizer.enable = true; ccc.enable = true;
vim-wakatime.enable = true; vim-wakatime.enable = true;
icon-picker.enable = true; icon-picker.enable = true;
diffview-nvim.enable = true; diffview-nvim.enable = true;

View file

@ -48,6 +48,22 @@
"type": "github" "type": "github"
} }
}, },
"ccc": {
"flake": false,
"locked": {
"lastModified": 1685810171,
"narHash": "sha256-0/xRK6LTa7BZx2szwmBfu3fmh+CKhFbr/MQKCl3KTYc=",
"owner": "uga-rosa",
"repo": "ccc.nvim",
"rev": "72461f8f7496863a54b7ae1681550c22c35080a8",
"type": "github"
},
"original": {
"owner": "uga-rosa",
"repo": "ccc.nvim",
"type": "github"
}
},
"cellular-automaton": { "cellular-automaton": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -192,22 +208,6 @@
"type": "github" "type": "github"
} }
}, },
"colorizer": {
"flake": false,
"locked": {
"lastModified": 1684248331,
"narHash": "sha256-gZ1ZQsf+EkabFnDS48OFd1EfJmUeN504qeUH0jsCHdM=",
"owner": "uga-rosa",
"repo": "ccc.nvim",
"rev": "78aed26e18a087501be0475443b5a623adbf6290",
"type": "github"
},
"original": {
"owner": "uga-rosa",
"repo": "ccc.nvim",
"type": "github"
}
},
"comment-nvim": { "comment-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1277,6 +1277,7 @@
"alpha-nvim": "alpha-nvim", "alpha-nvim": "alpha-nvim",
"bufdelete-nvim": "bufdelete-nvim", "bufdelete-nvim": "bufdelete-nvim",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"ccc": "ccc",
"cellular-automaton": "cellular-automaton", "cellular-automaton": "cellular-automaton",
"cheatsheet-nvim": "cheatsheet-nvim", "cheatsheet-nvim": "cheatsheet-nvim",
"cinnamon-nvim": "cinnamon-nvim", "cinnamon-nvim": "cinnamon-nvim",
@ -1286,7 +1287,6 @@
"cmp-treesitter": "cmp-treesitter", "cmp-treesitter": "cmp-treesitter",
"cmp-vsnip": "cmp-vsnip", "cmp-vsnip": "cmp-vsnip",
"codewindow-nvim": "codewindow-nvim", "codewindow-nvim": "codewindow-nvim",
"colorizer": "colorizer",
"comment-nvim": "comment-nvim", "comment-nvim": "comment-nvim",
"copilot-lua": "copilot-lua", "copilot-lua": "copilot-lua",
"crates-nvim": "crates-nvim", "crates-nvim": "crates-nvim",

View file

@ -373,7 +373,7 @@
}; };
# Utilities # Utilities
colorizer = { ccc = {
url = "github:uga-rosa/ccc.nvim"; url = "github:uga-rosa/ccc.nvim";
flake = false; flake = false;
}; };

View file

@ -50,7 +50,7 @@ with lib; let
"nvim-notify" "nvim-notify"
"cinnamon-nvim" "cinnamon-nvim"
"cheatsheet-nvim" "cheatsheet-nvim"
"colorizer" "ccc"
"cellular-automaton" "cellular-automaton"
"presence-nvim" "presence-nvim"
"icon-picker-nvim" "icon-picker-nvim"

View file

@ -0,0 +1,13 @@
{lib, ...}:
with lib;
with builtins; {
options.vim.utility.ccc = {
enable = mkEnableOption "Enable ccc color picker for neovim";
mappings = {
quit = mkMappingOption "Cancel and close the UI without replace or insert" "<Esc>";
increase10 = mkMappingOption "Increase the value times delta of the slider" "<L>";
decrease10 = mkMappingOption "Decrease the value times delta of the slider" "<H>";
};
};
}

View file

@ -0,0 +1,58 @@
{
config,
lib,
...
}:
with lib;
with builtins; let
cfg = config.vim.utility.ccc;
self = import ./ccc.nix {inherit lib;};
mappingDefinitions = self.options.vim.utility.ccc.mappings;
mappings = addDescriptionsToMappings cfg.mappings mappingDefinitions;
in {
config = mkIf (cfg.enable) {
vim.startPlugins = [
"ccc"
];
vim.maps.normal = mkMerge [
(mkSetLuaBinding mappings.quit "require('ccc').mapping.quit")
(mkSetLuaBinding mappings.increase10 "require('ccc').mapping.increase10")
(mkSetLuaBinding mappings.decrease10 "require('ccc').mapping.decrease10")
];
vim.luaConfigRC.ccc = nvim.dag.entryAnywhere ''
local ccc = require("ccc")
ccc.setup {
highlighter = {
auto_enable = true,
max_byte = 2 * 1024 * 1024, -- 2mb
lsp = true,
filetypes = colorPickerFts,
},
pickers = {
ccc.picker.hex,
ccc.picker.css_rgb,
ccc.picker.css_hsl,
ccc.picker.ansi_escape {
meaning1 = "bright", -- whether the 1 means bright or yellow
},
},
alpha_show = "hide", -- needed when highlighter.lsp is set to true
recognize = { output = true }, -- automatically recognize color format under cursor
inputs = { ccc.input.hsl },
outputs = {
ccc.output.css_hsl,
ccc.output.css_rgb,
ccc.output.hex,
},
convert = {
{ ccc.picker.hex, ccc.output.css_hsl },
{ ccc.picker.css_rgb, ccc.output.css_hsl },
{ ccc.picker.css_hsl, ccc.output.hex },
},
}
'';
};
}

View file

@ -1,6 +1,6 @@
_: { _: {
imports = [ imports = [
./colorizer.nix ./ccc.nix
./config.nix ./config.nix
]; ];
} }

View file

@ -1,11 +0,0 @@
{
config,
lib,
...
}:
with lib;
with builtins; {
options.vim.utility.colorizer = {
enable = mkEnableOption "Enable ccc color picker for neovim";
};
}

View file

@ -1,15 +0,0 @@
{
config,
lib,
...
}:
with lib;
with builtins; let
cfg = config.vim.utility.colorizer;
in {
config = mkIf (cfg.enable) {
vim.startPlugins = [
"colorizer"
];
};
}

View file

@ -4,7 +4,7 @@ _: {
./gestures ./gestures
./motion ./motion
./telescope ./telescope
./colorizer ./ccc
./icon-picker ./icon-picker
./telescope ./telescope
./diffview ./diffview