diff --git a/modules/home/workstation/hyprland/components/hyprlock.nix b/modules/home/workstation/hyprland/components/hyprlock.nix index a829f9b..337a097 100644 --- a/modules/home/workstation/hyprland/components/hyprlock.nix +++ b/modules/home/workstation/hyprland/components/hyprlock.nix @@ -2,11 +2,13 @@ lib, osConfig, inputs', + hozen, ... }: let inherit (osConfig.ooknet.appearance) colorscheme fonts; inherit (colorscheme) palette; inherit (osConfig.ooknet.workstation) environment; + inherit (hozen) color; inherit (lib) mkIf; in { config = mkIf (environment == "hyprland") { @@ -29,7 +31,7 @@ in { background = { monitor = ""; path = ""; - color = "0xff${palette.base01}"; + color = "0xff${color.layout.body}"; }; input-field = { @@ -42,18 +44,18 @@ in { rounding = 0; fade_on_empty = false; placeholder_text = ""; - outer_color = "0xff${palette.base03}"; - inner_color = "0xff${palette.base00}"; - font_color = "0xff${palette.base05}"; + outer_color = "0xff${color.secondary.base}"; + inner_color = "0xff${color.layout.menu}"; + font_color = "0xff${color.typography.text}"; }; label = { monitor = ""; - text = " LOCKED"; + text = " \ "; position = "0, 150"; valign = "center"; halign = "center"; - color = "0xff${palette.base08}"; + color = "0xff${color.red.base}"; font_size = 30; font_family = "${fonts.monospace.family}"; }; diff --git a/modules/home/workstation/hyprland/components/rofi.nix b/modules/home/workstation/hyprland/components/rofi.nix index 70b7ce3..e63aea1 100644 --- a/modules/home/workstation/hyprland/components/rofi.nix +++ b/modules/home/workstation/hyprland/components/rofi.nix @@ -2,13 +2,14 @@ lib, config, osConfig, + hozen, pkgs, ... }: let inherit (lib) mkIf; - inherit (osConfig.ooknet.appearance) colorscheme fonts; - inherit (colorscheme) palette; + inherit (osConfig.ooknet.appearance) fonts; inherit (osConfig.ooknet.workstation) environment; + inherit (hozen) color; inherit (config.lib.formats.rasi) mkLiteral; in { config = mkIf (environment == "hyprland") { @@ -19,10 +20,10 @@ in { terminal = "${config.home.sessionVariables.TERMINAL}"; theme = { "*" = { - background = mkLiteral "#${palette.base00}"; - foreground = mkLiteral "#${palette.base05}"; - selected = mkLiteral "#${palette.base0B}"; - message = mkLiteral "#${palette.base0D}"; + background = mkLiteral "#${color.layout.menu}"; + foreground = mkLiteral "#${color.typography.text}"; + selected = mkLiteral "#${color.primary.base}"; + message = mkLiteral "#${color.blue.base}"; background-color = mkLiteral "@background"; border-color = mkLiteral "@foreground"; diff --git a/modules/home/workstation/hyprland/components/waybar.nix b/modules/home/workstation/hyprland/components/waybar.nix index 7213faf..89ac6b0 100644 --- a/modules/home/workstation/hyprland/components/waybar.nix +++ b/modules/home/workstation/hyprland/components/waybar.nix @@ -3,10 +3,11 @@ lib, pkgs, osConfig, + hozen, ... }: let - inherit (osConfig.ooknet.appearance) colorscheme fonts; - inherit (colorscheme) palette; + inherit (osConfig.ooknet.appearance) fonts; + inherit (hozen) color; inherit (osConfig.ooknet.hardware) monitors; inherit (osConfig.ooknet.workstation) environment; inherit (lib) mkIf head; @@ -90,7 +91,7 @@ in { * { font-family: "${fonts.monospace.family}"; font-size: 19px; - border: solid #${palette.base05}; + border: solid #${color.border.base}; } window#waybar { @@ -101,32 +102,32 @@ in { #clock, #battery, #workspaces { - background-color: #${palette.base00}; + background-color: #${color.layout.header}; padding-right: 10px; } #clock { padding-left: 10px; - border: 2px solid #${palette.base05}; + border: 2px solid #${color.border.base}; border-right: 0px; border-top-left-radius: 10px; } #battery { padding-left: 10px; - border-top: 2px solid #${palette.base05}; - border-bottom: 2px solid #${palette.base05}; + border-top: 2px solid #${color.border.base}; + border-bottom: 2px solid #${color.border.base}; border-left: 0px; } #battery.good { - color: #${palette.base0B}; + color: #${color.success.base}; } #battery.warning { - color: #${palette.base0A}; + color: #${color.warning.base}; } #battery.critical { - color: #${palette.base08}; + color: #${color.error.base}; } #tray { @@ -137,7 +138,7 @@ in { } #workspaces { - border: 2px solid #${palette.base05}; + border: 2px solid #${color.border.base}; border-left: 0; border-top-right-radius: 10px; } @@ -145,15 +146,15 @@ in { #workspace button, #workspaces button.active, #workspaces button.visible { - color: #${palette.base0B}; + color: #${color.primary.base}; } #workspaces button.urgent { - color: #${palette.base08}; + color: #${color.orange.base}; } #custom-hyprrecord { - color: #${palette.base08}; + color: #${color.red.base}; padding-right: 20px; } '';