From a74af377bd7ee82aa6d82d40d0a6e4bba33ce5bc Mon Sep 17 00:00:00 2001 From: Christoph Urlacher Date: Sat, 19 Jul 2025 22:48:53 +0200 Subject: [PATCH] Modules/Hyprpanel: Use updated color module for theme --- home/modules/hyprpanel/default.nix | 110 ++++++++++++++--------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/home/modules/hyprpanel/default.nix b/home/modules/hyprpanel/default.nix index 881b000b..a145579f 100644 --- a/home/modules/hyprpanel/default.nix +++ b/home/modules/hyprpanel/default.nix @@ -32,12 +32,12 @@ in { "bar.layouts" = { "HDMI-A-1" = { "left" = ["workspaces" "windowtitle"]; - "middle" = ["media" "cava"]; + "middle" = ["media"]; # "cava" "right" = ["volume" "network" "bluetooth" "cpu" "ram" "storage" "clock" "systray" "notifications"]; }; "DP-1" = { "left" = ["workspaces" "windowtitle"]; - "middle" = ["media" "cava"]; + "middle" = ["media"]; # "cava" "right" = ["volume" "clock" "notifications"]; }; }; @@ -71,8 +71,8 @@ in { }; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/index.ts - "theme.bar.background" = "#${color.hex.base}"; - "theme.bar.border.color" = "#${color.hex.lavender}"; + "theme.bar.background" = "#${color.hex.bg}"; + "theme.bar.border.color" = "#${color.hex.accent}"; "theme.bar.border.location" = "full"; "theme.bar.border_radius" = "6px"; "theme.bar.border.width" = "2px"; @@ -82,7 +82,7 @@ in { "theme.bar.margin_bottom" = "0px"; "theme.bar.margin_sides" = "10px"; "theme.bar.margin_top" = "10px"; - "theme.bar.opacity" = 30; + "theme.bar.opacity" = 60; "theme.bar.outer_spacing" = "0px"; # NOTE: Left/Right bar padding "theme.bar.transparent" = false; @@ -93,7 +93,7 @@ in { "theme.bar.buttons.radius" = "6px"; "theme.bar.buttons.spacing" = "2px"; # NOTE: Horizontal inter-button spacing "theme.bar.buttons.style" = "default"; - "theme.bar.buttons.text" = "#${color.hex.base}"; + "theme.bar.buttons.text" = "#${color.hex.accentText}"; "theme.bar.buttons.y_margins" = "2px"; # NOTE: Top/Bottom bar padding # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/general/index.ts @@ -123,19 +123,19 @@ in { "bar.workspaces.workspaces" = 9; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/workspaces.ts - "theme.bar.buttons.workspaces.active" = "#${color.hex.pink}"; - "theme.bar.buttons.workspaces.available" = "#${color.hex.base}"; - "theme.bar.buttons.workspaces.background" = "#${color.hex.lavender}"; - "theme.bar.buttons.workspaces.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.workspaces.active" = "#${color.hex.accentHL}"; + "theme.bar.buttons.workspaces.available" = "#${color.hex.accentText}"; + "theme.bar.buttons.workspaces.background" = "#${color.hex.accent}"; + "theme.bar.buttons.workspaces.border" = "#${color.hex.accent}"; "theme.bar.buttons.workspaces.enableBorder" = false; "theme.bar.buttons.workspaces.fontSize" = "18px"; - "theme.bar.buttons.workspaces.hover" = "#${color.hex.pink}"; + "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_highlighted_text_color" = "#${color.hex.base}"; + "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_underline_color" = "#${color.hex.pink}"; + "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.occupied" = "#${color.hex.base}"; + "theme.bar.buttons.workspaces.occupied" = "#${color.hex.accentText}"; "theme.bar.buttons.workspaces.smartHighlight" = "false"; "theme.bar.buttons.workspaces.spacing" = "6px"; # no visible difference? @@ -157,12 +157,12 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/windowtitle.ts "theme.bar.buttons.windowtitle.background" = "#${color.hex.pink}"; - "theme.bar.buttons.windowtitle.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.windowtitle.border" = "#${color.hex.accent}"; "theme.bar.buttons.windowtitle.enableBorder" = false; "theme.bar.buttons.windowtitle.icon_background" = "#${color.hex.pink}"; - "theme.bar.buttons.windowtitle.icon" = "#${color.hex.base}"; + "theme.bar.buttons.windowtitle.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.windowtitle.spacing" = "6px"; # Spacing between icon and text - "theme.bar.buttons.windowtitle.text" = "#${color.hex.base}"; + "theme.bar.buttons.windowtitle.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/media/index.ts "bar.media.format" = "{artist: - }{title}"; @@ -172,13 +172,13 @@ in { "bar.media.truncation_size" = 30; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/media.ts - "theme.bar.buttons.media.background" = "#${color.hex.mauve}"; - "theme.bar.buttons.media.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.media.background" = "#${color.hex.lavender}"; + "theme.bar.buttons.media.border" = "#${color.hex.accent}"; "theme.bar.buttons.media.enableBorder" = false; - "theme.bar.buttons.media.icon_background" = "#${color.hex.base}"; - "theme.bar.buttons.media.icon" = "#${color.hex.base}"; + "theme.bar.buttons.media.icon_background" = "#${color.hex.lavender}"; + "theme.bar.buttons.media.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.media.spacing" = "6px"; - "theme.bar.buttons.media.text" = "#${color.hex.base}"; + "theme.bar.buttons.media.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/cava/index.ts "bar.customModules.cava.showActiveOnly" = true; @@ -187,12 +187,12 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/cava.ts "theme.bar.buttons.modules.cava.background" = "#${color.hex.red}"; - "theme.bar.buttons.modules.cava.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.modules.cava.border" = "#${color.hex.accent}"; "theme.bar.buttons.modules.cava.enableBorder" = false; - "theme.bar.buttons.modules.cava.icon" = "#${color.hex.base}"; + "theme.bar.buttons.modules.cava.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.modules.cava.icon_background" = "#${color.hex.red}"; "theme.bar.buttons.modules.cava.spacing" = "6px"; - "theme.bar.buttons.modules.cava.text" = "#${color.hex.base}"; + "theme.bar.buttons.modules.cava.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/volume/index.ts "bar.volume.middleClick" = "kitty ncpamixer"; @@ -200,33 +200,33 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/volume.ts "theme.bar.buttons.volume.background" = "#${color.hex.maroon}"; "theme.bar.buttons.volume.enableBorder" = false; - "theme.bar.buttons.volume.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.volume.border" = "#${color.hex.accent}"; "theme.bar.buttons.volume.icon_background" = "#${color.hex.maroon}"; - "theme.bar.buttons.volume.icon" = "#${color.hex.base}"; + "theme.bar.buttons.volume.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.volume.spacing" = "6px"; - "theme.bar.buttons.volume.text" = "#${color.hex.base}"; + "theme.bar.buttons.volume.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/network/index.ts # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/network.ts "theme.bar.buttons.network.background" = "#${color.hex.peach}"; "theme.bar.buttons.network.enableBorder" = false; - "theme.bar.buttons.network.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.network.border" = "#${color.hex.accent}"; "theme.bar.buttons.network.icon_background" = "#${color.hex.peach}"; - "theme.bar.buttons.network.icon" = "#${color.hex.base}"; + "theme.bar.buttons.network.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.network.spacing" = "6px"; - "theme.bar.buttons.network.text" = "#${color.hex.base}"; + "theme.bar.buttons.network.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/bluetooth/index.ts # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/bluetooth.ts "theme.bar.buttons.bluetooth.background" = "#${color.hex.yellow}"; "theme.bar.buttons.bluetooth.enableBorder" = false; - "theme.bar.buttons.bluetooth.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.bluetooth.border" = "#${color.hex.accent}"; "theme.bar.buttons.bluetooth.icon_background" = "#${color.hex.yellow}"; - "theme.bar.buttons.bluetooth.icon" = "#${color.hex.base}"; + "theme.bar.buttons.bluetooth.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.bluetooth.spacing" = "6px"; - "theme.bar.buttons.bluetooth.text" = "#${color.hex.base}"; + "theme.bar.buttons.bluetooth.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/cpu/index.ts "bar.customModules.cpu.middleClick" = "kitty btop"; @@ -235,11 +235,11 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/cpu.ts "theme.bar.buttons.modules.cpu.background" = "#${color.hex.green}"; "theme.bar.buttons.modules.cpu.enableBorder" = false; - "theme.bar.buttons.modules.cpu.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.modules.cpu.border" = "#${color.hex.accent}"; "theme.bar.buttons.modules.cpu.icon_background" = "#${color.hex.green}"; - "theme.bar.buttons.modules.cpu.icon" = "#${color.hex.base}"; + "theme.bar.buttons.modules.cpu.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.modules.cpu.spacing" = "6px"; - "theme.bar.buttons.modules.cpu.text" = "#${color.hex.base}"; + "theme.bar.buttons.modules.cpu.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/ram/index.ts "bar.customModules.ram.labelType" = "percentage"; # "used/total", "percentage" @@ -248,11 +248,11 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/ram.ts "theme.bar.buttons.modules.ram.background" = "#${color.hex.teal}"; "theme.bar.buttons.modules.ram.enableBorder" = false; - "theme.bar.buttons.modules.ram.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.modules.ram.border" = "#${color.hex.accent}"; "theme.bar.buttons.modules.ram.icon_background" = "#${color.hex.teal}"; - "theme.bar.buttons.modules.ram.icon" = "#${color.hex.base}"; + "theme.bar.buttons.modules.ram.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.modules.ram.spacing" = "6px"; - "theme.bar.buttons.modules.ram.text" = "#${color.hex.base}"; + "theme.bar.buttons.modules.ram.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/storage/index.ts "bar.customModules.storage.labelType" = "percentage"; # "used/total", "percentage" @@ -262,11 +262,11 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/storage.ts "theme.bar.buttons.modules.storage.background" = "#${color.hex.sky}"; "theme.bar.buttons.modules.storage.enableBorder" = false; - "theme.bar.buttons.modules.storage.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.modules.storage.border" = "#${color.hex.accent}"; "theme.bar.buttons.modules.storage.icon_background" = "#${color.hex.sky}"; - "theme.bar.buttons.modules.storage.icon" = "#${color.hex.base}"; + "theme.bar.buttons.modules.storage.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.modules.storage.spacing" = "6px"; - "theme.bar.buttons.modules.storage.text" = "#${color.hex.base}"; + "theme.bar.buttons.modules.storage.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/clock/index.ts "bar.clock.format" = "%Y-%m-%d %H:%M"; @@ -275,19 +275,19 @@ in { # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/clock.ts "theme.bar.buttons.clock.background" = "#${color.hex.sapphire}"; "theme.bar.buttons.clock.enableBorder" = false; - "theme.bar.buttons.clock.border" = "#${color.hex.lavender}"; + "theme.bar.buttons.clock.border" = "#${color.hex.accent}"; "theme.bar.buttons.clock.icon_background" = "#${color.hex.sapphire}"; - "theme.bar.buttons.clock.icon" = "#${color.hex.base}"; + "theme.bar.buttons.clock.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.clock.spacing" = "6px"; - "theme.bar.buttons.clock.text" = "#${color.hex.base}"; + "theme.bar.buttons.clock.text" = "#${color.hex.accentText}"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/systray/index.ts # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/systray.ts "theme.bar.buttons.systray.background" = "#${color.hex.blue}"; "theme.bar.buttons.systray.enableBorder" = false; - "theme.bar.buttons.systray.border" = "#${color.hex.lavender}"; - "theme.bar.buttons.systray.customIcon" = "#${color.hex.base}"; + "theme.bar.buttons.systray.border" = "#${color.hex.accent}"; + "theme.bar.buttons.systray.customIcon" = "#${color.hex.accentText}"; "theme.bar.buttons.systray.spacing" = "6px"; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/config/bar/notifications/index.ts @@ -295,20 +295,20 @@ in { "bar.notifications.show_total" = true; # https://github.com/Jas-SinghFSU/HyprPanel/blob/master/src/configuration/modules/theme/bar/buttons/notifications.ts - "theme.bar.buttons.notifications.background" = "#${color.hex.lavender}"; + "theme.bar.buttons.notifications.background" = "#${color.hex.accent}"; "theme.bar.buttons.notifications.enableBorder" = false; - "theme.bar.buttons.notifications.border" = "#${color.hex.lavender}"; - "theme.bar.buttons.notifications.icon_background" = "#${color.hex.lavender}"; - "theme.bar.buttons.notifications.icon" = "#${color.hex.base}"; + "theme.bar.buttons.notifications.border" = "#${color.hex.accent}"; + "theme.bar.buttons.notifications.icon_background" = "#${color.hex.accent}"; + "theme.bar.buttons.notifications.icon" = "#${color.hex.accentText}"; "theme.bar.buttons.notifications.spacing" = "6px"; - "theme.bar.buttons.notifications.total" = "#${color.hex.base}"; + "theme.bar.buttons.notifications.total" = "#${color.hex.accentText}"; # # TODO: Menus Config # - "theme.bar.menus.background" = "#${color.hex.base}"; - "theme.bar.menus.border.color" = "#${color.hex.lavender}"; + "theme.bar.menus.background" = "#${color.hex.bg}"; + "theme.bar.menus.border.color" = "#${color.hex.accent}"; "theme.bar.menus.border.radius" = "6px"; "theme.bar.menus.border.size" = "2px"; "theme.bar.menus.buttons.radius" = "0.4em";