christoph/flake-nixinator
1
Fork 0
Code Activity

Modules/Color: Don't specify light/dark schemes, choose a single scheme where everything is based on

Browse Source
This commit is contained in:
Christoph Urlacher
2025-07-19 19:23:17 +02:00
parent 3daefbad68
commit f62f7b4c64
11 changed files with 248 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
home/modules/neovim/default.nix
View File

@ -1026,40 +1026,40 @@ in {
bubbles = ''
{
normal = {
a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.lavender}", gui = "bold" },
b = { fg = "#${color.hex.dark.text}", bg = "#${color.hex.dark.crust}" },
c = { fg = "#${color.hex.dark.text}", bg = "NONE" },
a = { fg = "#${color.hex.base}", bg = "#${color.hex.lavender}", gui = "bold" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" },
c = { fg = "#${color.hex.text}", bg = "NONE" },
},
insert = {
a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.green}", gui = "bold" },
b = { fg = "#${color.hex.dark.green}", bg = "#${color.hex.dark.crust}" },
a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
},
visual = {
a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.mauve}", gui = "bold" },
b = { fg = "#${color.hex.dark.mauve}", bg = "#${color.hex.dark.crust}" },
a = { fg = "#${color.hex.base}", bg = "#${color.hex.mauve}", gui = "bold" },
b = { fg = "#${color.hex.mauve}", bg = "#${color.hex.crust}" },
},
replace = {
a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.red}", gui = "bold" },
b = { fg = "#${color.hex.dark.red}", bg = "#${color.hex.dark.crust}" },
a = { fg = "#${color.hex.base}", bg = "#${color.hex.red}", gui = "bold" },
b = { fg = "#${color.hex.red}", bg = "#${color.hex.crust}" },
},
-- terminal = {
-- a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.green}", gui = "bold" },
-- b = { fg = "#${color.hex.dark.green}", bg = "#${color.hex.dark.crust}" },
-- a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
-- b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
-- },
command = {
a = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.peach}", gui = "bold" },
b = { fg = "#${color.hex.dark.peach}", bg = "#${color.hex.dark.crust}" },
a = { fg = "#${color.hex.base}", bg = "#${color.hex.peach}", gui = "bold" },
b = { fg = "#${color.hex.peach}", bg = "#${color.hex.crust}" },
},
inactive = {
a = { fg = "#${color.hex.dark.text}", bg = "#${color.hex.dark.base}" },
b = { fg = "#${color.hex.dark.text}", bg = "#${color.hex.dark.base}" },
c = { fg = "#${color.hex.dark.text}", bg = "NONE" },
a = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
c = { fg = "#${color.hex.text}", bg = "NONE" },
},
}
'';
@ -1598,17 +1598,17 @@ in {
opts = {
line.__raw = ''
function(line)
local base = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.base}" }
local crust = { fg = "#${color.hex.dark.crust}", bg = "#${color.hex.dark.crust}" }
local text = { fg = "#${color.hex.dark.text}", bg = "#${color.hex.dark.crust}" }
local lavender = { fg = "#${color.hex.dark.lavender}", bg = "#${color.hex.dark.lavender}" }
local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
local lavender = { fg = "#${color.hex.lavender}", bg = "#${color.hex.lavender}" }
local numtabs = vim.call("tabpagenr", "$")
return {
-- Head
{
{ " NEOVIM ", hl = { fg = "#${color.hex.dark.base}", bg = "#${color.hex.dark.lavender}", style = "bold" } },
{ " NEOVIM ", hl = { fg = "#${color.hex.base}", bg = "#${color.hex.lavender}", style = "bold" } },
-- The separator gets a foreground and background fill (each have fg + bg).
-- line.sep("", lavender, lavender),
@ -1617,7 +1617,7 @@ in {
-- Tabs
line.tabs().foreach(function(tab)
-- Switch out the start separator instead of the ending one because the last separator is different
local hl = tab.is_current() and { fg = "#${color.hex.dark.lavender}", bg = "#${color.hex.dark.crust}", style = "bold" } or text
local hl = tab.is_current() and { fg = "#${color.hex.lavender}", bg = "#${color.hex.crust}", style = "bold" } or text
local sep_start = tab.number() == 1 and "" or ""
local sep_end = tab.number() == numtabs and "" or ""

2
home/modules/neovim/mappings.nix
View File

@ -809,7 +809,7 @@ _: let
# }
{
mode = "n";
key = "<leader>cC";
key = "<leader>cc";
action = "<cmd>Neogen<cr>";
options.desc = "Generate Doc Comment";
}