From 9bfabc5a06a13cf02fda8a5b3bddb2aef86e5862 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 12 Jul 2024 19:06:37 -0400 Subject: [PATCH] budgie-desktop-view: move from budgie scope to top-level --- nixos/modules/services/x11/desktop-managers/budgie.nix | 4 ++-- .../bu/budgie-desktop-view/package.nix} | 0 pkgs/desktops/budgie/default.nix | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{desktops/budgie/budgie-desktop-view/default.nix => by-name/bu/budgie-desktop-view/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 777ae096fc81..64ef6e4f4b30 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -104,7 +104,7 @@ in { cursorTheme = mkDefault { name = "Qogir"; package = pkgs.qogir-icon-theme; }; }; - services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie.budgie-desktop-view ]; + services.xserver.desktopManager.budgie.sessionPath = [ pkgs.budgie-desktop-view ]; environment.extraInit = '' ${concatMapStrings (p: '' @@ -124,7 +124,7 @@ in { budgie-backgrounds budgie-control-center' (budgie-desktop-with-plugins.override { plugins = cfg.extraPlugins; }) - budgie.budgie-desktop-view + budgie-desktop-view budgie.budgie-screensaver budgie.budgie-session diff --git a/pkgs/desktops/budgie/budgie-desktop-view/default.nix b/pkgs/by-name/bu/budgie-desktop-view/package.nix similarity index 100% rename from pkgs/desktops/budgie/budgie-desktop-view/default.nix rename to pkgs/by-name/bu/budgie-desktop-view/package.nix diff --git a/pkgs/desktops/budgie/default.nix b/pkgs/desktops/budgie/default.nix index 033db368e653..3561dce0b61e 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-desktop-view = callPackage ./budgie-desktop-view { }; budgie-gsettings-overrides = callPackage ./budgie-gsettings-overrides { }; budgie-screensaver = callPackage ./budgie-screensaver { }; budgie-session = callPackage ./budgie-session { };