Merge pull request #231378 from FedericoSchonborn/budgie-plugins
Add `budgiePlugins` set, init `budgie-user-indicator-redux` at 1.0.1
This commit is contained in:
commit
ea11a3977f
|
@ -45,10 +45,15 @@ in {
|
|||
enable = mkEnableOption (mdDoc "the Budgie desktop");
|
||||
|
||||
sessionPath = mkOption {
|
||||
description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";
|
||||
type = with types; listOf package;
|
||||
example = literalExpression "[ pkgs.budgie.budgie-desktop-view ]";
|
||||
description = lib.mdDoc ''
|
||||
Additional list of packages to be added to the session search path.
|
||||
Useful for GSettings-conditional autostart.
|
||||
|
||||
Note that this should be a last resort; patching the package is preferred (see GPaste).
|
||||
'';
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
example = literalExpression "[ pkgs.gnome.gpaste ]";
|
||||
};
|
||||
|
||||
extraGSettingsOverrides = mkOption {
|
||||
|
@ -59,20 +64,21 @@ in {
|
|||
|
||||
extraGSettingsOverridePackages = mkOption {
|
||||
description = mdDoc "List of packages for which GSettings are overridden.";
|
||||
type = with types; listOf path;
|
||||
type = types.listOf types.path;
|
||||
default = [];
|
||||
};
|
||||
|
||||
extraPlugins = mkOption {
|
||||
description = mdDoc "Extra plugins for the Budgie desktop";
|
||||
type = with types; listOf package;
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]";
|
||||
};
|
||||
};
|
||||
|
||||
environment.budgie.excludePackages = mkOption {
|
||||
description = mdDoc "Which packages Budgie should exclude from the default environment.";
|
||||
type = with types; listOf package;
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
example = literalExpression "[ pkgs.mate-terminal ]";
|
||||
};
|
||||
|
|
|
@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
|
|||
services.xserver.desktopManager.budgie = {
|
||||
enable = true;
|
||||
extraPlugins = [
|
||||
pkgs.budgie.budgie-analogue-clock-applet
|
||||
pkgs.budgiePlugins.budgie-analogue-clock-applet
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{ lib, pkgs }:
|
||||
|
||||
lib.makeScope pkgs.newScope (self: with self; {
|
||||
budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
|
||||
budgie-backgrounds = callPackage ./budgie-backgrounds { };
|
||||
budgie-control-center = callPackage ./budgie-control-center { };
|
||||
budgie-desktop = callPackage ./budgie-desktop { };
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, ninja
|
||||
, pkg-config
|
||||
, vala
|
||||
, budgie-desktop
|
||||
, budgie
|
||||
, gtk3
|
||||
, libpeas
|
||||
}:
|
||||
|
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
buildInputs = [
|
||||
budgie-desktop
|
||||
budgie.budgie-desktop
|
||||
gtk3
|
||||
libpeas
|
||||
];
|
|
@ -0,0 +1,53 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, accountsservice
|
||||
, budgie
|
||||
, gtk3
|
||||
, intltool
|
||||
, libgee
|
||||
, libpeas
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, sassc
|
||||
, vala
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "budgie-user-indicator-redux";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "EbonJaeger";
|
||||
repo = "budgie-user-indicator-redux";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HGfcNlkIQD9nNzHm97LpNz3smYwDhxu4EArPo6msahI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
intltool
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
vala
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
accountsservice
|
||||
budgie.budgie-desktop
|
||||
gtk3
|
||||
libgee
|
||||
libpeas
|
||||
sassc
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Manage your user session from the Budgie panel";
|
||||
homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux";
|
||||
changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.federicoschonborn ];
|
||||
};
|
||||
}
|
4
pkgs/desktops/budgie/plugins/default.nix
Normal file
4
pkgs/desktops/budgie/plugins/default.nix
Normal file
|
@ -0,0 +1,4 @@
|
|||
{ callPackage }: {
|
||||
budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };
|
||||
budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };
|
||||
}
|
|
@ -37049,6 +37049,7 @@ with pkgs;
|
|||
arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { });
|
||||
|
||||
budgie = recurseIntoAttrs (callPackage ../desktops/budgie { });
|
||||
budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });
|
||||
|
||||
cdesktopenv = callPackage ../desktops/cdesktopenv { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue