nixos/mate: Add extraPanelApplets, extraCajaExtensions option

Hopefully this is more user-friendly.

+21 -2
+20
nixos/modules/services/x11/desktop-managers/mate.nix
··· 20 }; 21 22 debug = mkEnableOption (lib.mdDoc "mate-session debug messages"); 23 }; 24 25 environment.mate.excludePackages = mkOption { ··· 44 (pkgs.mate.basePackages ++ 45 pkgs.mate.extraPackages ++ 46 [ 47 pkgs.desktop-file-utils 48 pkgs.glib 49 pkgs.gtk3.out
··· 20 }; 21 22 debug = mkEnableOption (lib.mdDoc "mate-session debug messages"); 23 + 24 + extraPanelApplets = mkOption { 25 + default = [ ]; 26 + example = literalExpression "with pkgs.mate; [ mate-applets ]"; 27 + type = types.listOf types.package; 28 + description = lib.mdDoc "Extra applets to add to mate-panel."; 29 + }; 30 + 31 + extraCajaExtensions = mkOption { 32 + default = [ ]; 33 + example = lib.literalExpression "with pkgs.mate; [ caja-extensions ]"; 34 + type = types.listOf types.package; 35 + description = lib.mdDoc "Extra extensions to add to caja."; 36 + }; 37 }; 38 39 environment.mate.excludePackages = mkOption { ··· 58 (pkgs.mate.basePackages ++ 59 pkgs.mate.extraPackages ++ 60 [ 61 + (pkgs.mate.caja-with-extensions.override { 62 + extensions = cfg.extraCajaExtensions; 63 + }) 64 + (pkgs.mate.mate-panel-with-applets.override { 65 + applets = cfg.extraPanelApplets; 66 + }) 67 pkgs.desktop-file-utils 68 pkgs.glib 69 pkgs.gtk3.out
+1 -2
pkgs/desktops/mate/default.nix
··· 54 pluma = callPackage ./pluma { }; 55 python-caja = callPackage ./python-caja { }; 56 57 basePackages = [ 58 - caja-with-extensions 59 libmatekbd 60 libmatemixer 61 libmateweather ··· 66 mate-icon-theme 67 mate-menus 68 mate-notification-daemon 69 - mate-panel-with-applets 70 mate-polkit 71 mate-session-manager 72 mate-settings-daemon
··· 54 pluma = callPackage ./pluma { }; 55 python-caja = callPackage ./python-caja { }; 56 57 + # Caja and mate-panel are managed in NixOS module. 58 basePackages = [ 59 libmatekbd 60 libmatemixer 61 libmateweather ··· 66 mate-icon-theme 67 mate-menus 68 mate-notification-daemon 69 mate-polkit 70 mate-session-manager 71 mate-settings-daemon