Init text color on wallpaper

Former-commit-id: c0dfbe8249
This commit is contained in:
Hadi
2025-03-26 15:38:53 +01:00
parent b6cad25714
commit 60d177ba39
4 changed files with 81 additions and 64 deletions

View File

@@ -1,7 +1,7 @@
# Hyprlock is a lockscreen for Hyprland # Hyprlock is a lockscreen for Hyprland
{ config, lib, ... }: { config, lib, ... }:
let let
foreground = "rgba(26, 22, 23, 0.70)"; foreground = "rgba(${config.theme.textColorOnWallpaper}ee)";
font = config.stylix.fonts.serif.name; font = config.stylix.fonts.serif.name;
in { in {
programs.hyprlock = { programs.hyprlock = {

View File

@@ -9,6 +9,7 @@ let
background = "#${config.lib.stylix.colors.base00}"; background = "#${config.lib.stylix.colors.base00}";
background-alt = "#${config.lib.stylix.colors.base01}"; background-alt = "#${config.lib.stylix.colors.base01}";
foreground = "#${config.lib.stylix.colors.base05}"; foreground = "#${config.lib.stylix.colors.base05}";
foregroundOnWallpaper = "#${config.theme.textColorOnWallpaper}";
font = "${config.stylix.fonts.serif.name}"; font = "${config.stylix.fonts.serif.name}";
fontSize = "${toString config.stylix.fonts.sizes.desktop}"; fontSize = "${toString config.stylix.fonts.sizes.desktop}";
@@ -146,7 +147,10 @@ in {
+ (if transparentButtons && transparent then "00" else "")}"; + (if transparentButtons && transparent then "00" else "")}";
"theme.bar.buttons.style" = "default"; "theme.bar.buttons.style" = "default";
"theme.bar.buttons.monochrome" = true; "theme.bar.buttons.monochrome" = true;
"theme.bar.buttons.text" = "${foreground}"; "theme.bar.buttons.text" = if transparent && transparentButtons then
"${foregroundOnWallpaper}"
else
"${foreground}";
"theme.bar.buttons.background" = "theme.bar.buttons.background" =
"${(if transparent then background else background-alt) "${(if transparent then background else background-alt)
+ (if transparentButtons then "00" else "")}"; + (if transparentButtons then "00" else "")}";

View File

@@ -1,11 +1,26 @@
{ pkgs, inputs, config, lib, ... }: { pkgs, inputs, config, lib, ... }:
let let
foreground = config.theme.textColorOnWallpaper;
sddm-astronaut = pkgs.sddm-astronaut.override { sddm-astronaut = pkgs.sddm-astronaut.override {
embeddedTheme = "pixel_sakura"; embeddedTheme = "pixel_sakura";
themeConfig = if lib.hasSuffix "sakura_static.png" config.stylix.image then themeConfig = if lib.hasSuffix "sakura_static.png" config.stylix.image then
{ } { }
else { else {
Background = "${toString config.stylix.image}"; Background = "${toString config.stylix.image}";
HeaderTextColor = "#${foreground}";
DateTextColor = "#${foreground}";
TimeTextColor = "#${foreground}";
LoginFieldTextColor = "#${foreground}";
PasswordFieldTextColor = "#${foreground}";
UserIconColor = "#${foreground}";
PasswordIconColor = "#${foreground}";
WarningColor = "#${foreground}";
LoginButtonBackgroundColor = "#${foreground}";
SystemButtonsIconsColor = "#${foreground}";
SessionButtonTextColor = "#${foreground}";
VirtualKeyboardButtonTextColor = "#${foreground}";
DropdownBackgroundColor = "#${foreground}";
HighlightBackgroundColor = "#${foreground}";
}; };
}; };
in { in {

View File

@@ -12,6 +12,8 @@
border-size = 3; border-size = 3;
animation-speed = "medium"; # "fast" | "medium" | "slow" animation-speed = "medium"; # "fast" | "medium" | "slow"
fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none"
textColorOnWallpaper =
config.lib.stylix.colors.base06; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...)
bar = { # Hyprpanel bar = { # Hyprpanel
position = "top"; # "top" | "bottom" position = "top"; # "top" | "bottom"
@@ -23,73 +25,69 @@
description = "Theme configuration options"; description = "Theme configuration options";
}; };
config = { config.stylix = {
stylix = { enable = true;
enable = true;
# See https://tinted-theming.github.io/tinted-gallery/ for more schemes # See https://tinted-theming.github.io/tinted-gallery/ for more schemes
base16Scheme = { base16Scheme = {
base00 = "0c0e0f"; # Default Background base00 = "0c0e0f"; # Default Background
base01 = base01 =
"202324"; # Lighter Background (Used for status bars, line number and folding marks) "202324"; # Lighter Background (Used for status bars, line number and folding marks)
base02 = "313244"; # Selection Background base02 = "313244"; # Selection Background
base03 = "45475a"; # Comments, Invisibles, Line Highlighting base03 = "45475a"; # Comments, Invisibles, Line Highlighting
base04 = "585b70"; # Dark Foreground (Used for status bars) base04 = "585b70"; # Dark Foreground (Used for status bars)
base05 = "cdd6f4"; # Default Foreground, Caret, Delimiters, Operators base05 = "cdd6f4"; # Default Foreground, Caret, Delimiters, Operators
base06 = "f5e0dc"; # Light Foreground (Not often used) base06 = "f5e0dc"; # Light Foreground (Not often used)
base07 = "b4befe"; # Light Background (Not often used) base07 = "b4befe"; # Light Background (Not often used)
base08 = base08 =
"f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted "f38ba8"; # Variables, XML Tags, Markup Link Text, Markup Lists, Diff Deleted
base09 = base09 =
"fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url "fab387"; # Integers, Boolean, Constants, XML Attributes, Markup Link Url
base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background base0A = "f9e2af"; # Classes, Markup Bold, Search Text Background
base0B = base0B = "a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted
"a6e3a1"; # Strings, Inherited Class, Markup Code, Diff Inserted base0C =
base0C = "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes
"94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes base0D =
base0D = "89b4fa"; # Functions, Methods, Attribute IDs, Headings, Accent color
"89b4fa"; # Functions, Methods, Attribute IDs, Headings, Accent color base0E =
base0E = "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed
"cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed base0F =
base0F = "f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?>
"f2cdcd"; # Deprecated, Opening/Closing Embedded Language Tags, e.g. <?php ?> };
cursor = {
name = "phinger-cursors-light";
package = pkgs.phinger-cursors;
size = 20;
};
fonts = {
monospace = {
package = pkgs.nerd-fonts.jetbrains-mono;
name = "JetBrains Mono Nerd Font";
}; };
sansSerif = {
cursor = { package = pkgs.source-sans-pro;
name = "phinger-cursors-light"; name = "Source Sans Pro";
package = pkgs.phinger-cursors;
size = 20;
}; };
serif = config.stylix.fonts.sansSerif;
fonts = { emoji = {
monospace = { package = pkgs.noto-fonts-emoji;
package = pkgs.nerd-fonts.jetbrains-mono; name = "Noto Color Emoji";
name = "JetBrains Mono Nerd Font";
};
sansSerif = {
package = pkgs.source-sans-pro;
name = "Source Sans Pro";
};
serif = config.stylix.fonts.sansSerif;
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
sizes = {
applications = 13;
desktop = 13;
popups = 13;
terminal = 13;
};
}; };
sizes = {
polarity = "dark"; applications = 13;
image = pkgs.fetchurl { desktop = 13;
url = popups = 13;
"https://raw.githubusercontent.com/AlexandrosLiaskos/Awesome_Wallpapers/main/images/pastel-window.png"; terminal = 13;
sha256 = "sha256-KMYVs4hSs+e66q4o15aVJ4mbTMDqIKEH4tBv9zZ7J2o=";
}; };
}; };
};
polarity = "dark";
image = pkgs.fetchurl {
url =
"https://raw.githubusercontent.com/AlexandrosLiaskos/Awesome_Wallpapers/main/images/pastel-window.png";
sha256 = "sha256-KMYVs4hSs+e66q4o15aVJ4mbTMDqIKEH4tBv9zZ7J2o=";
};
};
} }