diff --git a/common/colors.nix b/common/colors.nix index 2a70ae2..e68965e 100644 --- a/common/colors.nix +++ b/common/colors.nix @@ -9,9 +9,9 @@ slug = "dracumod"; name = "ModifiedDracula"; author = "Noa"; - palette = { - base00 = "#26052e"; # background222c"; # background - base01 = "#950fad"; # lighter background"#282a36"; # lighter background + palette = rec { + base00 = "#26052e"; # background222c" + base01 = "#950fad"; # lighter background" base02 = "#3A3C4E"; # selection background base03 = "#4D4F68"; # comments, invisibles, line highlighting base04 = "#626483"; # dark foreground @@ -34,6 +34,7 @@ base15 = "#a4ffff"; # bright cyan base16 = "#d6acff"; # bright blue base17 = "#ff92df"; # bright purple + taskbarText = base04; }; }; diff --git a/modules/waybar/clock.nix b/modules/waybar/clock.nix index f56f62b..99f65e6 100644 --- a/modules/waybar/clock.nix +++ b/modules/waybar/clock.nix @@ -28,7 +28,7 @@ in }; style = '' #clock { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 2px; padding: 0 15px; diff --git a/modules/waybar/cpu.nix b/modules/waybar/cpu.nix index 763900d..e5b1a3b 100644 --- a/modules/waybar/cpu.nix +++ b/modules/waybar/cpu.nix @@ -17,7 +17,7 @@ in }; style = '' #cpu { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 0px; padding: 0 15px; diff --git a/modules/waybar/default.nix b/modules/waybar/default.nix index 35a0979..6390943 100644 --- a/modules/waybar/default.nix +++ b/modules/waybar/default.nix @@ -101,7 +101,7 @@ in tooltip { background-color: #${config.colorScheme.palette.base00}; border: 1px solid; - border-color: #${config.colorScheme.palette.base04}; + border-color: #${config.colorScheme.palette.taskbarText}; border-radius: 10px; color: #${config.colorScheme.palette.base05}; } diff --git a/modules/waybar/memory.nix b/modules/waybar/memory.nix index dec7812..38cd55c 100644 --- a/modules/waybar/memory.nix +++ b/modules/waybar/memory.nix @@ -19,7 +19,7 @@ in #memory { border-radius: 0px 999px 999px 0px; padding: 0 10px; - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px; box-shadow: inset 0px 2px 0 -1px #${config.colorScheme.palette.base01}, inset 0px -2px 0 -1px #${config.colorScheme.palette.base01}; diff --git a/modules/waybar/network.nix b/modules/waybar/network.nix index 853a57c..76b9177 100644 --- a/modules/waybar/network.nix +++ b/modules/waybar/network.nix @@ -21,7 +21,7 @@ in }; style = '' #network { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 2px; padding: 0 15px; border-radius: 999px; diff --git a/modules/waybar/power.nix b/modules/waybar/power.nix index 5defbb3..1ea7e8a 100644 --- a/modules/waybar/power.nix +++ b/modules/waybar/power.nix @@ -22,7 +22,7 @@ in }; style = '' #custom-poweroff { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 2px; padding: 0 15px; border-radius: 999px; diff --git a/modules/waybar/tray.nix b/modules/waybar/tray.nix index f75e38e..b401cb9 100644 --- a/modules/waybar/tray.nix +++ b/modules/waybar/tray.nix @@ -16,7 +16,7 @@ in }; style = '' #tray { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 2px; padding: 4px 10px; border-radius: 999px 999px 999px 999px; diff --git a/modules/waybar/window.nix b/modules/waybar/window.nix index 806ee06..f5ffe9d 100644 --- a/modules/waybar/window.nix +++ b/modules/waybar/window.nix @@ -37,7 +37,7 @@ in #window { margin-left: 6px; - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; } ''; }; diff --git a/modules/waybar/wireplumber.nix b/modules/waybar/wireplumber.nix index 57a99e7..f5d0f31 100644 --- a/modules/waybar/wireplumber.nix +++ b/modules/waybar/wireplumber.nix @@ -19,7 +19,7 @@ in }; style = '' #wireplumber { - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; margin: 0px 2px; padding: 0 15px; border-radius: 999px; diff --git a/modules/waybar/workspaces.nix b/modules/waybar/workspaces.nix index 2f5efd7..0a2b724 100644 --- a/modules/waybar/workspaces.nix +++ b/modules/waybar/workspaces.nix @@ -24,7 +24,7 @@ in min-width: 15px; min-height: 15px; background-color: transparent; - color: #${config.colorScheme.palette.base04}; + color: #${config.colorScheme.palette.taskbarText}; border-radius: 999px; }