christoph/flake-nixinator
1
Fork 0
Code Activity

Modules: Update color module color aliases

Browse Source
This commit is contained in:
Christoph Urlacher
2025-07-20 15:23:11 +02:00
parent 6c61c30294
commit ca61a58199
6 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
home/modules/fish/default.nix
View File

@ -19,7 +19,7 @@ in {
fish_color_param ${color.hex.flamingo} fish_color_param ${color.hex.flamingo}
fish_color_keyword ${color.hex.red} fish_color_keyword ${color.hex.red}
fish_color_quote ${color.hex.green} fish_color_quote ${color.hex.green}
fish_color_redirection ${color.hex.accentHL} fish_color_redirection ${color.hex.accentHl}
fish_color_end ${color.hex.peach} fish_color_end ${color.hex.peach}
fish_color_comment ${color.hex.overlay1} fish_color_comment ${color.hex.overlay1}
fish_color_error ${color.hex.red} fish_color_error ${color.hex.red}
@ -27,7 +27,7 @@ in {
fish_color_selection --background=${color.hex.surface0} fish_color_selection --background=${color.hex.surface0}
fish_color_search_match --background=${color.hex.surface0} fish_color_search_match --background=${color.hex.surface0}
fish_color_option ${color.hex.green} fish_color_option ${color.hex.green}
fish_color_operator ${color.hex.accentHL} fish_color_operator ${color.hex.accentHl}
fish_color_escape ${color.hex.maroon} fish_color_escape ${color.hex.maroon}
fish_color_autosuggestion ${color.hex.overlay0} fish_color_autosuggestion ${color.hex.overlay0}
fish_color_cancel ${color.hex.red} fish_color_cancel ${color.hex.red}
@ -37,7 +37,7 @@ in {
fish_color_host_remote ${color.hex.green} fish_color_host_remote ${color.hex.green}
fish_color_status ${color.hex.red} fish_color_status ${color.hex.red}
fish_pager_color_progress ${color.hex.overlay0} fish_pager_color_progress ${color.hex.overlay0}
fish_pager_color_prefix ${color.hex.accentHL} fish_pager_color_prefix ${color.hex.accentHl}
fish_pager_color_completion ${color.hex.text} fish_pager_color_completion ${color.hex.text}
fish_pager_color_description ${color.hex.overlay0} fish_pager_color_description ${color.hex.overlay0}
''; '';
@ -245,7 +245,7 @@ in {
palettes."nixos-palette" = { palettes."nixos-palette" = {
rosewater = color.hexS.rosewater; rosewater = color.hexS.rosewater;
flamingo = color.hexS.flamingo; flamingo = color.hexS.flamingo;
pink = color.hexS.accentHL; pink = color.hexS.accentHl;
mauve = color.hexS.accent; mauve = color.hexS.accent;
red = color.hexS.red; red = color.hexS.red;
maroon = color.hexS.maroon; maroon = color.hexS.maroon;

8
home/modules/hyprland/default.nix
View File

@ -211,7 +211,7 @@ in {
enable = true; enable = true;
settings = { settings = {
options = { options = {
background = "${color.hex.bg}"; background = "${color.hex.base}";
overlay = true; overlay = true;
overlay_font = "${color.font}:12"; overlay_font = "${color.font}:12";
overlay_background_color = "${color.hex.accent}"; overlay_background_color = "${color.hex.accent}";
@ -400,7 +400,7 @@ in {
border_size = 2; border_size = 2;
"col.active_border" = "rgb(${color.hex.accent})"; "col.active_border" = "rgb(${color.hex.accent})";
"col.inactive_border" = "rgb(${color.hex.bg})"; "col.inactive_border" = "rgb(${color.hex.base})";
}; };
group = { group = {
@ -411,11 +411,11 @@ in {
gradients = false; gradients = false;
"col.active" = "rgb(${color.hex.accent})"; "col.active" = "rgb(${color.hex.accent})";
"col.inactive" = "rgb(${color.hex.bg})"; "col.inactive" = "rgb(${color.hex.base})";
}; };
"col.border_active" = "rgb(${color.hex.accent})"; "col.border_active" = "rgb(${color.hex.accent})";
"col.border_inactive" = "rgb(${color.hex.bg})"; "col.border_inactive" = "rgb(${color.hex.base})";
}; };
input = { input = {

12
home/modules/hyprpanel/default.nix
View File

@ -71,7 +71,7 @@ in {
}; };
# https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/index.ts # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/index.ts
"theme.bar.background" = "#${color.hex.bg}"; "theme.bar.background" = "#${color.hex.base}";
"theme.bar.border.color" = "#${color.hex.accent}"; "theme.bar.border.color" = "#${color.hex.accent}";
"theme.bar.border.location" = "full"; "theme.bar.border.location" = "full";
"theme.bar.border_radius" = "6px"; "theme.bar.border_radius" = "6px";
@ -82,7 +82,7 @@ in {
"theme.bar.margin_bottom" = "0px"; "theme.bar.margin_bottom" = "0px";
"theme.bar.margin_sides" = "10px"; "theme.bar.margin_sides" = "10px";
"theme.bar.margin_top" = "10px"; "theme.bar.margin_top" = "10px";
"theme.bar.opacity" = 60; "theme.bar.opacity" = 80;
"theme.bar.outer_spacing" = "0px"; # NOTE: Left/Right bar padding "theme.bar.outer_spacing" = "0px"; # NOTE: Left/Right bar padding
"theme.bar.transparent" = false; "theme.bar.transparent" = false;
@ -123,17 +123,17 @@ in {
"bar.workspaces.workspaces" = 9; "bar.workspaces.workspaces" = 9;
# https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/workspaces.ts # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/workspaces.ts
"theme.bar.buttons.workspaces.active" = "#${color.hex.accentHL}"; "theme.bar.buttons.workspaces.active" = "#${color.hex.accentHl}";
"theme.bar.buttons.workspaces.available" = "#${color.hex.accentText}"; "theme.bar.buttons.workspaces.available" = "#${color.hex.accentText}";
"theme.bar.buttons.workspaces.background" = "#${color.hex.accent}"; "theme.bar.buttons.workspaces.background" = "#${color.hex.accent}";
"theme.bar.buttons.workspaces.border" = "#${color.hex.accent}"; "theme.bar.buttons.workspaces.border" = "#${color.hex.accent}";
"theme.bar.buttons.workspaces.enableBorder" = false; "theme.bar.buttons.workspaces.enableBorder" = false;
"theme.bar.buttons.workspaces.fontSize" = "18px"; "theme.bar.buttons.workspaces.fontSize" = "18px";
"theme.bar.buttons.workspaces.hover" = "#${color.hex.accentHL}"; "theme.bar.buttons.workspaces.hover" = "#${color.hex.accentHl}";
"theme.bar.buttons.workspaces.numbered_active_highlight_border" = "4px"; # border radius "theme.bar.buttons.workspaces.numbered_active_highlight_border" = "4px"; # border radius
"theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = "#${color.hex.accentText}"; "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = "#${color.hex.accentText}";
"theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "6px"; "theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "6px";
"theme.bar.buttons.workspaces.numbered_active_underline_color" = "#${color.hex.accentHL}"; "theme.bar.buttons.workspaces.numbered_active_underline_color" = "#${color.hex.accentHl}";
"theme.bar.buttons.workspaces.numbered_inactive_padding" = "6px"; # make the same as numbered_active_highlight_padding to avoid layout jumping "theme.bar.buttons.workspaces.numbered_inactive_padding" = "6px"; # make the same as numbered_active_highlight_padding to avoid layout jumping
"theme.bar.buttons.workspaces.occupied" = "#${color.hex.accentText}"; "theme.bar.buttons.workspaces.occupied" = "#${color.hex.accentText}";
"theme.bar.buttons.workspaces.smartHighlight" = "false"; "theme.bar.buttons.workspaces.smartHighlight" = "false";
@ -307,7 +307,7 @@ in {
# TODO: Menus Config # TODO: Menus Config
# #
"theme.bar.menus.background" = "#${color.hex.bg}"; "theme.bar.menus.background" = "#${color.hex.base}";
"theme.bar.menus.border.color" = "#${color.hex.accent}"; "theme.bar.menus.border.color" = "#${color.hex.accent}";
"theme.bar.menus.border.radius" = "6px"; "theme.bar.menus.border.radius" = "6px";
"theme.bar.menus.border.size" = "2px"; "theme.bar.menus.border.size" = "2px";

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

@ -1042,39 +1042,39 @@ in {
bubbles = '' bubbles = ''
{ {
normal = { normal = {
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.accent}", gui = "bold" }, a = { fg = "#${color.hex.base}", bg = "#${color.hex.accent}", gui = "bold" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }, b = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" },
c = { fg = "#${color.hex.text}", bg = "NONE" }, c = { fg = "#${color.hex.text}", bg = "NONE" },
}, },
insert = { insert = {
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" }, a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" }, b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
}, },
visual = { visual = {
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.blue}", gui = "bold" }, a = { fg = "#${color.hex.base}", bg = "#${color.hex.blue}", gui = "bold" },
b = { fg = "#${color.hex.blue}", bg = "#${color.hex.crust}" }, b = { fg = "#${color.hex.blue}", bg = "#${color.hex.crust}" },
}, },
replace = { replace = {
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.red}", gui = "bold" }, a = { fg = "#${color.hex.base}", bg = "#${color.hex.red}", gui = "bold" },
b = { fg = "#${color.hex.red}", bg = "#${color.hex.crust}" }, b = { fg = "#${color.hex.red}", bg = "#${color.hex.crust}" },
}, },
-- terminal = { -- terminal = {
-- a = { fg = "#${color.hex.bg}", bg = "#${color.hex.green}", gui = "bold" }, -- a = { fg = "#${color.hex.base}", bg = "#${color.hex.green}", gui = "bold" },
-- b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" }, -- b = { fg = "#${color.hex.green}", bg = "#${color.hex.crust}" },
-- }, -- },
command = { command = {
a = { fg = "#${color.hex.bg}", bg = "#${color.hex.peach}", gui = "bold" }, a = { fg = "#${color.hex.base}", bg = "#${color.hex.peach}", gui = "bold" },
b = { fg = "#${color.hex.peach}", bg = "#${color.hex.crust}" }, b = { fg = "#${color.hex.peach}", bg = "#${color.hex.crust}" },
}, },
inactive = { inactive = {
a = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" }, a = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
b = { fg = "#${color.hex.text}", bg = "#${color.hex.bg}" }, b = { fg = "#${color.hex.text}", bg = "#${color.hex.base}" },
c = { fg = "#${color.hex.text}", bg = "NONE" }, c = { fg = "#${color.hex.text}", bg = "NONE" },
}, },
} }
@ -1614,7 +1614,7 @@ in {
opts = { opts = {
line.__raw = '' line.__raw = ''
function(line) function(line)
local bg = { fg = "#${color.hex.bg}", bg = "#${color.hex.bg}" } local base = { fg = "#${color.hex.base}", bg = "#${color.hex.base}" }
local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" } local crust = { fg = "#${color.hex.crust}", bg = "#${color.hex.crust}" }
local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" } local text = { fg = "#${color.hex.text}", bg = "#${color.hex.crust}" }
local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" } local accent = { fg = "#${color.hex.accent}", bg = "#${color.hex.accent}" }
@ -1624,7 +1624,7 @@ in {
return { return {
-- Head -- Head
{ {
{ " NEOVIM ", hl = { fg = "#${color.hex.bg}", bg = "#${color.hex.accent}", style = "bold" } }, { " NEOVIM ", hl = { fg = "#${color.hex.base}", bg = "#${color.hex.accent}", style = "bold" } },
-- The separator gets a foreground and background fill (each have fg + bg). -- The separator gets a foreground and background fill (each have fg + bg).
-- line.sep("", accent, lavender), -- line.sep("", accent, lavender),
@ -1641,7 +1641,7 @@ in {
line.sep(sep_start, accent, crust), line.sep(sep_start, accent, crust),
tab.number(), tab.number(),
tab.name(), tab.name(),
line.sep(sep_end, crust, bg), line.sep(sep_end, crust, base),
hl = hl, hl = hl,
margin = " ", margin = " ",
} }

16
home/modules/rofi/default.nix
View File

@ -51,12 +51,12 @@ in {
}; };
"window" = { "window" = {
height = "50%"; height = mkLiteral "50%";
width = "33%"; width = mkLiteral "33%";
border = mkLiteral "2 solid 2 solid 2 solid 2 solid"; border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
border-radius = 6; border-radius = 6;
border-color = mkLiteral color.hexS.accent; border-color = mkLiteral color.hexS.accent;
background-color = mkLiteral "rgba(${color.rgbS.bg}, 0.2)"; background-color = mkLiteral "rgba(${color.rgbS.base}, 0.2)";
}; };
"mainbox" = { "mainbox" = {
@ -85,7 +85,7 @@ in {
}; };
"prompt" = { "prompt" = {
background-color = mkLiteral color.hexS.accentHL; background-color = mkLiteral color.hexS.accentHl;
padding = 6; padding = 6;
text-color = mkLiteral color.hexS.accentText; text-color = mkLiteral color.hexS.accentText;
border-radius = 3; border-radius = 3;
@ -99,7 +99,7 @@ in {
background-color = mkLiteral trans; background-color = mkLiteral trans;
border = mkLiteral "2 solid 2 solid 2 solid 2 solid"; border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
border-radius = 3; border-radius = 3;
border-color = mkLiteral color.hexS.accentHL; border-color = mkLiteral color.hexS.accentHl;
}; };
"listview" = { "listview" = {
@ -110,7 +110,7 @@ in {
background-color = mkLiteral trans; background-color = mkLiteral trans;
border = mkLiteral "2 solid 2 solid 2 solid 2 solid"; border = mkLiteral "2 solid 2 solid 2 solid 2 solid";
border-radius = 3; border-radius = 3;
border-color = mkLiteral color.hexS.accentHL; border-color = mkLiteral color.hexS.accentHl;
}; };
"element" = { "element" = {
@ -126,7 +126,7 @@ in {
}; };
"element selected" = { "element selected" = {
background-color = mkLiteral color.hexS.accentHL; background-color = mkLiteral color.hexS.accentHl;
text-color = mkLiteral color.hexS.accentText; text-color = mkLiteral color.hexS.accentText;
}; };
}; };
@ -176,7 +176,7 @@ in {
in in
mylib.rofi.mkSimpleMenu mylib.rofi.mkSimpleMenu
"wall" "wall"
(config.modules.hyprland.wallpapers (color.wallpapers
|> builtins.map (setWallpaperOnMonitors monitors) |> builtins.map (setWallpaperOnMonitors monitors)
|> lib.mergeAttrsList); |> lib.mergeAttrsList);
in { in {

6
home/modules/zathura/default.nix
View File

@ -25,12 +25,12 @@ in {
window-title-home-tilde = statusbar-home-tilde; window-title-home-tilde = statusbar-home-tilde;
# Colorscheme # Colorscheme
default-bg = "#${color.hex.bg}"; default-bg = "#${color.hex.base}";
default-fg = "#${color.hex.text}"; default-fg = "#${color.hex.text}";
highlight-color = "rgba(${color.rgbS.accent}, 0.5)"; highlight-color = "rgba(${color.rgbS.accent}, 0.5)";
highlight-fg = "rgba(${color.rgbS.accentText}, 0.5)"; highlight-fg = "rgba(${color.rgbS.accentText}, 0.5)";
highlight-active-color = "rgba(${color.rgbS.accentHL}, 0.5)"; highlight-active-color = "rgba(${color.rgbS.accentHl}, 0.5)";
statusbar-bg = "#${color.hex.accent}"; statusbar-bg = "#${color.hex.accent}";
statusbar-fg = "#${color.hex.accentText}"; statusbar-fg = "#${color.hex.accentText}";
@ -38,7 +38,7 @@ in {
inputbar-bg = statusbar-bg; inputbar-bg = statusbar-bg;
inputbar-fg = statusbar-fg; inputbar-fg = statusbar-fg;
completion-bg = "#${color.hex.bg}"; completion-bg = "#${color.hex.base}";
completion-fg = default-fg; completion-fg = default-fg;
completion-highlight-bg = statusbar-bg; completion-highlight-bg = statusbar-bg;
completion-highlight-fg = statusbar-fg; completion-highlight-fg = statusbar-fg;