From 350a70036a1b91a9922b386aeacea6afe84f9347 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 17 Jul 2024 21:24:55 +0800 Subject: [PATCH] mint-themes: Move from cinnamon scope to top-level --- nixos/modules/services/x11/desktop-managers/cinnamon.nix | 4 ++-- .../default.nix => by-name/mi/mint-themes/package.nix} | 0 pkgs/desktops/cinnamon/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/{desktops/cinnamon/mint-themes/default.nix => by-name/mi/mint-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 b21ee008bf20..ae9d096721a1 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -66,9 +66,9 @@ in enable = mkDefault true; # Taken from mint-artwork.gschema.override - theme = mkIf (notExcluded pkgs.cinnamon.mint-themes) { + theme = mkIf (notExcluded pkgs.mint-themes) { name = mkDefault "Mint-Y-Aqua"; - package = mkDefault pkgs.cinnamon.mint-themes; + package = mkDefault pkgs.mint-themes; }; iconTheme = mkIf (notExcluded pkgs.mint-y-icons) { name = mkDefault "Mint-Y-Sand"; diff --git a/pkgs/desktops/cinnamon/mint-themes/default.nix b/pkgs/by-name/mi/mint-themes/package.nix similarity index 100% rename from pkgs/desktops/cinnamon/mint-themes/default.nix rename to pkgs/by-name/mi/mint-themes/package.nix diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 81944bb86ce4..4b0ded586954 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-themes = callPackage ./mint-themes { }; muffin = callPackage ./muffin { }; xapp = callPackage ./xapp { }; }) // lib.optionalAttrs config.allowAliases { @@ -48,6 +47,7 @@ lib.makeScope pkgs.newScope (self: with self; { 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 mint-l-icons = lib.warn "cinnamon.mint-l-icons was moved to top-level. Please use pkgs.mint-l-icons directly." pkgs.mint-l-icons; # Added on 2024-07-14 mint-l-theme = lib.warn "cinnamon.mint-l-theme was moved to top-level. Please use pkgs.mint-l-theme directly." pkgs.mint-l-theme; # Added on 2024-07-14 + mint-themes = lib.warn "cinnamon.mint-themes was moved to top-level. Please use pkgs.mint-themes directly." pkgs.mint-themes; # Added on 2024-07-14 mint-x-icons = lib.warn "cinnamon.mint-x-icons was moved to top-level. Please use pkgs.mint-x-icons directly." pkgs.mint-x-icons; # Added on 2024-07-14 mint-y-icons = lib.warn "cinnamon.mint-y-icons was moved to top-level. Please use pkgs.mint-y-icons directly." pkgs.mint-y-icons; # 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