commit ea11a3977f4cba013d8680667616be827c967ac0 · pyrox.dev/nixpkgs

+12 -6

nixos/modules/services/x11/desktop-managers/budgie.nix

···

       45
       45
        
             enable = mkEnableOption (mdDoc "the Budgie desktop");

     

       46
       46
        
       

     

       47
       47
        
             sessionPath = mkOption {

     

       48
       48
       -
               description = mdDoc "Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart.";

     

       49
       49
       -
               type = with types; listOf package;

     

       50
       50
       -
               example = literalExpression "[ pkgs.budgie.budgie-desktop-view ]";

     

       48
       48
       +
               description = lib.mdDoc ''

     

       49
       49
       +
                 Additional list of packages to be added to the session search path.

     

       50
       50
       +
                 Useful for GSettings-conditional autostart.

     

       51
       51
       +
       

     

       52
       52
       +
                 Note that this should be a last resort; patching the package is preferred (see GPaste).

     

       53
       53
       +
               '';

     

       54
       54
       +
               type = types.listOf types.package;

     

       51
       55
        
               default = [];

     

       56
       56
       +
               example = literalExpression "[ pkgs.gnome.gpaste ]";

     

       52
       57
        
             };

     

       53
       58
        
       

     

       54
       59
        
             extraGSettingsOverrides = mkOption {

     
···

       59
       64
        
       

     

       60
       65
        
             extraGSettingsOverridePackages = mkOption {

     

       61
       66
        
               description = mdDoc "List of packages for which GSettings are overridden.";

     

       62
       62
       -
               type = with types; listOf path;

     

       67
       67
       +
               type = types.listOf types.path;

     

       63
       68
        
               default = [];

     

       64
       69
        
             };

     

       65
       70
        
       

     

       66
       71
        
             extraPlugins = mkOption {

     

       67
       72
        
               description = mdDoc "Extra plugins for the Budgie desktop";

     

       68
       68
       -
               type = with types; listOf package;

     

       73
       73
       +
               type = types.listOf types.package;

     

       69
       74
        
               default = [];

     

       75
       75
       +
               example = literalExpression "[ pkgs.budgiePlugins.budgie-analogue-clock-applet ]";

     

       70
       76
        
             };

     

       71
       77
        
           };

     

       72
       78
        
       

     

       73
       79
        
           environment.budgie.excludePackages = mkOption {

     

       74
       80
        
             description = mdDoc "Which packages Budgie should exclude from the default environment.";

     

       75
       75
       -
             type = with types; listOf package;

     

       81
       81
       +
             type = types.listOf types.package;

     

       76
       82
        
             default = [];

     

       77
       83
        
             example = literalExpression "[ pkgs.mate-terminal ]";

     

       78
       84
        
           };

+1 -1

nixos/tests/budgie.nix

···

       23
       23
        
           services.xserver.desktopManager.budgie = {

     

       24
       24
        
             enable = true;

     

       25
       25
        
             extraPlugins = [

     

       26
       26
       -
               pkgs.budgie.budgie-analogue-clock-applet

     

       26
       26
       +
               pkgs.budgiePlugins.budgie-analogue-clock-applet

     

       27
       27
        
             ];

     

       28
       28
        
           };

     

       29
       29
        
         };

+2 -2

pkgs/desktops/budgie/budgie-analogue-clock-applet/default.nix pkgs/desktops/budgie/plugins/budgie-analogue-clock-applet/default.nix

···

       5
       5
        
       , ninja

     

       6
       6
        
       , pkg-config

     

       7
       7
        
       , vala

     

       8
       8
       -
       , budgie-desktop

     

       8
       8
       +
       , budgie

     

       9
       9
        
       , gtk3

     

       10
       10
        
       , libpeas

     

       11
       11
        
       }:

     
···

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         buildInputs = [

     

       32
       32
       -
           budgie-desktop

     

       32
       32
       +
           budgie.budgie-desktop

     

       33
       33
        
           gtk3

     

       34
       34
        
           libpeas

     

       35
       35
        
         ];

-1

pkgs/desktops/budgie/default.nix

···

       1
       1
        
       { lib, pkgs }:

     

       2
       2
        
       

     

       3
       3
        
       lib.makeScope pkgs.newScope (self: with self; {

     

       4
       4
       -
         budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };

     

       5
       4
        
         budgie-backgrounds = callPackage ./budgie-backgrounds { };

     

       6
       5
        
         budgie-control-center = callPackage ./budgie-control-center { };

     

       7
       6
        
         budgie-desktop = callPackage ./budgie-desktop { };

+53

pkgs/desktops/budgie/plugins/budgie-user-indicator-redux/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , accountsservice

     

       5
       5
       +
       , budgie

     

       6
       6
       +
       , gtk3

     

       7
       7
       +
       , intltool

     

       8
       8
       +
       , libgee

     

       9
       9
       +
       , libpeas

     

       10
       10
       +
       , meson

     

       11
       11
       +
       , ninja

     

       12
       12
       +
       , pkg-config

     

       13
       13
       +
       , sassc

     

       14
       14
       +
       , vala

     

       15
       15
       +
       }:

     

       16
       16
       +
       

     

       17
       17
       +
       stdenv.mkDerivation rec {

     

       18
       18
       +
         pname = "budgie-user-indicator-redux";

     

       19
       19
       +
         version = "1.0.1";

     

       20
       20
       +
       

     

       21
       21
       +
         src = fetchFromGitHub {

     

       22
       22
       +
           owner = "EbonJaeger";

     

       23
       23
       +
           repo = "budgie-user-indicator-redux";

     

       24
       24
       +
           rev = "v${version}";

     

       25
       25
       +
           hash = "sha256-HGfcNlkIQD9nNzHm97LpNz3smYwDhxu4EArPo6msahI=";

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [

     

       29
       29
       +
           intltool

     

       30
       30
       +
           meson

     

       31
       31
       +
           ninja

     

       32
       32
       +
           pkg-config

     

       33
       33
       +
           vala

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         buildInputs = [

     

       37
       37
       +
           accountsservice

     

       38
       38
       +
           budgie.budgie-desktop

     

       39
       39
       +
           gtk3

     

       40
       40
       +
           libgee

     

       41
       41
       +
           libpeas

     

       42
       42
       +
           sassc

     

       43
       43
       +
         ];

     

       44
       44
       +
       

     

       45
       45
       +
         meta = with lib; {

     

       46
       46
       +
           description = "Manage your user session from the Budgie panel";

     

       47
       47
       +
           homepage = "https://github.com/EbonJaeger/budgie-user-indicator-redux";

     

       48
       48
       +
           changelog = "https://github.com/EbonJaeger/budgie-user-indicator-redux/blob/${src.rev}/CHANGELOG.md";

     

       49
       49
       +
           license = licenses.gpl2Plus;

     

       50
       50
       +
           platforms = platforms.linux;

     

       51
       51
       +
           maintainers = [ maintainers.federicoschonborn ];

     

       52
       52
       +
         };

     

       53
       53
       +
       }

+4

pkgs/desktops/budgie/plugins/default.nix

···

       1
       1
       +
       { callPackage }: {

     

       2
       2
       +
         budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { };

     

       3
       3
       +
         budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { };

     

       4
       4
       +
       }

+1

pkgs/top-level/all-packages.nix

···

       37049
       37049
        
         arcanPackages = recurseIntoAttrs (callPackage ../desktops/arcan { });

     

       37050
       37050
        
       

     

       37051
       37051
        
         budgie = recurseIntoAttrs (callPackage ../desktops/budgie { });

     

       37052
       37052
       +
         budgiePlugins = recurseIntoAttrs (callPackage ../desktops/budgie/plugins { });

     

       37052
       37053
        
       

     

       37053
       37054
        
         cdesktopenv = callPackage ../desktops/cdesktopenv { };

     

       37054
       37055