switch neovim theme to one requiring less config

home/sckova/terminal/default.nix

@@ -70,7 +70,10 @@
     };
     bat = {
       enable = true;
-      config.style = "numbers,changes";
+      config = {
+        style = "numbers,changes";
+        theme = "base16";
+      };
     };
     lazygit = {
       enable = true;

home/sckova/terminal/neovim.nix

@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...
@@ -25,48 +24,27 @@
       expandtab = true;
       number = true;
     };
-    colorschemes.palette = {
+
+    colorschemes.base16 = {
       enable = true;
-      settings = {
+      setUpBar = false;
-        palettes = {
+      colorscheme = with config.scheme.withHashtag; {
-          main = "base16_custom";
+        base00 = base00;
-          accent = "base16_custom";
+        base01 = base01;
-          state = "base16_custom";
+        base02 = base00;
-        };
+        base03 = base03;
-
+        base04 = base04;
-        # this is helpful for figuring out what color is what:
+        base05 = base05;
-        # https://github.com/tinted-theming/schemes/blob/spec-0.11/base24/catppuccin-frappe.yaml
+        base06 = base06;
-        custom_palettes = with config.scheme.withHashtag; {
+        base07 = base07;
-          main.base16_custom = {
+        base08 = config.scheme.withHashtag.${config.colors.accent};
-            color0 = base00; # background
+        base09 = base09;
-            color1 = base01; # lighter background
+        base0A = base0A;
-            color2 = base02; # selection background
+        base0B = base0B;
-            color3 = base03; # color inside ${}
+        base0C = base0C;
-            color4 = base04; # dark foreground
+        base0D = base0D;
-            color5 = config.scheme.withHashtag.${config.colors.accent}; # default foreground, left side of assignments
+        base0E = base0E;
-            color6 = base03; # comments
+        base0F = base0F;
-            color7 = base07; # lightest foreground
-            color8 = base05; # variables/tags
-          };
-
-          accent.base16_custom = {
-            accent0 = base08; # red, integers/constants
-            accent1 = base0A; # orange, classes/search
-            accent2 = base0A; # yellow, strings/inherited
-            accent3 = base0B; # green, support/regex
-            accent4 = base0D; # blue, functions/headings
-            accent5 = base0E; # purple, keywords/bold
-            accent6 = base07; # lavender, deprecated/embedded
-          };
-
-          state.base16_custom = {
-            error = base08; # red
-            warning = base0A; # yellow
-            hint = base0C; # cyan
-            ok = base0B; # green
-            info = base0D; # blue
-          };
-        };
       };
     };