summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2024-07-15 23:25:23 +0800
committerBobby Rong <rjl931189261@126.com>2024-07-15 23:31:18 +0800
commit79e14a0411aff87b1dc4d9f38160a0f17e2f8e1b (patch)
tree52ce6a86455e4d0464d9bb59a590438aa2873708
parentmint-artwork: Move from cinnamon scope to top-level (diff)
downloadnixpkgs-origin/upd/cinnamon-xapps-by-name.tar.gz
mint-cursor-themes: Move from cinnamon scope to top-levelorigin/upd/cinnamon-xapps-by-name
-rw-r--r--nixos/modules/services/x11/desktop-managers/cinnamon.nix4
-rw-r--r--pkgs/by-name/mi/mint-cursor-themes/package.nix (renamed from pkgs/desktops/cinnamon/mint-cursor-themes/default.nix)0
-rw-r--r--pkgs/desktops/cinnamon/default.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix
index 0dc21862d834..cdcbbf14c40b 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
index e0402b2f721b..e0402b2f721b 100644
--- a/pkgs/desktops/cinnamon/mint-cursor-themes/default.nix
+++ b/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