NotAShelf/nvf
2
1
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-09-05 18:01:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge c320f59d16 into f5c91f6a66

Browse source
This commit is contained in:
Jamy 2025-09-05 13:44:09 +08:00 • committed by GitHub
commit ccf45f06f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 602 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/release-notes/release-notes.md
View file

@ -3,6 +3,10 @@
This section lists the release notes for tagged version of **nvf** and the
current main current main branch
[JamyGolden](https://github.com/JamyGolden):
- Add support for `tinted-nvim` (base16, base24) themes
```{=include=} chapters
rl-0.1.md
rl-0.2.md

1
modules/plugins/statusline/lualine/lualine.nix
View file

@ -11,6 +11,7 @@
supported_themes = import ./supported_themes.nix;
builtin_themes = [
"tinted"
"auto"
"16color"
"ayu_dark"

497
modules/plugins/theme/supported-themes.nix
View file

@ -8,17 +8,11 @@
inherit (lib.trivial) boolToString warnIf;
inherit (lib.nvim.lua) toLuaObject;
in {
base16 = {
setup = {base16-colors, ...}: ''
-- Base16 theme
require('base16-colorscheme').setup(${toLuaObject base16-colors})
'';
};
mini-base16 = {
setup = {base16-colors, ...}: ''
setup = {tinted-colors, ...}: ''
-- Base16 theme
require('mini.base16').setup({
palette = ${toLuaObject base16-colors}
palette = ${toLuaObject tinted-colors}
})
'';
};
@ -303,4 +297,491 @@ in {
styles = ["hard" "medium" "soft"];
};
tinted-nvim = {
setup = {
tinted-options,
style,
...
}: let
theme =
if style == "tinted-colors"
then toLuaObject tinted-options.colors
else "'${style}'";
in ''
require('tinted-colorscheme').setup(${theme}, {
supports = ${toLuaObject tinted-options.supports},
highlights = ${toLuaObject tinted-options.highlights},
})
'';
styles = [
"tinted-colors" # Used to apply vim.theme.tinted-options.colors
"base16-0x96f"
"base16-3024"
"base16-apathy"
"base16-apprentice"
"base16-ashes"
"base16-atelier-cave-light"
"base16-atelier-cave"
"base16-atelier-dune-light"
"base16-atelier-dune"
"base16-atelier-estuary-light"
"base16-atelier-estuary"
"base16-atelier-forest-light"
"base16-atelier-forest"
"base16-atelier-heath-light"
"base16-atelier-heath"
"base16-atelier-lakeside-light"
"base16-atelier-lakeside"
"base16-atelier-plateau-light"
"base16-atelier-plateau"
"base16-atelier-savanna-light"
"base16-atelier-savanna"
"base16-atelier-seaside-light"
"base16-atelier-seaside"
"base16-atelier-sulphurpool-light"
"base16-atelier-sulphurpool"
"base16-atlas"
"base16-ayu-dark"
"base16-ayu-light"
"base16-ayu-mirage"
"base16-aztec"
"base16-bespin"
"base16-black-metal-bathory"
"base16-black-metal-burzum"
"base16-black-metal-dark-funeral"
"base16-black-metal-gorgoroth"
"base16-black-metal-immortal"
"base16-black-metal-khold"
"base16-black-metal-marduk"
"base16-black-metal-mayhem"
"base16-black-metal-nile"
"base16-black-metal-venom"
"base16-black-metal"
"base16-blueforest"
"base16-blueish"
"base16-brewer"
"base16-bright"
"base16-brogrammer"
"base16-brushtrees-dark"
"base16-brushtrees"
"base16-caroline"
"base16-catppuccin-frappe"
"base16-catppuccin-latte"
"base16-catppuccin-macchiato"
"base16-catppuccin-mocha"
"base16-chalk"
"base16-charcoal-dark"
"base16-charcoal-light"
"base16-chicago-day"
"base16-chicago-night"
"base16-circus"
"base16-classic-dark"
"base16-classic-light"
"base16-codeschool"
"base16-colors"
"base16-cupcake"
"base16-cupertino"
"base16-da-one-black"
"base16-da-one-gray"
"base16-da-one-ocean"
"base16-da-one-paper"
"base16-da-one-sea"
"base16-da-one-white"
"base16-danqing-light"
"base16-danqing"
"base16-darcula"
"base16-darkmoss"
"base16-darktooth"
"base16-darkviolet"
"base16-decaf"
"base16-deep-oceanic-next"
"base16-default-dark"
"base16-default-light"
"base16-digital-rain"
"base16-dirtysea"
"base16-dracula"
"base16-edge-dark"
"base16-edge-light"
"base16-eighties"
"base16-embers-light"
"base16-embers"
"base16-emil"
"base16-equilibrium-dark"
"base16-equilibrium-gray-dark"
"base16-equilibrium-gray-light"
"base16-equilibrium-light"
"base16-eris"
"base16-espresso"
"base16-eva-dim"
"base16-eva"
"base16-evenok-dark"
"base16-everforest-dark-hard"
"base16-everforest-dark-medium"
"base16-everforest-dark-soft"
"base16-everforest"
"base16-flat"
"base16-framer"
"base16-fruit-soda"
"base16-gigavolt"
"base16-github-dark"
"base16-github"
"base16-google-dark"
"base16-google-light"
"base16-gotham"
"base16-grayscale-dark"
"base16-grayscale-light"
"base16-greenscreen"
"base16-gruber"
"base16-gruvbox-dark-hard"
"base16-gruvbox-dark-medium"
"base16-gruvbox-dark-pale"
"base16-gruvbox-dark-soft"
"base16-gruvbox-dark"
"base16-gruvbox-light-hard"
"base16-gruvbox-light-medium"
"base16-gruvbox-light-soft"
"base16-gruvbox-light"
"base16-gruvbox-material-dark-hard"
"base16-gruvbox-material-dark-medium"
"base16-gruvbox-material-dark-soft"
"base16-gruvbox-material-light-hard"
"base16-gruvbox-material-light-medium"
"base16-gruvbox-material-light-soft"
"base16-hardcore"
"base16-harmonic16-dark"
"base16-harmonic16-light"
"base16-heetch-light"
"base16-heetch"
"base16-helios"
"base16-hopscotch"
"base16-horizon-dark"
"base16-horizon-light"
"base16-horizon-terminal-dark"
"base16-horizon-terminal-light"
"base16-humanoid-dark"
"base16-humanoid-light"
"base16-ia-dark"
"base16-ia-light"
"base16-icy"
"base16-irblack"
"base16-isotope"
"base16-jabuti"
"base16-kanagawa-dragon"
"base16-kanagawa"
"base16-katy"
"base16-kimber"
"base16-lime"
"base16-linux-vt"
"base16-macintosh"
"base16-marrakesh"
"base16-materia"
"base16-material-darker"
"base16-material-lighter"
"base16-material-palenight"
"base16-material-vivid"
"base16-material"
"base16-measured-dark"
"base16-measured-light"
"base16-mellow-purple"
"base16-mexico-light"
"base16-mocha"
"base16-monokai"
"base16-moonlight"
"base16-mountain"
"base16-nebula"
"base16-nord-light"
"base16-nord"
"base16-nova"
"base16-ocean"
"base16-oceanicnext"
"base16-one-light"
"base16-onedark-dark"
"base16-onedark"
"base16-outrun-dark"
"base16-oxocarbon-dark"
"base16-oxocarbon-light"
"base16-pandora"
"base16-papercolor-dark"
"base16-papercolor-light"
"base16-paraiso"
"base16-pasque"
"base16-penumbra-dark-contrast-plus-plus"
"base16-penumbra-dark-contrast-plus"
"base16-penumbra-dark"
"base16-penumbra-light-contrast-plus-plus"
"base16-penumbra-light-contrast-plus"
"base16-penumbra-light"
"base16-phd"
"base16-pico"
"base16-pinky"
"base16-pop"
"base16-porple"
"base16-precious-dark-eleven"
"base16-precious-dark-fifteen"
"base16-precious-light-warm"
"base16-precious-light-white"
"base16-primer-dark-dimmed"
"base16-primer-dark"
"base16-primer-light"
"base16-purpledream"
"base16-qualia"
"base16-railscasts"
"base16-rebecca"
"base16-rose-pine-dawn"
"base16-rose-pine-moon"
"base16-rose-pine"
"base16-saga"
"base16-sagelight"
"base16-sakura"
"base16-sandcastle"
"base16-selenized-black"
"base16-selenized-dark"
"base16-selenized-light"
"base16-selenized-white"
"base16-seti"
"base16-shades-of-purple"
"base16-shadesmear-dark"
"base16-shadesmear-light"
"base16-shapeshifter"
"base16-silk-dark"
"base16-silk-light"
"base16-snazzy"
"base16-solarflare-light"
"base16-solarflare"
"base16-solarized-dark"
"base16-solarized-light"
"base16-spaceduck"
"base16-spacemacs"
"base16-sparky"
"base16-standardized-dark"
"base16-standardized-light"
"base16-stella"
"base16-still-alive"
"base16-summercamp"
"base16-summerfruit-dark"
"base16-summerfruit-light"
"base16-synth-midnight-dark"
"base16-synth-midnight-light"
"base16-tango"
"base16-tarot"
"base16-tender"
"base16-terracotta-dark"
"base16-terracotta"
"base16-tokyo-city-dark"
"base16-tokyo-city-light"
"base16-tokyo-city-terminal-dark"
"base16-tokyo-city-terminal-light"
"base16-tokyo-night-dark"
"base16-tokyo-night-light"
"base16-tokyo-night-moon"
"base16-tokyo-night-storm"
"base16-tokyo-night-terminal-dark"
"base16-tokyo-night-terminal-light"
"base16-tokyo-night-terminal-storm"
"base16-tokyodark-terminal"
"base16-tokyodark"
"base16-tomorrow-night-eighties"
"base16-tomorrow-night"
"base16-tomorrow"
"base16-tube"
"base16-twilight"
"base16-unikitty-dark"
"base16-unikitty-light"
"base16-unikitty-reversible"
"base16-uwunicorn"
"base16-valua"
"base16-vesper"
"base16-vice"
"base16-vulcan"
"base16-windows-10-light"
"base16-windows-10"
"base16-windows-95-light"
"base16-windows-95"
"base16-windows-highcontrast-light"
"base16-windows-highcontrast"
"base16-windows-nt-light"
"base16-windows-nt"
"base16-woodland"
"base16-xcode-dusk"
"base16-zenbones"
"base16-zenburn"
"base24-0x96f"
"base24-3024-day"
"base24-3024-night"
"base24-adventure-time"
"base24-alien-blood"
"base24-argonaut"
"base24-arthur"
"base24-atelier-sulphurpool"
"base24-ayu-dark"
"base24-ayu-light"
"base24-ayu-mirage"
"base24-banana-blueberry"
"base24-batman"
"base24-birds-of-paradise"
"base24-blazer"
"base24-blue-berry-pie"
"base24-blue-matrix"
"base24-bluloco-dark"
"base24-bluloco-light"
"base24-borland"
"base24-breeze"
"base24-broadcast"
"base24-brogrammer"
"base24-builtin-dark"
"base24-builtin-light"
"base24-builtin-pastel-dark"
"base24-builtin-solarized-dark"
"base24-builtin-solarized-light"
"base24-builtin-tango-dark"
"base24-builtin-tango-light"
"base24-catppuccin-frappe"
"base24-catppuccin-latte"
"base24-catppuccin-macchiato"
"base24-catppuccin-mocha"
"base24-chalk"
"base24-chalkboard"
"base24-challenger-deep"
"base24-ciapre"
"base24-clrs"
"base24-cobalt-neon"
"base24-cobalt2"
"base24-crayon-pony-fish"
"base24-cyberdyne"
"base24-dark-plus"
"base24-deep-oceanic-next"
"base24-deep"
"base24-desert"
"base24-dimmed-monokai"
"base24-dracula"
"base24-earthsong"
"base24-elemental"
"base24-elementary"
"base24-embarcadero"
"base24-encom"
"base24-espresso-libre"
"base24-espresso"
"base24-fideloper"
"base24-firefox-dev"
"base24-fish-tank"
"base24-flat"
"base24-flatland"
"base24-floraverse"
"base24-forest-blue"
"base24-framer"
"base24-front-end-delight"
"base24-fun-forrest"
"base24-galaxy"
"base24-github-dark"
"base24-github-light"
"base24-grape"
"base24-gruvbox-dark"
"base24-gruvbox-light"
"base24-hacktober"
"base24-hardcore"
"base24-highway"
"base24-hipster-green"
"base24-hivacruz"
"base24-homebrew"
"base24-hopscotch"
"base24-hurtado"
"base24-hybrid"
"base24-ic-green-ppl"
"base24-ic-orange-ppl"
"base24-idea"
"base24-idle-toes"
"base24-jackie-brown"
"base24-japanesque"
"base24-jellybeans"
"base24-jet-brains-darcula"
"base24-kibble"
"base24-lab-fox"
"base24-laser"
"base24-later-this-evening"
"base24-lavandula"
"base24-lovelace"
"base24-man-page"
"base24-material-dark"
"base24-material"
"base24-mathias"
"base24-medallion"
"base24-mission-brogue"
"base24-misterioso"
"base24-molokai"
"base24-mona-lisa"
"base24-monokai-vivid"
"base24-mountain"
"base24-night-lion-v1"
"base24-night-lion-v2"
"base24-night-owlish-light"
"base24-nocturnal-winter"
"base24-obsidian"
"base24-ocean"
"base24-oceanic-material"
"base24-ollie"
"base24-one-black"
"base24-one-dark"
"base24-one-half-light"
"base24-one-light"
"base24-operator-mono-dark"
"base24-pandora"
"base24-paul-millr"
"base24-pencil-dark"
"base24-pencil-light"
"base24-piatto-light"
"base24-pnevma"
"base24-pro-light"
"base24-pro"
"base24-purple-rain"
"base24-purplepeter"
"base24-rebecca"
"base24-red-alert"
"base24-red-planet"
"base24-red-sands"
"base24-rippedcasts"
"base24-royal"
"base24-scarlet-protocol"
"base24-sea-shells"
"base24-seafoam-pastel"
"base24-shades-of-purple"
"base24-shaman"
"base24-slate"
"base24-sleepy-hollow"
"base24-smyck"
"base24-soft-server"
"base24-solarized-dark-higher-contrast"
"base24-solarized-dark-patched"
"base24-space-gray-eighties-dull"
"base24-space-gray-eighties"
"base24-spacedust"
"base24-sparky"
"base24-spiderman"
"base24-square"
"base24-sundried"
"base24-tango-adapted"
"base24-tango-half-adapted"
"base24-terminal-basic"
"base24-thayer-bright"
"base24-the-hulk"
"base24-toy-chest"
"base24-treehouse"
"base24-twilight"
"base24-ubuntu"
"base24-ultra-violet"
"base24-under-the-sea"
"base24-unikitty"
"base24-vibrant-ink"
"base24-violet-dark"
"base24-violet-light"
"base24-warm-neon"
"base24-wez"
"base24-wild-cherry"
"base24-wombat"
"base24-wryan"
"base24-zenburn"
];
};
}

105
modules/plugins/theme/theme.nix
View file

@ -17,12 +17,17 @@
inherit lib config;
};
numbers = ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "A" "B" "C" "D" "E" "F"];
base16Options =
base16 = ["00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F"];
base24 = ["00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17"];
determineSchemeSystem =
if config.vim.theme.tinted-options.scheme-system == "base24"
then base24
else base16;
tinted-colors =
mapListToAttrs (n: {
name = "base0${n}";
name = "base${n}";
value = mkOption {
description = "The base0${n} color to use";
description = "The base${n} color to use";
type = hexColor;
apply = v:
if hasPrefix "#" v
@ -30,9 +35,89 @@
else "#${v}";
};
})
numbers;
determineSchemeSystem;
tinted-options = {
colors = tinted-colors;
scheme-system = mkOption {
type = bool;
default = true;
description = "Scheme system for theme (eg 'base16')";
};
supports = {
tinty = mkOption {
type = bool;
default = false;
description = "Automatically load the colorscheme set by Tinty CLI (https://github.com/tinted-theming/tinty)";
};
live_reload = mkOption {
type = bool;
default = false;
description = "Automatically reload with a new theme when applied by Tinty CLI (https://github.com/tinted-theming/tinty)";
};
tinted_shell = mkOption {
type = bool;
default = false;
description = "Automatically load the colorscheme set by tinted-shell (tinted-theming/tinted-shell)";
};
};
highlights = {
telescope = mkOption {
type = bool;
default = true;
description = "Set highlights for Telescope";
};
telescope_borders = mkOption {
type = bool;
default = false;
description = "Set highlights for Telescope borders";
};
indentblankline = mkOption {
type = bool;
default = true;
description = "Set highlights for indentblankline";
};
notify = mkOption {
type = bool;
default = true;
description = "Set highlights for notify";
};
ts_rainbow = mkOption {
type = bool;
default = true;
description = "Set highlights for ts_rainbow";
};
cmp = mkOption {
type = bool;
default = true;
description = "Set highlights for cmp";
};
illuminate = mkOption {
type = bool;
default = true;
description = "Set highlights for illuminate";
};
lsp_semantic = mkOption {
type = bool;
default = true;
description = "Set LSP semantic highlights";
};
mini_completion = mkOption {
type = bool;
default = true;
description = "Set highlights for mini.completion";
};
dapui = mkOption {
type = bool;
default = true;
description = "Set highlights for dapui";
};
};
};
in {
options.vim.theme = {
inherit tinted-options;
enable = mkOption {
type = bool;
description = "Enable theming";
@ -40,12 +125,12 @@ in {
name = mkOption {
type = enum (attrNames supportedThemes);
description = ''
Supported themes can be found in {file}`supportedThemes.nix`.
Setting the theme to "base16" enables base16 theming and
requires all of the colors in {option}`vim.theme.base16-colors` to be set.
Supported themes can be found in {file}`supportedThemes.nix`. Setting
the theme to "tinted-theming" enables base16 and base24 theming,
requires all of the colors in {option}`vim.theme.tinted-colors` to be
set and adds all of the "tinted-nvim" colorschemes.
'';
};
base16-colors = base16Options;
style = mkOption {
type = enum supportedThemes.${cfg.name}.styles;
@ -68,7 +153,7 @@ in {
startPlugins = [cfg.name];
luaConfigRC.theme = entryBefore ["pluginConfigs" "lazyConfigs"] ''
${cfg.extraConfig}
${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent base16-colors;}}
${supportedThemes.${cfg.name}.setup {inherit (cfg) style transparent tinted-options;}}
'';
};
};

13
npins/sources.json
View file

@ -2448,6 +2448,19 @@
"url": "https://github.com/nvim-telescope/telescope.nvim/archive/b4da76be54691e854d3e0e02c36b0245f945c2c7.tar.gz",
"hash": "161qlx099ymi62qsd89srda605ynks1sswx3djamrwqp3dxb9596"
},
"tinted-nvim": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "tinted-theming",
"repo": "tinted-nvim"
},
"branch": "main",
"submodules": false,
"revision": "15033005ca7956aa833c21d4d11594abfc6e7ac1",
"url": "https://github.com/tinted-theming/tinted-nvim/archive/15033005ca7956aa833c21d4d11594abfc6e7ac1.tar.gz",
"hash": "0zvgsyv1myd8qayvhlzsnn3k6d3gn7af5g0b43chiphh99iw921g"
},
"tiny-devicons-auto-colors-nvim": {
"type": "Git",
"repository": {