fix: update stylix module name and remove conflicting manual theming
Co-authored-by: aider (openrouter/google/gemini-3-pro-preview) <aider@aider.chat>
This commit is contained in:
@@ -67,7 +67,7 @@
|
||||
home-manager.extraSpecialArgs = { inherit nix-colors inputs; };
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.stylix.homeManagerModules.stylix
|
||||
inputs.stylix.homeModules.stylix
|
||||
];
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
home-manager.extraSpecialArgs = { inherit nix-colors inputs; };
|
||||
home-manager.sharedModules = [
|
||||
inputs.sops-nix.homeManagerModules.sops
|
||||
inputs.stylix.homeManagerModules.stylix
|
||||
inputs.stylix.homeModules.stylix
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
235
home/colors.nix
235
home/colors.nix
@@ -6,148 +6,6 @@
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
nix-colors-lib = nix-colors.lib.contrib { inherit pkgs; };
|
||||
c = config.colorScheme.palette; # Access palette colors
|
||||
|
||||
# Generate comprehensive CSS overrides using your color palette
|
||||
gtkColorOverrides = ''
|
||||
/* UI Colors - Main variables */
|
||||
@define-color accent_bg_color #${c.base0D};
|
||||
@define-color accent_fg_color #${c.base07};
|
||||
@define-color accent_color #${c.base0D};
|
||||
@define-color destructive_bg_color #${c.base08};
|
||||
@define-color destructive_fg_color #${c.base07};
|
||||
@define-color destructive_color #${c.base08};
|
||||
@define-color success_bg_color #${c.base0B};
|
||||
@define-color success_fg_color #${c.base07};
|
||||
@define-color success_color #${c.base0B};
|
||||
@define-color warning_bg_color #${c.base0A};
|
||||
@define-color warning_fg_color #${c.base00};
|
||||
@define-color warning_color #${c.base0A};
|
||||
@define-color error_bg_color #${c.base08};
|
||||
@define-color error_fg_color #${c.base07};
|
||||
@define-color error_color #${c.base08};
|
||||
|
||||
/* Window Colors */
|
||||
@define-color window_bg_color #${c.base00};
|
||||
@define-color window_fg_color #${c.base05};
|
||||
|
||||
/* View Colors */
|
||||
@define-color view_bg_color #${c.base00};
|
||||
@define-color view_fg_color #${c.base05};
|
||||
|
||||
/* Header Bar Colors */
|
||||
@define-color headerbar_bg_color #${c.base01};
|
||||
@define-color headerbar_fg_color #${c.base05};
|
||||
@define-color headerbar_border_color #${c.base03};
|
||||
@define-color headerbar_backdrop_color #${c.base00};
|
||||
@define-color headerbar_shade_color rgba(0, 0, 0, 0.12);
|
||||
@define-color headerbar_darker_shade_color rgba(0, 0, 0, 0.12);
|
||||
|
||||
/* Sidebar Colors */
|
||||
@define-color sidebar_bg_color #${c.base01};
|
||||
@define-color sidebar_fg_color #${c.base05};
|
||||
@define-color sidebar_backdrop_color #${c.base00};
|
||||
@define-color sidebar_border_color rgba(0, 0, 0, 0.07);
|
||||
@define-color sidebar_shade_color rgba(0, 0, 0, 0.07);
|
||||
|
||||
/* Card Colors */
|
||||
@define-color card_bg_color #${c.base01};
|
||||
@define-color card_fg_color #${c.base05};
|
||||
@define-color card_shade_color rgba(0, 0, 0, 0.07);
|
||||
|
||||
/* Dialog Colors */
|
||||
@define-color dialog_bg_color #${c.base01};
|
||||
@define-color dialog_fg_color #${c.base05};
|
||||
|
||||
/* Popover Colors */
|
||||
@define-color popover_bg_color #${c.base01};
|
||||
@define-color popover_fg_color #${c.base05};
|
||||
@define-color popover_shade_color rgba(0, 0, 0, 0.07);
|
||||
|
||||
/* Miscellaneous Colors */
|
||||
@define-color shade_color rgba(0, 0, 0, 0.07);
|
||||
@define-color scrollbar_outline_color #${c.base07};
|
||||
|
||||
/* Palette Colors */
|
||||
@define-color blue_1 #99c1f1;
|
||||
@define-color blue_2 #62a0ea;
|
||||
@define-color blue_3 #3584e4;
|
||||
@define-color blue_4 #1c71d8;
|
||||
@define-color blue_5 #1a5fb4;
|
||||
@define-color green_1 #8ff0a4;
|
||||
@define-color green_2 #57e389;
|
||||
@define-color green_3 #33d17a;
|
||||
@define-color green_4 #2ec27e;
|
||||
@define-color green_5 #26a269;
|
||||
@define-color yellow_1 #f9f06b;
|
||||
@define-color yellow_2 #f8e45c;
|
||||
@define-color yellow_3 #f6d32d;
|
||||
@define-color yellow_4 #f5c211;
|
||||
@define-color yellow_5 #e5a50a;
|
||||
@define-color orange_1 #ffbe6f;
|
||||
@define-color orange_2 #ffa348;
|
||||
@define-color orange_3 #ff7800;
|
||||
@define-color orange_4 #e66100;
|
||||
@define-color orange_5 #c64600;
|
||||
@define-color red_1 #f66151;
|
||||
@define-color red_2 #ed333b;
|
||||
@define-color red_3 #e01b24;
|
||||
@define-color red_4 #c01c28;
|
||||
@define-color red_5 #a51d2d;
|
||||
@define-color purple_1 #dc8add;
|
||||
@define-color purple_2 #c061cb;
|
||||
@define-color purple_3 #9141ac;
|
||||
@define-color purple_4 #813d9c;
|
||||
@define-color purple_5 #613583;
|
||||
@define-color brown_1 #cdab8f;
|
||||
@define-color brown_2 #b5835a;
|
||||
@define-color brown_3 #986a44;
|
||||
@define-color brown_4 #865e3c;
|
||||
@define-color brown_5 #63452c;
|
||||
@define-color light_1 #ffffff;
|
||||
@define-color light_2 #f6f5f4;
|
||||
@define-color light_3 #deddda;
|
||||
@define-color light_4 #c0bfbc;
|
||||
@define-color light_5 #9a9996;
|
||||
@define-color dark_1 #77767b;
|
||||
@define-color dark_2 #5e5c64;
|
||||
@define-color dark_3 #3d3846;
|
||||
@define-color dark_4 #241f31;
|
||||
@define-color dark_5 #000000;
|
||||
|
||||
/* Compatibility Colors */
|
||||
@define-color theme_bg_color #${c.base00};
|
||||
@define-color theme_fg_color #${c.base05};
|
||||
@define-color theme_base_color #${c.base00};
|
||||
@define-color theme_text_color #${c.base05};
|
||||
@define-color theme_selected_bg_color #${c.base0D};
|
||||
@define-color theme_selected_fg_color #${c.base07};
|
||||
@define-color insensitive_bg_color #${c.base01};
|
||||
@define-color insensitive_fg_color #${c.base03};
|
||||
@define-color insensitive_base_color #${c.base00};
|
||||
@define-color borders rgba(0, 0, 0, 0.15);
|
||||
@define-color theme_unfocused_bg_color #${c.base00};
|
||||
@define-color theme_unfocused_fg_color #${c.base05};
|
||||
@define-color theme_unfocused_base_color #${c.base00};
|
||||
@define-color theme_unfocused_text_color #${c.base05};
|
||||
@define-color theme_unfocused_selected_bg_color #${c.base0D};
|
||||
@define-color theme_unfocused_selected_fg_color #${c.base07};
|
||||
@define-color unfocused_insensitive_color #${c.base01};
|
||||
@define-color unfocused_borders rgba(0, 0, 0, 0.15);
|
||||
|
||||
/* Standard GTK Colors */
|
||||
@define-color bg_color #${c.base00};
|
||||
@define-color fg_color #${c.base05};
|
||||
@define-color base_color #${c.base00};
|
||||
@define-color text_color #${c.base05};
|
||||
@define-color selected_bg_color #${c.base0D};
|
||||
@define-color selected_fg_color #${c.base07};
|
||||
@define-color tooltip_bg_color #${c.base01};
|
||||
@define-color tooltip_fg_color #${c.base05};
|
||||
'';
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
nix-colors.homeManagerModules.default
|
||||
@@ -179,97 +37,4 @@ in
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
# GTK configuration with custom theme
|
||||
gtk = {
|
||||
enable = true;
|
||||
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
};
|
||||
cursorTheme = {
|
||||
#name = "Adwaita-Dark";
|
||||
name = "Adwaita";
|
||||
#package = pkgs.adwaita-icon-theme;
|
||||
#size = 24;
|
||||
};
|
||||
gtk2.extraConfig = ''
|
||||
gtk-color-scheme = "fg_color:#${c.base05}\n\
|
||||
bg_color:#${c.base00}\n\
|
||||
text_color:#${c.base05}\n\
|
||||
base_color:#${c.base01}\n\
|
||||
selected_fg_color:#${c.base07}\n\
|
||||
selected_bg_color:#${c.base0D}\n\
|
||||
tooltip_fg_color:#${c.base07}\n\
|
||||
tooltip_bg_color:#${c.base02}\n\
|
||||
insensitive_fg_color:#${c.base03}\n\
|
||||
insensitive_bg_color:#${c.base01}"
|
||||
|
||||
|
||||
style "custom-dark" {
|
||||
bg[NORMAL] = "#${c.base00}"
|
||||
bg[PRELIGHT] = "#${c.base02}"
|
||||
bg[ACTIVE] = "#${c.base01}"
|
||||
bg[SELECTED] = "#${c.base0D}"
|
||||
bg[INSENSITIVE] = "#${c.base01}"
|
||||
fg[NORMAL] = "#${c.base05}"
|
||||
fg[PRELIGHT] = "#${c.base06}"
|
||||
fg[ACTIVE] = "#${c.base07}"
|
||||
fg[SELECTED] = "#${c.base07}"
|
||||
fg[INSENSITIVE] = "#${c.base03}"
|
||||
|
||||
base[NORMAL] = "#${c.base01}"
|
||||
base[PRELIGHT] = "#${c.base02}"
|
||||
base[ACTIVE] = "#${c.base0D}"
|
||||
base[SELECTED] = "#${c.base0D}"
|
||||
base[INSENSITIVE] = "#${c.base00}"
|
||||
|
||||
text[NORMAL] = "#${c.base05}"
|
||||
text[PRELIGHT] = "#${c.base06}"
|
||||
text[ACTIVE] = "#${c.base07}"
|
||||
text[SELECTED] = "#${c.base07}"
|
||||
text[INSENSITIVE] = "#${c.base03}"
|
||||
}
|
||||
|
||||
class "**" style "custom-dark"
|
||||
widget_class "**" style "custom-dark"
|
||||
|
||||
gtk-application-prefer-dark-theme="true"
|
||||
|
||||
'';
|
||||
|
||||
gtk3.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
gtk4.extraConfig = {
|
||||
gtk-application-prefer-dark-theme = true;
|
||||
};
|
||||
# Inject comprehensive color overrides for GTK 3
|
||||
gtk3.extraCss = gtkColorOverrides;
|
||||
# Inject comprehensive color overrides for GTK 4
|
||||
gtk4.extraCss = gtkColorOverrides;
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
icon-theme = "Papirus-Dark";
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
papirus-icon-theme
|
||||
gnome-themes-extra
|
||||
adwaita-icon-theme
|
||||
];
|
||||
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk"; #tried gtk 3 but gives errors with mismatch.
|
||||
#platformTheme.name = "adwaita";
|
||||
style.name = "gtk2";
|
||||
#style.name = "adwaita-dark";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
{
|
||||
stylix.enable = true;
|
||||
|
||||
stylix.image = ./Wallpapers/1346679.jpg;
|
||||
|
||||
stylix.base16Scheme = {
|
||||
scheme = config.colorScheme.name;
|
||||
author = config.colorScheme.author;
|
||||
|
||||
Reference in New Issue
Block a user