commit a1b567757b3b4ced04115bb453e3ab16bc159be4 · pyrox.dev/nixpkgs

+3 -1

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

···

       43
       43
        
         budgie-control-center = pkgs.budgie.budgie-control-center.override {

     

       44
       44
        
           enableSshSocket = config.services.openssh.startWhenNeeded;

     

       45
       45
        
         };

     

       46
       46
       +
       

     

       47
       47
       +
         notExcluded = pkg: (!(lib.elem pkg config.environment.budgie.excludePackages));

     

       46
       48
        
       in {

     

       47
       49
        
         meta.maintainers = lib.teams.budgie.members;

     

       48
       50
        
       

     
···

       160
       162
        
             ++ cfg.sessionPath;

     

       161
       163
        
       

     

       162
       164
        
           # Both budgie-desktop-view and nemo defaults to this emulator.

     

       163
       163
       -
           programs.gnome-terminal.enable = mkDefault true;

     

       165
       165
       +
           programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);

     

       164
       166
        
       

     

       165
       167
        
           # Fonts.

     

       166
       168
        
           fonts.packages = [

+5 -5

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

···

       95
       95
        
             '';

     

       96
       96
        
       

     

       97
       97
        
             # Default services

     

       98
       98
       -
             services.blueman.enable = mkDefault true;

     

       98
       98
       +
             services.blueman.enable = mkDefault (notExcluded pkgs.blueman);

     

       99
       99
        
             hardware.bluetooth.enable = mkDefault true;

     

       100
       100
        
             hardware.pulseaudio.enable = mkDefault true;

     

       101
       101
        
             security.polkit.enable = true;

     
···

       228
       228
        
           })

     

       229
       229
        
       

     

       230
       230
        
           (mkIf serviceCfg.apps.enable {

     

       231
       231
       -
             programs.geary.enable = mkDefault true;

     

       232
       232
       -
             programs.gnome-disks.enable = mkDefault true;

     

       233
       233
       -
             programs.gnome-terminal.enable = mkDefault true;

     

       234
       234
       -
             programs.file-roller.enable = mkDefault true;

     

       231
       231
       +
             programs.geary.enable = mkDefault (notExcluded pkgs.gnome.geary);

     

       232
       232
       +
             programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility);

     

       233
       233
       +
             programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal);

     

       234
       234
       +
             programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);

     

       235
       235
        
       

     

       236
       236
        
             environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [

     

       237
       237
        
               # cinnamon team apps

+3 -2

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

···

       12
       12
        
           extraGSettingsOverrides = cfg.extraGSettingsOverrides;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
       +
         notExcluded = pkg: (!(lib.elem pkg config.environment.pantheon.excludePackages));

     

       15
       16
        
       in

     

       16
       17
        
       

     

       17
       18
        
       {

     
···

       288
       289
        
           })

     

       289
       290
        
       

     

       290
       291
        
           (mkIf serviceCfg.apps.enable {

     

       291
       291
       -
             programs.evince.enable = mkDefault true;

     

       292
       292
       -
             programs.file-roller.enable = mkDefault true;

     

       292
       292
       +
             programs.evince.enable = mkDefault (notExcluded pkgs.gnome.evince);

     

       293
       293
       +
             programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller);

     

       293
       294
        
       

     

       294
       295
        
             environment.systemPackages = utils.removePackagesByName ([

     

       295
       296
        
               pkgs.gnome.gnome-font-viewer

+4

nixos/tests/budgie.nix

···

       18
       18
        
             };

     

       19
       19
        
           };

     

       20
       20
        
       

     

       21
       21
       +
           # We don't ship gnome-text-editor in Budgie module, we add this line mainly

     

       22
       22
       +
           # to catch eval issues related to this option.

     

       23
       23
       +
           environment.budgie.excludePackages = [ pkgs.gnome-text-editor ];

     

       24
       24
       +
       

     

       21
       25
        
           services.xserver.desktopManager.budgie = {

     

       22
       26
        
             enable = true;

     

       23
       27
        
             extraPlugins = [

+4

nixos/tests/cinnamon.nix

···

       8
       8
        
           services.xserver.enable = true;

     

       9
       9
        
           services.xserver.desktopManager.cinnamon.enable = true;

     

       10
       10
        
       

     

       11
       11
       +
           # We don't ship gnome-text-editor in Cinnamon module, we add this line mainly

     

       12
       12
       +
           # to catch eval issues related to this option.

     

       13
       13
       +
           environment.cinnamon.excludePackages = [ pkgs.gnome-text-editor ];

     

       14
       14
       +
       

     

       11
       15
        
           # For the sessionPath subtest.

     

       12
       16
        
           services.xserver.desktopManager.cinnamon.sessionPath = [ pkgs.gnome.gpaste ];

     

       13
       17
        
         };

+7

nixos/tests/pantheon.nix

···

       13
       13
        
           services.xserver.enable = true;

     

       14
       14
        
           services.xserver.desktopManager.pantheon.enable = true;

     

       15
       15
        
       

     

       16
       16
       +
           # We ship pantheon.appcenter by default when this is enabled.

     

       17
       17
       +
           services.flatpak.enable = true;

     

       18
       18
       +
       

     

       19
       19
       +
           # We don't ship gnome-text-editor in Pantheon module, we add this line mainly

     

       20
       20
       +
           # to catch eval issues related to this option.

     

       21
       21
       +
           environment.pantheon.excludePackages = [ pkgs.gnome-text-editor ];

     

       22
       22
       +
       

     

       16
       23
        
           environment.systemPackages = [ pkgs.xdotool ];

     

       17
       24
        
         };

     

       18
       25