From c937ee3afc6a330b08de7dea85b599052399f986 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Wed, 26 Mar 2025 17:00:25 +0100 Subject: [PATCH] Change theme Former-commit-id: 3f1421b4917cf0dca7bc45c9e2da8749e0b26d55 --- nixos/sddm.nix | 23 ++++++++++++++++++++++- themes/nixy.nix | 18 +++++++++--------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/nixos/sddm.nix b/nixos/sddm.nix index 3759651..f64c688 100644 --- a/nixos/sddm.nix +++ b/nixos/sddm.nix @@ -4,9 +4,30 @@ let foreground = config.theme.textColorOnWallpaper; sddm-astronaut = pkgs.sddm-astronaut.override { embeddedTheme = "pixel_sakura"; + # TODO: Cleaner version for static vs .gif, just a string.replace themeConfig = if lib.hasSuffix "sakura_static.png" config.stylix.image then { } - else { + else if lib.hasSuffix "studio.png" config.stylix.image then { + Background = pkgs.fetchurl { + url = + "https://raw.githubusercontent.com/anotherhadi/nixy-wallpapers/refs/heads/main/wallpapers/studio.gif"; + sha256 = "sha256-qySDskjmFYt+ncslpbz0BfXiWm4hmFf5GPWF2NlTVB8="; + }; + 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}"; + } else { Background = "${toString config.stylix.image}"; HeaderTextColor = "#${foreground}"; DateTextColor = "#${foreground}"; diff --git a/themes/nixy.nix b/themes/nixy.nix index 771627b..4bfec30 100644 --- a/themes/nixy.nix +++ b/themes/nixy.nix @@ -3,14 +3,14 @@ options.theme = lib.mkOption { type = lib.types.attrs; default = { - rounding = 10; + rounding = 8; gaps-in = 10; gaps-out = 10 * 2; - active-opacity = 0.96; - inactive-opacity = 0.94; + active-opacity = 0.92; + inactive-opacity = 0.88; blur = true; - border-size = 3; - animation-speed = "medium"; # "fast" | "medium" | "slow" + border-size = 2; + animation-speed = "fast"; # "fast" | "medium" | "slow" fetch = "none"; # "nerdfetch" | "neofetch" | "pfetch" | "none" textColorOnWallpaper = config.lib.stylix.colors.base06; # Color of the text displayed on the wallpaper (Lockscreen, display manager, ...) @@ -32,7 +32,7 @@ base16Scheme = { base00 = "0c0e0f"; # Default Background base01 = - "202324"; # Lighter Background (Used for status bars, line number and folding marks) + "1c1e1f"; # Lighter Background (Used for status bars, line number and folding marks) base02 = "313244"; # Selection Background base03 = "45475a"; # Comments, Invisibles, Line Highlighting base04 = "585b70"; # Dark Foreground (Used for status bars) @@ -48,7 +48,7 @@ base0C = "94e2d5"; # Support, Regular Expressions, Escape Characters, Markup Quotes base0D = - "89b4fa"; # Functions, Methods, Attribute IDs, Headings, Accent color + "BB96F5"; # Functions, Methods, Attribute IDs, Headings, Accent color base0E = "cba6f7"; # Keywords, Storage, Selector, Markup Italic, Diff Changed base0F = @@ -86,8 +86,8 @@ polarity = "dark"; image = pkgs.fetchurl { url = - "https://raw.githubusercontent.com/AlexandrosLiaskos/Awesome_Wallpapers/main/images/pastel-window.png"; - sha256 = "sha256-KMYVs4hSs+e66q4o15aVJ4mbTMDqIKEH4tBv9zZ7J2o="; + "https://raw.githubusercontent.com/anotherhadi/nixy-wallpapers/refs/heads/main/wallpapers/studio.png"; + sha256 = "sha256-+YUsGNHsgiFW8y7n9HYLdf/qWlNXyQAOGaAQSIeptsY="; }; }; }