From 80d32cb32a631e495d3a19d714a9acfd5aec9833 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Fri, 27 Jun 2025 11:12:06 -0400 Subject: update colorschemes --- modules/desktop/hyprland.nix | 20 ++++++++++---------- modules/desktop/hyprlock.nix | 12 ++++++------ modules/desktop/mako.nix | 6 +++--- modules/desktop/waybar/style.nix | 17 ++++++++--------- modules/desktop/wofi/style.nix | 17 ++++++++--------- 5 files changed, 35 insertions(+), 37 deletions(-) (limited to 'modules/desktop') diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 13a1926..3b04a8c 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -10,10 +10,10 @@ hyprland-plugins = inputs.hyprland-plugins.packages.${system}; hy3 = inputs.hy3.packages.${system}; - fg = "rgb(${config.theme.colors.fg})"; - bg = "rgb(${config.theme.colors.bg})"; + text = "rgb(${config.theme.colors.text})"; + base = "rgb(${config.theme.colors.base})"; + surface = "rgb(${config.theme.colors.surface})"; primary = "rgb(${config.theme.colors.primary})"; - inactive = "rgb(${config.theme.colors.surface.bg})"; debug = false; @@ -103,7 +103,7 @@ in { extend_border_grab_area = 20; border_size = config.theme.borderWidth; "col.active_border" = "${primary}"; - "col.inactive_border" = "${inactive}"; + "col.inactive_border" = "${surface}"; }; # Gestures @@ -304,12 +304,12 @@ in { radius = config.theme.outerRadius; border_width = config.theme.borderWidth; - "col.active" = "${bg}"; - "col.active.border" = "${inactive}"; - "col.active.text" = "${fg}"; - "col.inactive" = "${bg}"; - "col.inactive.border" = "${inactive}"; - "col.inactive.text" = "${fg}"; + "col.active" = "${base}"; + "col.active.border" = "${primary}"; + "col.active.text" = "${text}"; + "col.inactive" = "${base}"; + "col.inactive.border" = "${surface}"; + "col.inactive.text" = "${text}"; }; autotile = { diff --git a/modules/desktop/hyprlock.nix b/modules/desktop/hyprlock.nix index da0621c..8be2856 100644 --- a/modules/desktop/hyprlock.nix +++ b/modules/desktop/hyprlock.nix @@ -3,8 +3,8 @@ lib, ... }: let - fg = "rgb(${config.theme.colors.fg})"; - bg = "rgb(${config.theme.colors.bg})"; + text = "rgb(${config.theme.colors.text})"; + base = "rgb(${config.theme.colors.base})"; error = "rgb(${config.theme.colors.error})"; trans = "rgba(0,0,0,0)"; @@ -21,7 +21,7 @@ in { settings = { background = { path = config.theme.lockscreen; - color = bg; + color = base; blur_passes = 0; blur_size = 2; noise = 0; @@ -41,7 +41,7 @@ in { dots_rounding = -1; outer_color = trans; inner_color = trans; - font_color = fg; + font_color = text; fade_on_empty = false; placeholder_text = "Enter Password"; hide_input = false; @@ -62,7 +62,7 @@ in { # Date { text = "cmd[update:1000] echo \"$(date +\"%A, %B %d\")\""; - color = fg; + color = text; font_size = 20; font_family = config.theme.font.header; position = "0, -100"; @@ -72,7 +72,7 @@ in { # Clock { text = "cmd[update:1000] echo \"$(date +\"%k:%M:%S\")\""; - color = fg; + color = text; font_size = 90; font_family = config.theme.font.header; position = "0, -130"; diff --git a/modules/desktop/mako.nix b/modules/desktop/mako.nix index 17ed94f..5a24e56 100644 --- a/modules/desktop/mako.nix +++ b/modules/desktop/mako.nix @@ -17,11 +17,11 @@ in { margin = toString config.theme.outerGap; padding = toString config.theme.innerGap; - background-color = "#${config.theme.colors.bg}"; + background-color = "#${config.theme.colors.base}"; progress-color = "#${config.theme.colors.primary}"; - text-color = "#${config.theme.colors.fg}"; + text-color = "#${config.theme.colors.text}"; - border-color = "#${config.theme.colors.fg}"; + border-color = "#${config.theme.colors.text}"; border-size = config.theme.borderWidth; border-radius = config.theme.outerRadius; diff --git a/modules/desktop/waybar/style.nix b/modules/desktop/waybar/style.nix index 33db673..21a8de5 100644 --- a/modules/desktop/waybar/style.nix +++ b/modules/desktop/waybar/style.nix @@ -1,8 +1,7 @@ {theme}: let - fg = "#${theme.colors.fg}"; - bg = "#${theme.colors.bg}"; - surface-fg = "#${theme.colors.surface.fg}"; - surface-bg = "#${theme.colors.surface.bg}"; + text = "#${theme.colors.text}"; + base = "#${theme.colors.base}"; + surface = "#${theme.colors.surface}"; primary = "#${theme.colors.primary}"; success = "#${theme.colors.success}"; warning = "#${theme.colors.warning}"; @@ -23,8 +22,8 @@ in '' window#waybar { font-family: "${theme.font.regular}", "${theme.font.icon}", "${theme.font.monospace}"; font-size: ${fontSize}; - color: ${fg}; - background-color: ${bg}; + color: ${text}; + background-color: ${base}; } /** Workspaces */ @@ -37,14 +36,14 @@ in '' border-radius: ${innerRadius}; margin: 4px 2px; padding: 0px 7px; - background: ${surface-bg}; - color: ${surface-fg}; + background: ${surface}; + color: ${text}; } #workspaces button.focused, #workspaces button.active { background: ${primary}; - color: ${bg}; + color: ${base}; } #workspaces button.urgent { diff --git a/modules/desktop/wofi/style.nix b/modules/desktop/wofi/style.nix index 27b7205..75a0a21 100644 --- a/modules/desktop/wofi/style.nix +++ b/modules/desktop/wofi/style.nix @@ -1,8 +1,7 @@ {theme}: let - fg = "#${theme.colors.fg}"; - bg = "#${theme.colors.bg}"; - surface-fg = "#${theme.colors.surface.fg}"; - surface-bg = "#${theme.colors.surface.bg}"; + text = "#${theme.colors.text}"; + base = "#${theme.colors.base}"; + surface = "#${theme.colors.surface}"; primary = "#${theme.colors.primary}"; fontSize = "${toString theme.font.size}px"; outerGap = "${toString theme.outerGap}px"; @@ -21,7 +20,7 @@ in '' margin: 0px; border: ${borderWidth} solid ${primary}; border-radius: ${outerRadius}; - background-color: ${bg}; + background-color: ${base}; } /* Outer Box */ @@ -41,8 +40,8 @@ in '' margin: ${innerGap}; padding: ${innerGap}; border: none; - color: ${surface-fg}; - background-color: ${surface-bg}; + color: ${text}; + background-color: ${surface}; border-radius: ${outerRadius}; } @@ -58,7 +57,7 @@ in '' margin: ${innerGap}; padding: ${innerGap}; border: none; - color: ${fg}; + color: ${text}; } /* Selected Entry */ @@ -68,7 +67,7 @@ in '' } #entry:selected #text { - color: ${bg}; + color: ${base}; } '' -- cgit v1.2.3-freya