From c09bdb5d5e33925962b8dfbed4213f459ea3b536 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Mon, 15 Jul 2024 23:25:23 +0800 Subject: [PATCH] mint-cursor-themes: Move from cinnamon scope to top-level --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++-- .../default.nix => by-name/mi/mint-cursor-themes/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/cinnamon/mint-cursor-themes/default.nix => by-name/mi/mint-cursor-themes/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 316cbd3ceb2e..16a910152930 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -74,9 +74,9 @@ in name = mkDefault "Mint-Y-Sand"; package = mkDefault pkgs.cinnamon.mint-y-icons; }; - cursorTheme = mkIf (notExcluded pkgs.cinnamon.mint-cursor-themes) { + cursorTheme = mkIf (notExcluded pkgs.mint-cursor-themes) { name = mkDefault "Bibata-Modern-Classic"; - package = mkDefault pkgs.cinnamon.mint-cursor-themes; + package = mkDefault pkgs.mint-cursor-themes; }; }; diff --git a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix b/pkgs/by-name/mi/mint-cursor-themes/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/mint-cursor-themes/default.nix rename to pkgs/by-name/mi/mint-cursor-themes/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 6e0133808e11..bf12705fc7e8 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -37,7 +37,6 @@ lib.makeScope pkgs.newScope (self: with self; { nemo-fileroller = callPackage ./nemo-extensions/nemo-fileroller { }; nemo-python = callPackage ./nemo-extensions/nemo-python { }; nemo-with-extensions = callPackage ./nemo/wrapper.nix { }; - mint-cursor-themes = callPackage ./mint-cursor-themes { }; mint-l-icons = callPackage ./mint-l-icons { }; mint-l-theme = callPackage ./mint-l-theme { }; mint-themes = callPackage ./mint-themes { }; @@ -50,6 +49,7 @@ lib.makeScope pkgs.newScope (self: with self; { bulky = lib.warn "cinnamon.bulky was moved to top-level. Please use pkgs.bulky directly." pkgs.bulky; # Added on 2024-07-14 folder-color-switcher = lib.warn "cinnamon.folder-color-switcher was moved to top-level. Please use pkgs.folder-color-switcher directly." pkgs.folder-color-switcher; # Added on 2024-07-14 mint-artwork = lib.warn "cinnamon.mint-artwork was moved to top-level. Please use pkgs.mint-artwork directly." pkgs.mint-artwork; # Added on 2024-07-14 + mint-cursor-themes = lib.warn "cinnamon.mint-cursor-themes was moved to top-level. Please use pkgs.mint-cursor-themes directly." pkgs.mint-cursor-themes; # Added on 2024-07-14 pix = lib.warn "cinnamon.pix was moved to top-level. Please use pkgs.pix directly." pkgs.pix; # Added on 2024-07-14 warpinator = lib.warn "cinnamon.warpinator was moved to top-level. Please use pkgs.warpinator directly." pkgs.warpinator; # Added on 2024-07-14 xapps = pkgs.cinnamon.xapp; # added 2022-07-27