From 51bfa7985c4a2a5822e8e2e2887533c05cfc705f Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:10:49 -0400 Subject: [PATCH] budgie-gsettings-override: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 2 +- .../bu/budgie-gsettings-overrides/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{desktops/budgie/budgie-gsettings-overrides/default.nix => by-name/bu/budgie-gsettings-overrides/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 64ef6e4f4b30..38c4142bc8a1 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -8,7 +8,7 @@ let nixos-background-light = pkgs.nixos-artwork.wallpapers.nineish; nixos-background-dark = pkgs.nixos-artwork.wallpapers.nineish-dark-gray; - nixos-gsettings-overrides = pkgs.budgie.budgie-gsettings-overrides.override { + nixos-gsettings-overrides = pkgs.budgie-gsettings-overrides.override { inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages; inherit nixos-background-dark nixos-background-light; }; diff --git a/pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-gsettings-overrides/default.nix rename to pkgs/by-name/bu/budgie-gsettings-overrides/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 3561dce0b61e..80def65811a9 100644 --- a/pkgs/desktops/budgie/default.nix +++ b/pkgs/desktops/budgie/default.nix @@ -6,7 +6,6 @@ lib.makeScope newScope ( inherit (self) callPackage; in { - budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { }; magpie = callPackage ./magpie { };