From 3ee415b2922c3cfd3e7c64927a720178d365f513 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Mon, 18 May 2026 14:26:28 -0500 Subject: [PATCH] gnome-shell: use user-themes extension Use the standalone User Themes extension package when enabling GNOME Shell theme support instead of installing the full gnome-shell-extensions package. Closes #9171 --- modules/programs/gnome-shell.nix | 5 ++--- .../programs/gnome-shell/gnome-shell.nix | 21 +++++++++++++------ 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/modules/programs/gnome-shell.nix b/modules/programs/gnome-shell.nix index 8ed84ebba..7e399e90d 100644 --- a/modules/programs/gnome-shell.nix +++ b/modules/programs/gnome-shell.nix @@ -74,7 +74,7 @@ in { package = pkgs.gnomeExtensions.dash-to-panel; } { id = "user-theme@gnome-shell-extensions.gcampax.github.com"; - package = pkgs.gnome-shell-extensions; + package = pkgs.gnomeExtensions.user-themes; } ] ''; @@ -114,8 +114,7 @@ in programs.gnome-shell.extensions = [ { - id = "user-theme@gnome-shell-extensions.gcampax.github.com"; - package = pkgs.gnome-shell-extensions; + package = pkgs.gnomeExtensions.user-themes; } ]; diff --git a/tests/modules/programs/gnome-shell/gnome-shell.nix b/tests/modules/programs/gnome-shell/gnome-shell.nix index d305480c0..308171c02 100644 --- a/tests/modules/programs/gnome-shell/gnome-shell.nix +++ b/tests/modules/programs/gnome-shell/gnome-shell.nix @@ -5,10 +5,15 @@ ... }: let - dummy-gnome-shell-extensions = pkgs.runCommand "dummy-package" { } '' - mkdir -p $out/share/gnome-shell/extensions/dummy-package - touch $out/share/gnome-shell/extensions/dummy-package/test - ''; + dummy-user-themes = + pkgs.runCommand "dummy-user-themes" + { + passthru.extensionUuid = "user-theme@gnome-shell-extensions.gcampax.github.com"; + } + '' + mkdir -p $out/share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com + touch $out/share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/test + ''; test-extension = pkgs.runCommand "test-extension" { } '' mkdir -p $out/share/gnome-shell/extensions/test-extension @@ -43,7 +48,11 @@ let in { nixpkgs.overlays = [ - (_final: _prev: { gnome-shell-extensions = dummy-gnome-shell-extensions; }) + (_final: prev: { + gnomeExtensions = prev.gnomeExtensions // { + user-themes = dummy-user-themes; + }; + }) ]; programs.gnome-shell.enable = true; @@ -82,7 +91,7 @@ in ]; nmt.script = '' - assertFileExists home-path/share/gnome-shell/extensions/dummy-package/test + assertFileExists home-path/share/gnome-shell/extensions/user-theme@gnome-shell-extensions.gcampax.github.com/test assertFileExists home-path/share/gnome-shell/extensions/test-extension/test assertFileExists home-path/share/gnome-shell/extensions/test-extension-uuid/test assertFileExists home-path/share/themes/Test/gnome-shell/test