From 73b9963bbc0aeaadaae3c1cbcc5fa5493bde2677 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Sun, 23 Feb 2025 18:07:48 +0000 Subject: [PATCH] fix(colors): use basix instead of downloading jsons --- everforest.json | 1 - flake.nix | 2 +- nvf.nix | 8 ++++++-- 3 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 everforest.json diff --git a/everforest.json b/everforest.json deleted file mode 100644 index 57bbcaa..0000000 --- a/everforest.json +++ /dev/null @@ -1 +0,0 @@ -{"base00":"#272e33","base01":"#2e383c","base02":"#414b50","base03":"#859289","base04":"#9da9a0","base05":"#d3c6aa","base06":"#edeada","base07":"#fffbef","base08":"#e67e80","base09":"#e69875","base0A":"#dbbc7f","base0B":"#a7c080","base0C":"#83c092","base0D":"#7fbbb3","base0E":"#d699b6","base0F":"#9da9a0"} diff --git a/flake.nix b/flake.nix index ba7933a..d4a3a86 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ ./nvf.nix ]; inherit pkgs; - extraSpecialArgs = {inherit inputs;}; + extraSpecialArgs = {colors = inputs.basix.schemeData.base16.everforest-dark-hard.palette;}; }) .neovim; }); diff --git a/nvf.nix b/nvf.nix index ed18a4e..f25a849 100644 --- a/nvf.nix +++ b/nvf.nix @@ -1,4 +1,8 @@ -{pkgs, ...}: let +{ + pkgs, + colors, + ... +}: let inherit (pkgs) vimPlugins; in { config.vim = { @@ -14,7 +18,7 @@ in { theme = { name = "mini-base16"; enable = true; - base16-colors = builtins.fromJSON (builtins.readFile ./everforest.json); + base16-colors = colors; }; terminal.toggleterm = { enable = true;