Mirrors/stylix
2
0
Fork 0
mirror of https://github.com/danth/stylix synced 2024-11-22 12:13:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

gnome: update to GNOME 46 (#357)

Browse source
This commit is contained in:
Daniel Thwaites 2024-05-09 13:41:00 +01:00 committed by GitHub
parent f1bb5c5080
commit 197526923a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 77 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.lock
View file

@ -149,16 +149,16 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1698794309,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=",
"lastModified": 1713702291,
"narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7",
"rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github"
},
"original": {
"owner": "GNOME",
"ref": "45.1",
"ref": "46.1",
"repo": "gnome-shell",
"type": "github"
}
@ -170,11 +170,11 @@
]
},
"locked": {
"lastModified": 1714679908,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
"lastModified": 1714981474,
"narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
"rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"type": "github"
},
"original": {
@ -185,11 +185,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1713596654,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=",
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be",
"rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -43,7 +43,7 @@
# TODO: Unlocking the input and pointing to official repository requires
# updating the patch:
# https://github.com/danth/stylix/pull/224#discussion_r1460339607.
url = "github:GNOME/gnome-shell/45.1";
url = "github:GNOME/gnome-shell/46.1";
};
# The 'home-manager' input is used to generate the documentation.

97
modules/gnome/colors.mustache
View file

@ -1,45 +1,69 @@
$is_highcontrast: false;
// _default-colors.scss
$descructive_bg_color: #{{base08-hex}};
$descructive_fg_color: #{{base00-hex}};
$destructive_color: #{{base08-hex}};
$success_bg_color: #{{base0B-hex}};
$success_fg_color: #{{base00-hex}};
$success_color: #{{base0B-hex}};
$warning_bg_color: #{{base0A-hex}};
$warning_fg_color: #{{base00-hex}};
$warning_color: #{{base0A-hex}};
$error_bg_color: #{{base08-hex}};
$error_fg_color: #{{base00-hex}};
$error_color: #{{base08-hex}};
$selected_bg_color: #{{base0D-hex}};
$selected_fg_color: #{{base00-hex}};
$link_color: #{{base0D-hex}};
$link_visited_color: transparentize($link_color, 0.4);
$background_mix_factor: 0%;
$border_opacity: 1;
$shadow_color: transparent;
$text_shadow_color: transparent;
$focus_color: $selected_bg_color;
$focus_border_color: transparentize(#{{base05-hex}}, 0.5);
// _colors.scss
$base_color: #{{base01-hex}};
$bg_color: #{{base00-hex}};
$fg_color: #{{base05-hex}};
$borders_color: transparentize($bg_color, 0.9);
$outer_borders_color: transparentize($bg_color, 0.98);
$selected_fg_color: #{{base00-hex}};
$selected_bg_color: #{{base0D-hex}};
$selected_borders_color: transparentize($selected_bg_color, 0.9);
$link_color: #{{base0D-hex}};
$link_visited_color: #{{base0D-hex}};
$warning_color: #{{base0A-hex}};
$error_color: #{{base08-hex}};
$success_color: #{{base0B-hex}};
$destructive_color: $error_color;
$osd_bg_color: #{{base01-hex}};
$osd_fg_color: #{{base05-hex}};
$osd_insensitive_bg_color: #{{base01-hex}};
$osd_insensitive_fg_color: #{{base05-hex}};
$osd_borders_color: transparentize($osd_bg_color, 0.9);
$osd_outer_borders_color: transparentize($osd_bg_color, 0.98);
$shadow_color: rgba(0,0,0,0.1);
$button_mix_factor: 0%;
$bubble_buttons_color: #{{base01-hex}};
$osd_bg_color: #{{base01-hex}};
$system_base_color: #{{base00-hex}};
$system_fg_color: #{{base05-hex}};
$system_bg_color: #{{base00-hex}};
$system_borders_color: transparentize($system_bg_color, .9);
$system_insensitive_fg_color: #{{base05-hex}};
$system_overlay_bg_color: #{{base01-hex}}; // for non-transparent items, e.g. dash
$insensitive_fg_color: #{{base05-hex}};
$insensitive_bg_color: #{{base01-hex}};
$insensitive_borders_color: transparentize($insensitive_bg_color, 0.9);
$panel_bg_color: #{{base00-hex}};
$panel_fg_color: #{{base05-hex}};
$card_bg_color: #{{base01-hex}};
$card_shadow_color: transparent;
$card_shadow_border_color: transparent;
$borders_color: transparentize(#{{base05-hex}}, 0.8);
$outer_borders_color: transparentize(#{{base05-hex}}, 0.9);
$osd_borders_color: $borders_color;
$osd_outer_borders_color: $outer_borders_color;
$system_bg_color: #{{base00-hex}};
$system_borders_color: $borders_color;
$system_insensitive_fg_color: #{{base05-hex}};
$system_overlay_bg_color: #{{base01-hex}};
$insensitive_fg_color: #{{base04-hex}};
$insensitive_bg_color: #{{base00-hex}};
$insensitive_borders_color: $borders_color;
$checked_bg_color: #{{base01-hex}};
$checked_fg_color: #{{base05-hex}};
@ -49,3 +73,12 @@ $hover_fg_color: #{{base05-hex}};
$active_bg_color: #{{base01-hex}};
$active_fg_color: #{{base05-hex}};
$selected_borders_color: transparentize(#{{base05-hex}}, 0.5);
// Other required variables
$_base_color_light: #eeeeee;
$light_1: #ffffff;
$red_4: #{{base08-hex}};
$orange_4: #{{base09-hex}};

65
modules/gnome/shell_colors.patch
View file

@ -27,19 +27,6 @@ index 5b117ea71..67e7ce756 100644
border-radius: 99px;
padding: $base_padding $base_padding * 2;
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 404c4dc81..f006b9347 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -143,7 +143,7 @@
//
// since buttons are all flat an borderless now the mixin is simpler
-@mixin button($t, $tc:$fg_color, $c:$bg_color, $flat: false, $osd: false) {
+@mixin button($t, $tc:$fg_color, $c:$base_color, $flat: false, $osd: false) {
$button_bg_color: mix($tc, $c, $button_mix_factor);
transition-duration: 100ms;
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index fc054da38..8e31741c1 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
@ -51,55 +38,3 @@ index fc054da38..8e31741c1 100644
+
+ color: $fg_color !important;
}
/* Calendar */
@@ -220,7 +222,7 @@
.weather-forecast-time {
@extend %numeric;
@extend %caption;
- color: darken($fg_color,30%);
+ color: transparentize($insensitive_fg_color, 0.5);
padding-top: 0.2em;
padding-bottom: 0.4em;
}
diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index 6e7b3be14..3f37fdef5 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -1,11 +1,11 @@
/* Top Bar */
// a.k.a. the panel
-$privacy_indicator_color: $orange_3;
+$privacy_indicator_color: $warning_color;
-$panel_bg_color: if($variant == 'light', $light_3, $dark_5);
-$panel_fg_color: if($variant == 'light', $fg_color, darken($fg_color, 5%));
-$panel_border_color: if($variant == 'light', darken($panel_bg_color, 2%), $panel_bg_color);
+$panel_bg_color: $base_color;
+$panel_fg_color: $fg_color;
+$panel_border_color: transparentize($panel_bg_color, 0.9);
$panel_system_fg_color: $system_fg_color; // always light for lockscreen, overview and other transparent panels
$panel_height: 2.2em;
diff --git a/data/theme/gnome-shell-sass/widgets/_quick-settings.scss b/data/theme/gnome-shell-sass/widgets/_quick-settings.scss
index 723afe7db..b23062294 100644
--- a/data/theme/gnome-shell-sass/widgets/_quick-settings.scss
+++ b/data/theme/gnome-shell-sass/widgets/_quick-settings.scss
@@ -110,13 +110,9 @@
& .icon {
icon-size: $base_icon_size*1.5; // a non-standard symbolic size but ok
border-radius: 999px;
- padding: 1.5 * $base_padding;
- background-color: transparentize($fg_color, 0.8);
-
- &.active {
- background-color: $selected_bg_color;
- color: $selected_fg_color;
- }
+ padding: $base_padding;
+ background-color: $bg_color;
+ color: $fg_color;
}
& .title {

2
modules/gnome/theme.nix
View file

@ -11,7 +11,7 @@ in pkgs.stdenv.mkDerivation {
src = config.lib.stylix.templates.gnome-shell;
patches = [ ./shell_colors.patch ];
postPatch = ''
rm data/theme/gnome-shell-sass/{_colors.scss,_palette.scss}
rm data/theme/gnome-shell-sass/{_colors.scss,_default-colors.scss,_palette.scss}
cp ${colors} data/theme/gnome-shell-sass/_colors.scss
'';