From 9f15c11e3ebffb4d469ddf489183000605d650b6 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 9 Apr 2026 11:43:41 -0400 Subject: [PATCH 1/3] switch neovim theme to one requiring less config --- home/sckova/terminal/neovim.nix | 62 +++++++++++---------------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/home/sckova/terminal/neovim.nix b/home/sckova/terminal/neovim.nix index 3610d8e..2f67d79 100644 --- a/home/sckova/terminal/neovim.nix +++ b/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 = { - palettes = { - main = "base16_custom"; - accent = "base16_custom"; - state = "base16_custom"; - }; - - # this is helpful for figuring out what color is what: - # https://github.com/tinted-theming/schemes/blob/spec-0.11/base24/catppuccin-frappe.yaml - custom_palettes = with config.scheme.withHashtag; { - main.base16_custom = { - color0 = base00; # background - color1 = base01; # lighter background - color2 = base02; # selection background - color3 = base03; # color inside ${} - color4 = base04; # dark foreground - color5 = config.scheme.withHashtag.${config.colors.accent}; # default foreground, left side of assignments - color6 = base03; # comments - 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 - }; - }; + setUpBar = false; + colorscheme = with config.scheme.withHashtag; { + base00 = base00; + base01 = base01; + base02 = base02; + base03 = base03; + base04 = base04; + base05 = base05; + base06 = base06; + base07 = base07; + base08 = config.scheme.withHashtag.${config.colors.accent}; + base09 = base09; + base0A = base0A; + base0B = base0B; + base0C = base0C; + base0D = base0D; + base0E = base0E; + base0F = base0F; }; }; From 1919c98392b3c8c243b6eb3d893bc0720c07633c Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 9 Apr 2026 11:43:41 -0400 Subject: [PATCH 2/3] neovim: switch theme to one requiring less config --- home/sckova/terminal/neovim.nix | 62 +++++++++++---------------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/home/sckova/terminal/neovim.nix b/home/sckova/terminal/neovim.nix index 3610d8e..2f67d79 100644 --- a/home/sckova/terminal/neovim.nix +++ b/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 = { - palettes = { - main = "base16_custom"; - accent = "base16_custom"; - state = "base16_custom"; - }; - - # this is helpful for figuring out what color is what: - # https://github.com/tinted-theming/schemes/blob/spec-0.11/base24/catppuccin-frappe.yaml - custom_palettes = with config.scheme.withHashtag; { - main.base16_custom = { - color0 = base00; # background - color1 = base01; # lighter background - color2 = base02; # selection background - color3 = base03; # color inside ${} - color4 = base04; # dark foreground - color5 = config.scheme.withHashtag.${config.colors.accent}; # default foreground, left side of assignments - color6 = base03; # comments - 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 - }; - }; + setUpBar = false; + colorscheme = with config.scheme.withHashtag; { + base00 = base00; + base01 = base01; + base02 = base02; + base03 = base03; + base04 = base04; + base05 = base05; + base06 = base06; + base07 = base07; + base08 = config.scheme.withHashtag.${config.colors.accent}; + base09 = base09; + base0A = base0A; + base0B = base0B; + base0C = base0C; + base0D = base0D; + base0E = base0E; + base0F = base0F; }; }; From 8f649d66e81ebabfa61ea81c02e517357e938f33 Mon Sep 17 00:00:00 2001 From: Sean Kovacs Date: Thu, 9 Apr 2026 11:54:43 -0400 Subject: [PATCH 3/3] neovim: swap accent with whatever color it was before --- home/sckova/terminal/neovim.nix | 46 ++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/home/sckova/terminal/neovim.nix b/home/sckova/terminal/neovim.nix index 2f67d79..559c209 100644 --- a/home/sckova/terminal/neovim.nix +++ b/home/sckova/terminal/neovim.nix @@ -28,24 +28,34 @@ colorschemes.base16 = { enable = true; setUpBar = false; - colorscheme = with config.scheme.withHashtag; { - base00 = base00; - base01 = base01; - base02 = base02; - base03 = base03; - base04 = base04; - base05 = base05; - base06 = base06; - base07 = base07; - base08 = config.scheme.withHashtag.${config.colors.accent}; - base09 = base09; - base0A = base0A; - base0B = base0B; - base0C = base0C; - base0D = base0D; - base0E = base0E; - base0F = base0F; - }; + colorscheme = + let + cleanScheme = { + inherit (config.scheme.withHashtag) + base00 + base01 + base02 + base03 + base04 + base05 + base06 + base07 + base08 + base09 + base0A + base0B + base0C + base0D + base0E + base0F + ; + }; + in + cleanScheme + // { + base08 = cleanScheme.${config.colors.accent}; + ${config.colors.accent} = cleanScheme.base08; + }; }; keymaps = [