commit 5b2b3b8558e55d618a80526fdfe9af1952321cf1 · pyrox.dev/nixpkgs

+3 -5

nixos/modules/programs/evince.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let cfg = config.programs.evince;

     

       8
       6
        
       

     

       9
       7
        
       in {

     
···

       14
       12
        
       

     

       15
       13
        
           programs.evince = {

     

       16
       14
        
       

     

       17
       17
       -
             enable = mkEnableOption "Evince, the GNOME document viewer";

     

       15
       15
       +
             enable = lib.mkEnableOption "Evince, the GNOME document viewer";

     

       18
       16
        
       

     

       19
       19
       -
             package = mkPackageOption pkgs "evince" { };

     

       17
       17
       +
             package = lib.mkPackageOption pkgs "evince" { };

     

       20
       18
        
       

     

       21
       19
        
           };

     

       22
       20
        
       

     
···

       25
       23
        
       

     

       26
       24
        
         ###### implementation

     

       27
       25
        
       

     

       28
       28
       -
         config = mkIf config.programs.evince.enable {

     

       26
       26
       +
         config = lib.mkIf config.programs.evince.enable {

     

       29
       27
        
       

     

       30
       28
        
           environment.systemPackages = [ cfg.package ];

     

       31
       29

+3 -5

nixos/modules/programs/file-roller.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let cfg = config.programs.file-roller;

     

       8
       6
        
       

     

       9
       7
        
       in {

     
···

       14
       12
        
       

     

       15
       13
        
           programs.file-roller = {

     

       16
       14
        
       

     

       17
       17
       -
             enable = mkEnableOption "File Roller, an archive manager for GNOME";

     

       15
       15
       +
             enable = lib.mkEnableOption "File Roller, an archive manager for GNOME";

     

       18
       16
        
       

     

       19
       19
       -
             package = mkPackageOption pkgs [ "gnome" "file-roller" ] { };

     

       17
       17
       +
             package = lib.mkPackageOption pkgs [ "gnome" "file-roller" ] { };

     

       20
       18
        
       

     

       21
       19
        
           };

     

       22
       20
        
       

     
···

       25
       23
        
       

     

       26
       24
        
         ###### implementation

     

       27
       25
        
       

     

       28
       28
       -
         config = mkIf cfg.enable {

     

       26
       26
       +
         config = lib.mkIf cfg.enable {

     

       29
       27
        
       

     

       30
       28
        
           environment.systemPackages = [ cfg.package ];

     

       31
       29

+4 -6

nixos/modules/programs/gnome-disks.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           programs.gnome-disks = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable GNOME Disks daemon, a program designed to

     
···

       32
       30
        
       

     

       33
       31
        
         ###### implementation

     

       34
       32
        
       

     

       35
       35
       -
         config = mkIf config.programs.gnome-disks.enable {

     

       33
       33
       +
         config = lib.mkIf config.programs.gnome-disks.enable {

     

       36
       34
        
       

     

       37
       35
        
           environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];

     

       38
       36

+3 -5

nixos/modules/programs/gnome-terminal.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let

     

       8
       6
        
       

     

       9
       7
        
         cfg = config.programs.gnome-terminal;

     
···

       13
       11
        
       {

     

       14
       12
        
       

     

       15
       13
        
         meta = {

     

       16
       16
       -
           maintainers = teams.gnome.members;

     

       14
       14
       +
           maintainers = lib.teams.gnome.members;

     

       17
       15
        
         };

     

       18
       16
        
       

     

       19
       17
        
         options = {

     

       20
       20
       -
           programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal";

     

       18
       18
       +
           programs.gnome-terminal.enable = lib.mkEnableOption "GNOME Terminal";

     

       21
       19
        
         };

     

       22
       20
        
       

     

       23
       23
       -
         config = mkIf cfg.enable {

     

       21
       21
       +
         config = lib.mkIf cfg.enable {

     

       24
       22
        
           environment.systemPackages = [ pkgs.gnome.gnome-terminal ];

     

       25
       23
        
           services.dbus.packages = [ pkgs.gnome.gnome-terminal ];

     

       26
       24
        
           systemd.packages = [ pkgs.gnome.gnome-terminal ];

+3 -5

nixos/modules/programs/gpaste.nix

···

       1
       1
        
       # GPaste.

     

       2
       2
        
       { config, lib, pkgs, ... }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       {

     

       7
       5
        
       

     

       8
       6
        
         ###### interface

     

       9
       7
        
         options = {

     

       10
       8
        
            programs.gpaste = {

     

       11
       11
       -
             enable = mkOption {

     

       12
       12
       -
               type = types.bool;

     

       9
       9
       +
             enable = lib.mkOption {

     

       10
       10
       +
               type = lib.types.bool;

     

       13
       11
        
               default = false;

     

       14
       12
        
               description = ''

     

       15
       13
        
                 Whether to enable GPaste, a clipboard manager.

     
···

       19
       17
        
         };

     

       20
       18
        
       

     

       21
       19
        
         ###### implementation

     

       22
       22
       -
         config = mkIf config.programs.gpaste.enable {

     

       20
       20
       +
         config = lib.mkIf config.programs.gpaste.enable {

     

       23
       21
        
           environment.systemPackages = [ pkgs.gnome.gpaste ];

     

       24
       22
        
           services.dbus.packages = [ pkgs.gnome.gpaste ];

     

       25
       23
        
           systemd.packages = [ pkgs.gnome.gpaste ];

+3 -5

nixos/modules/programs/seahorse.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         ###### interface

     
···

       12
       10
        
       

     

       13
       11
        
           programs.seahorse = {

     

       14
       12
        
       

     

       15
       15
       -
             enable = mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";

     

       13
       13
       +
             enable = lib.mkEnableOption "Seahorse, a GNOME application for managing encryption keys and passwords in the GNOME Keyring";

     

       16
       14
        
       

     

       17
       15
        
           };

     

       18
       16
        
       

     
···

       21
       19
        
       

     

       22
       20
        
         ###### implementation

     

       23
       21
        
       

     

       24
       24
       -
         config = mkIf config.programs.seahorse.enable {

     

       22
       22
       +
         config = lib.mkIf config.programs.seahorse.enable {

     

       25
       23
        
       

     

       26
       26
       -
           programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";

     

       24
       24
       +
           programs.ssh.askPassword = lib.mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";

     

       27
       25
        
       

     

       28
       26
        
           environment.systemPackages = [

     

       29
       27
        
             pkgs.gnome.seahorse

+6 -8

nixos/modules/services/desktops/gnome/at-spi2-core.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, lib, pkgs, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       15
       13
        
       

     

       16
       14
        
           services.gnome.at-spi2-core = {

     

       17
       15
        
       

     

       18
       18
       -
             enable = mkOption {

     

       19
       19
       -
               type = types.bool;

     

       16
       16
       +
             enable = lib.mkOption {

     

       17
       17
       +
               type = lib.types.bool;

     

       20
       18
        
               default = false;

     

       21
       19
        
               description = ''

     

       22
       20
        
                 Whether to enable at-spi2-core, a service for the Assistive Technologies

     
···

       34
       32
        
       

     

       35
       33
        
         ###### implementation

     

       36
       34
        
       

     

       37
       37
       -
         config = mkMerge [

     

       38
       38
       -
           (mkIf config.services.gnome.at-spi2-core.enable {

     

       35
       35
       +
         config = lib.mkMerge [

     

       36
       36
       +
           (lib.mkIf config.services.gnome.at-spi2-core.enable {

     

       39
       37
        
             environment.systemPackages = [ pkgs.at-spi2-core ];

     

       40
       38
        
             services.dbus.packages = [ pkgs.at-spi2-core ];

     

       41
       39
        
             systemd.packages = [ pkgs.at-spi2-core ];

     

       42
       40
        
           })

     

       43
       41
        
       

     

       44
       44
       -
           (mkIf (!config.services.gnome.at-spi2-core.enable) {

     

       42
       42
       +
           (lib.mkIf (!config.services.gnome.at-spi2-core.enable) {

     

       45
       43
        
             environment.sessionVariables = {

     

       46
       44
        
               NO_AT_BRIDGE = "1";

     

       47
       45
        
               GTK_A11Y = "none";

+11 -13

nixos/modules/services/desktops/gnome/evolution-data-server.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, lib, pkgs, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       15
       13
        
         options = {

     

       16
       14
        
       

     

       17
       15
        
           services.gnome.evolution-data-server = {

     

       18
       18
       -
             enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars";

     

       19
       19
       -
             plugins = mkOption {

     

       20
       20
       -
               type = types.listOf types.package;

     

       16
       16
       +
             enable = lib.mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars";

     

       17
       17
       +
             plugins = lib.mkOption {

     

       18
       18
       +
               type = lib.types.listOf lib.types.package;

     

       21
       19
        
               default = [ ];

     

       22
       20
        
               description = "Plugins for Evolution Data Server.";

     

       23
       21
        
             };

     

       24
       22
        
           };

     

       25
       23
        
           programs.evolution = {

     

       26
       26
       -
             enable = mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality";

     

       27
       27
       -
             plugins = mkOption {

     

       28
       28
       -
               type = types.listOf types.package;

     

       24
       24
       +
             enable = lib.mkEnableOption "Evolution, a Personal information management application that provides integrated mail, calendaring and address book functionality";

     

       25
       25
       +
             plugins = lib.mkOption {

     

       26
       26
       +
               type = lib.types.listOf lib.types.package;

     

       29
       27
        
               default = [ ];

     

       30
       30
       -
               example = literalExpression "[ pkgs.evolution-ews ]";

     

       28
       28
       +
               example = lib.literalExpression "[ pkgs.evolution-ews ]";

     

       31
       29
        
               description = "Plugins for Evolution.";

     

       32
       30
        
             };

     

       33
       31
        
       

     
···

       40
       38
        
           let

     

       41
       39
        
             bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; };

     

       42
       40
        
           in

     

       43
       43
       -
           mkMerge [

     

       44
       44
       -
             (mkIf config.services.gnome.evolution-data-server.enable {

     

       41
       41
       +
           lib.mkMerge [

     

       42
       42
       +
             (lib.mkIf config.services.gnome.evolution-data-server.enable {

     

       45
       43
        
               environment.systemPackages = [ bundle ];

     

       46
       44
        
       

     

       47
       45
        
               services.dbus.packages = [ bundle ];

     

       48
       46
        
       

     

       49
       47
        
               systemd.packages = [ bundle ];

     

       50
       48
        
             })

     

       51
       51
       -
             (mkIf config.programs.evolution.enable {

     

       49
       49
       +
             (lib.mkIf config.programs.evolution.enable {

     

       52
       50
        
               services.gnome.evolution-data-server = {

     

       53
       51
        
                 enable = true;

     

       54
       52
        
                 plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins;

+3 -5

nixos/modules/services/desktops/gnome/glib-networking.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.glib-networking = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkEnableOption "network extensions for GLib";

     

       17
       17
       +
             enable = lib.mkEnableOption "network extensions for GLib";

     

       20
       18
        
       

     

       21
       19
        
           };

     

       22
       20
        
       

     
···

       24
       22
        
       

     

       25
       23
        
         ###### implementation

     

       26
       24
        
       

     

       27
       27
       -
         config = mkIf config.services.gnome.glib-networking.enable {

     

       25
       25
       +
         config = lib.mkIf config.services.gnome.glib-networking.enable {

     

       28
       26
        
       

     

       29
       27
        
           services.dbus.packages = [ pkgs.glib-networking ];

     

       30
       28

+4 -6

nixos/modules/services/desktops/gnome/gnome-initial-setup.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let

     

       8
       6
        
       

     

       9
       7
        
         # GNOME initial setup's run is conditioned on whether

     
···

       45
       43
        
       {

     

       46
       44
        
       

     

       47
       45
        
         meta = {

     

       48
       48
       -
           maintainers = teams.gnome.members;

     

       46
       46
       +
           maintainers = lib.teams.gnome.members;

     

       49
       47
        
         };

     

       50
       48
        
       

     

       51
       49
        
         ###### interface

     
···

       54
       52
        
       

     

       55
       53
        
           services.gnome.gnome-initial-setup = {

     

       56
       54
        
       

     

       57
       57
       -
             enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";

     

       55
       55
       +
             enable = lib.mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system";

     

       58
       56
        
       

     

       59
       57
        
           };

     

       60
       58
        
       

     
···

       63
       61
        
       

     

       64
       62
        
         ###### implementation

     

       65
       63
        
       

     

       66
       66
       -
         config = mkIf config.services.gnome.gnome-initial-setup.enable {

     

       64
       64
       +
         config = lib.mkIf config.services.gnome.gnome-initial-setup.enable {

     

       67
       65
        
       

     

       68
       66
        
           environment.systemPackages = [

     

       69
       67
        
             pkgs.gnome.gnome-initial-setup

     

       70
       68
        
           ]

     

       71
       71
       -
           ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart

     

       69
       69
       +
           ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart

     

       72
       70
        
           ;

     

       73
       71
        
       

     

       74
       72
        
           systemd.packages = [

+4 -6

nixos/modules/services/desktops/gnome/gnome-keyring.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.gnome-keyring = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable GNOME Keyring daemon, a service designed to

     
···

       33
       31
        
       

     

       34
       32
        
         ###### implementation

     

       35
       33
        
       

     

       36
       36
       -
         config = mkIf config.services.gnome.gnome-keyring.enable {

     

       34
       34
       +
         config = lib.mkIf config.services.gnome.gnome-keyring.enable {

     

       37
       35
        
       

     

       38
       36
        
           environment.systemPackages = [ pkgs.gnome.gnome-keyring ];

     

       39
       37

+4 -6

nixos/modules/services/desktops/gnome/gnome-online-accounts.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.gnome-online-accounts = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable GNOME Online Accounts daemon, a service that provides

     
···

       32
       30
        
       

     

       33
       31
        
         ###### implementation

     

       34
       32
        
       

     

       35
       35
       -
         config = mkIf config.services.gnome.gnome-online-accounts.enable {

     

       33
       33
       +
         config = lib.mkIf config.services.gnome.gnome-online-accounts.enable {

     

       36
       34
        
       

     

       37
       35
        
           environment.systemPackages = [ pkgs.gnome-online-accounts ];

     

       38
       36

+4 -6

nixos/modules/services/desktops/gnome/gnome-online-miners.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.gnome-online-miners = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable GNOME Online Miners, a service that

     
···

       32
       30
        
       

     

       33
       31
        
         ###### implementation

     

       34
       32
        
       

     

       35
       35
       -
         config = mkIf config.services.gnome.gnome-online-miners.enable {

     

       33
       33
       +
         config = lib.mkIf config.services.gnome.gnome-online-miners.enable {

     

       36
       34
        
       

     

       37
       35
        
           environment.systemPackages = [ pkgs.gnome.gnome-online-miners ];

     

       38
       36

+3 -5

nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix

···

       1
       1
        
       # Remote desktop daemon using Pipewire.

     

       2
       2
        
       { config, lib, pkgs, ... }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       {

     

       7
       5
        
         meta = {

     

       8
       8
       -
           maintainers = teams.gnome.members;

     

       6
       6
       +
           maintainers = lib.teams.gnome.members;

     

       9
       7
        
         };

     

       10
       8
        
       

     

       11
       9
        
         ###### interface

     

       12
       10
        
         options = {

     

       13
       11
        
           services.gnome.gnome-remote-desktop = {

     

       14
       14
       -
             enable = mkEnableOption "Remote Desktop support using Pipewire";

     

       12
       12
       +
             enable = lib.mkEnableOption "Remote Desktop support using Pipewire";

     

       15
       13
        
           };

     

       16
       14
        
         };

     

       17
       15
        
       

     

       18
       16
        
         ###### implementation

     

       19
       19
       -
         config = mkIf config.services.gnome.gnome-remote-desktop.enable {

     

       17
       17
       +
         config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable {

     

       20
       18
        
           services.pipewire.enable = true;

     

       21
       19
        
       

     

       22
       20
        
           systemd.packages = [ pkgs.gnome.gnome-remote-desktop ];

+3 -5

nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, lib, pkgs, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let

     

       8
       6
        
       

     

       9
       7
        
         cfg = config.services.gnome.gnome-settings-daemon;

     
···

       13
       11
        
       {

     

       14
       12
        
       

     

       15
       13
        
         meta = {

     

       16
       16
       -
           maintainers = teams.gnome.members;

     

       14
       14
       +
           maintainers = lib.teams.gnome.members;

     

       17
       15
        
         };

     

       18
       16
        
       

     

       19
       17
        
         ###### interface

     
···

       22
       20
        
       

     

       23
       21
        
           services.gnome.gnome-settings-daemon = {

     

       24
       22
        
       

     

       25
       25
       -
             enable = mkEnableOption "GNOME Settings Daemon";

     

       23
       23
       +
             enable = lib.mkEnableOption "GNOME Settings Daemon";

     

       26
       24
        
       

     

       27
       25
        
           };

     

       28
       26
        
       

     
···

       31
       29
        
       

     

       32
       30
        
         ###### implementation

     

       33
       31
        
       

     

       34
       34
       -
         config = mkIf cfg.enable {

     

       32
       32
       +
         config = lib.mkIf cfg.enable {

     

       35
       33
        
       

     

       36
       34
        
           environment.systemPackages = [

     

       37
       35
        
             pkgs.gnome.gnome-settings-daemon

+3 -5

nixos/modules/services/desktops/gnome/gnome-user-share.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.gnome-user-share = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";

     

       17
       17
       +
             enable = lib.mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME";

     

       20
       18
        
       

     

       21
       19
        
           };

     

       22
       20
        
       

     
···

       25
       23
        
       

     

       26
       24
        
         ###### implementation

     

       27
       25
        
       

     

       28
       28
       -
         config = mkIf config.services.gnome.gnome-user-share.enable {

     

       26
       26
       +
         config = lib.mkIf config.services.gnome.gnome-user-share.enable {

     

       29
       27
        
       

     

       30
       28
        
           environment.systemPackages = [

     

       31
       29
        
             pkgs.gnome.gnome-user-share

+4 -6

nixos/modules/services/desktops/gnome/rygel.nix

···

       1
       1
        
       # rygel service.

     

       2
       2
        
       { config, lib, pkgs, ... }:

     

       3
       3
        
       

     

       4
       4
       -
       with lib;

     

       5
       5
       -
       

     

       6
       4
        
       {

     

       7
       5
        
         meta = {

     

       8
       8
       -
           maintainers = teams.gnome.members;

     

       6
       6
       +
           maintainers = lib.teams.gnome.members;

     

       9
       7
        
         };

     

       10
       8
        
       

     

       11
       9
        
         ###### interface

     

       12
       10
        
         options = {

     

       13
       11
        
           services.gnome.rygel = {

     

       14
       14
       -
             enable = mkOption {

     

       12
       12
       +
             enable = lib.mkOption {

     

       15
       13
        
               default = false;

     

       16
       14
        
               description = ''

     

       17
       15
        
                 Whether to enable Rygel UPnP Mediaserver.

     

       18
       16
        
       

     

       19
       17
        
                 You will need to also allow UPnP connections in firewall, see the following [comment](https://github.com/NixOS/nixpkgs/pull/45045#issuecomment-416030795).

     

       20
       18
        
               '';

     

       21
       21
       -
               type = types.bool;

     

       19
       19
       +
               type = lib.types.bool;

     

       22
       20
        
             };

     

       23
       21
        
           };

     

       24
       22
        
         };

     

       25
       23
        
       

     

       26
       24
        
         ###### implementation

     

       27
       27
       -
         config = mkIf config.services.gnome.rygel.enable {

     

       25
       25
       +
         config = lib.mkIf config.services.gnome.rygel.enable {

     

       28
       26
        
           environment.systemPackages = [ pkgs.gnome.rygel ];

     

       29
       27
        
       

     

       30
       28
        
           services.dbus.packages = [ pkgs.gnome.rygel ];

+4 -6

nixos/modules/services/desktops/gnome/sushi.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, lib, pkgs, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.sushi = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable Sushi, a quick previewer for nautilus.

     
···

       31
       29
        
       

     

       32
       30
        
         ###### implementation

     

       33
       31
        
       

     

       34
       34
       -
         config = mkIf config.services.gnome.sushi.enable {

     

       32
       32
       +
         config = lib.mkIf config.services.gnome.sushi.enable {

     

       35
       33
        
       

     

       36
       34
        
           environment.systemPackages = [ pkgs.gnome.sushi ];

     

       37
       35

+4 -6

nixos/modules/services/desktops/gnome/tracker-miners.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       {

     

       8
       6
        
       

     

       9
       7
        
         meta = {

     

       10
       10
       -
           maintainers = teams.gnome.members;

     

       8
       8
       +
           maintainers = lib.teams.gnome.members;

     

       11
       9
        
         };

     

       12
       10
        
       

     

       13
       11
        
         ###### interface

     
···

       16
       14
        
       

     

       17
       15
        
           services.gnome.tracker-miners = {

     

       18
       16
        
       

     

       19
       19
       -
             enable = mkOption {

     

       20
       20
       -
               type = types.bool;

     

       17
       17
       +
             enable = lib.mkOption {

     

       18
       18
       +
               type = lib.types.bool;

     

       21
       19
        
               default = false;

     

       22
       20
        
               description = ''

     

       23
       21
        
                 Whether to enable Tracker miners, indexing services for Tracker

     
···

       31
       29
        
       

     

       32
       30
        
         ###### implementation

     

       33
       31
        
       

     

       34
       34
       -
         config = mkIf config.services.gnome.tracker-miners.enable {

     

       32
       32
       +
         config = lib.mkIf config.services.gnome.tracker-miners.enable {

     

       35
       33
        
       

     

       36
       34
        
           environment.systemPackages = [ pkgs.tracker-miners ];

     

       37
       35

+6 -8

nixos/modules/services/desktops/gnome/tracker.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, pkgs, lib, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let

     

       8
       6
        
         cfg = config.services.gnome.tracker;

     

       9
       7
        
       in

     

       10
       8
        
       {

     

       11
       9
        
       

     

       12
       10
        
         meta = {

     

       13
       13
       -
           maintainers = teams.gnome.members;

     

       11
       11
       +
           maintainers = lib.teams.gnome.members;

     

       14
       12
        
         };

     

       15
       13
        
       

     

       16
       14
        
         ###### interface

     
···

       19
       17
        
       

     

       20
       18
        
           services.gnome.tracker = {

     

       21
       19
        
       

     

       22
       22
       -
             enable = mkOption {

     

       23
       23
       -
               type = types.bool;

     

       20
       20
       +
             enable = lib.mkOption {

     

       21
       21
       +
               type = lib.types.bool;

     

       24
       22
        
               default = false;

     

       25
       23
        
               description = ''

     

       26
       24
        
                 Whether to enable Tracker services, a search engine,

     
···

       28
       26
        
               '';

     

       29
       27
        
             };

     

       30
       28
        
       

     

       31
       31
       -
             subcommandPackages = mkOption {

     

       32
       32
       -
               type = types.listOf types.package;

     

       29
       29
       +
             subcommandPackages = lib.mkOption {

     

       30
       30
       +
               type = lib.types.listOf lib.types.package;

     

       33
       31
        
               default = [ ];

     

       34
       32
        
               internal = true;

     

       35
       33
        
               description = ''

     
···

       44
       42
        
       

     

       45
       43
        
         ###### implementation

     

       46
       44
        
       

     

       47
       47
       -
         config = mkIf cfg.enable {

     

       45
       45
       +
         config = lib.mkIf cfg.enable {

     

       48
       46
        
       

     

       49
       47
        
           environment.systemPackages = [ pkgs.tracker ];

     

       50
       48

+4 -6

nixos/modules/services/desktops/gvfs.nix

···

       2
       2
        
       

     

       3
       3
        
       { config, lib, pkgs, ... }:

     

       4
       4
        
       

     

       5
       5
       -
       with lib;

     

       6
       6
       -
       

     

       7
       5
        
       let

     

       8
       6
        
       

     

       9
       7
        
         cfg = config.services.gvfs;

     
···

       13
       11
        
       {

     

       14
       12
        
       

     

       15
       13
        
         meta = {

     

       16
       16
       -
           maintainers = teams.gnome.members;

     

       14
       14
       +
           maintainers = lib.teams.gnome.members;

     

       17
       15
        
         };

     

       18
       16
        
       

     

       19
       17
        
         ###### interface

     
···

       22
       20
        
       

     

       23
       21
        
           services.gvfs = {

     

       24
       22
        
       

     

       25
       25
       -
             enable = mkEnableOption "GVfs, a userspace virtual filesystem";

     

       23
       23
       +
             enable = lib.mkEnableOption "GVfs, a userspace virtual filesystem";

     

       26
       24
        
       

     

       27
       25
        
             # gvfs can be built with multiple configurations

     

       28
       28
       -
             package = mkPackageOption pkgs [ "gnome" "gvfs" ] { };

     

       26
       26
       +
             package = lib.mkPackageOption pkgs [ "gnome" "gvfs" ] { };

     

       29
       27
        
       

     

       30
       28
        
           };

     

       31
       29
        
       

     
···

       34
       32
        
       

     

       35
       33
        
         ###### implementation

     

       36
       34
        
       

     

       37
       37
       -
         config = mkIf cfg.enable {

     

       35
       35
       +
         config = lib.mkIf cfg.enable {

     

       38
       36
        
       

     

       39
       37
        
           environment.systemPackages = [ cfg.package ];

     

       40
       38

+16 -17

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

···

       1
       1
        
       { config, lib, pkgs, utils, ... }:

     

       2
       2
        
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       3
        
       let

     

       4
       4
       +
         inherit (lib) mkOption types mkDefault mkEnableOption literalExpression;

     

       6
       5
        
       

     

       7
       6
        
         cfg = config.services.xserver.desktopManager.gnome;

     

       8
       7
        
         serviceCfg = config.services.gnome;

     
···

       51
       50
        
           destination = "/share/gnome-background-properties/nixos.xml";

     

       52
       51
        
         };

     

       53
       52
        
       

     

       54
       54
       -
         flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;

     

       55
       55
       -
         flashbackWms = optional cfg.flashback.enableMetacity {

     

       53
       53
       +
         flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0;

     

       54
       54
       +
         flashbackWms = lib.optional cfg.flashback.enableMetacity {

     

       56
       55
        
           wmName = "metacity";

     

       57
       56
        
           wmLabel = "Metacity";

     

       58
       57
        
           wmCommand = "${pkgs.gnome.metacity}/bin/metacity";

     
···

       67
       66
        
       

     

       68
       67
        
         meta = {

     

       69
       68
        
           doc = ./gnome.md;

     

       70
       70
       -
           maintainers = teams.gnome.members;

     

       69
       69
       +
           maintainers = lib.teams.gnome.members;

     

       71
       70
        
         };

     

       72
       71
        
       

     

       73
       72
        
         options = {

     
···

       184
       183
        
       

     

       185
       184
        
         };

     

       186
       185
        
       

     

       187
       187
       -
         config = mkMerge [

     

       188
       188
       -
           (mkIf (cfg.enable || flashbackEnabled) {

     

       186
       186
       +
         config = lib.mkMerge [

     

       187
       187
       +
           (lib.mkIf (cfg.enable || flashbackEnabled) {

     

       189
       188
        
             # Seed our configuration into nixos-generate-config

     

       190
       189
        
             system.nixos-generate-config.desktopConfiguration = [''

     

       191
       190
        
               # Enable the GNOME Desktop Environment.

     
···

       200
       199
        
             services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];

     

       201
       200
        
       

     

       202
       201
        
             environment.extraInit = ''

     

       203
       203
       -
               ${concatMapStrings (p: ''

     

       202
       202
       +
               ${lib.concatMapStrings (p: ''

     

       204
       203
        
                 if [ -d "${p}/share/gsettings-schemas/${p.name}" ]; then

     

       205
       204
        
                   export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${p}/share/gsettings-schemas/${p.name}

     

       206
       205
        
                 fi

     
···

       214
       213
        
       

     

       215
       214
        
             environment.systemPackages = cfg.sessionPath;

     

       216
       215
        
       

     

       217
       217
       -
             environment.sessionVariables.GNOME_SESSION_DEBUG = mkIf cfg.debug "1";

     

       216
       216
       +
             environment.sessionVariables.GNOME_SESSION_DEBUG = lib.mkIf cfg.debug "1";

     

       218
       217
        
       

     

       219
       218
        
             # Override GSettings schemas

     

       220
       219
        
             environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";

     

       221
       220
        
           })

     

       222
       221
        
       

     

       223
       223
       -
           (mkIf flashbackEnabled {

     

       222
       222
       +
           (lib.mkIf flashbackEnabled {

     

       224
       223
        
             services.displayManager.sessionPackages =

     

       225
       224
        
               let

     

       226
       225
        
                 wmNames = map (wm: wm.wmName) flashbackWms;

     

       227
       226
        
                 namesAreUnique = lib.unique wmNames == wmNames;

     

       228
       227
        
               in

     

       229
       229
       -
                 assert (assertMsg namesAreUnique "Flashback WM names must be unique.");

     

       228
       228
       +
                 assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique.");

     

       230
       229
        
                 map

     

       231
       230
        
                   (wm:

     

       232
       231
        
                     pkgs.gnome.gnome-flashback.mkSessionForWm {

     
···

       254
       253
        
             ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);

     

       255
       254
        
           })

     

       256
       255
        
       

     

       257
       257
       -
           (mkIf serviceCfg.core-os-services.enable {

     

       256
       256
       +
           (lib.mkIf serviceCfg.core-os-services.enable {

     

       258
       257
        
             hardware.bluetooth.enable = mkDefault true;

     

       259
       258
        
             hardware.pulseaudio.enable = mkDefault true;

     

       260
       259
        
             programs.dconf.enable = true;

     
···

       307
       306
        
             ];

     

       308
       307
        
           })

     

       309
       308
        
       

     

       310
       310
       -
           (mkIf serviceCfg.core-shell.enable {

     

       309
       309
       +
           (lib.mkIf serviceCfg.core-shell.enable {

     

       311
       310
        
             services.xserver.desktopManager.gnome.sessionPath =

     

       312
       311
        
               let

     

       313
       312
        
                 mandatoryPackages = [

     
···

       329
       328
        
             services.gnome.gnome-user-share.enable = mkDefault true;

     

       330
       329
        
             services.gnome.rygel.enable = mkDefault true;

     

       331
       330
        
             services.gvfs.enable = true;

     

       332
       332
       -
             services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true));

     

       331
       331
       +
             services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true));

     

       333
       332
        
       

     

       334
       333
        
             systemd.packages = with pkgs.gnome; [

     

       335
       334
        
               gnome-session

     
···

       399
       398
        
           })

     

       400
       399
        
       

     

       401
       400
        
           # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst

     

       402
       402
       -
           (mkIf serviceCfg.core-utilities.enable {

     

       401
       401
       +
           (lib.mkIf serviceCfg.core-utilities.enable {

     

       403
       402
        
             environment.systemPackages =

     

       404
       403
        
               with pkgs.gnome;

     

       405
       404
        
               utils.removePackagesByName

     
···

       460
       459
        
             ];

     

       461
       460
        
           })

     

       462
       461
        
       

     

       463
       463
       -
           (mkIf serviceCfg.games.enable {

     

       462
       462
       +
           (lib.mkIf serviceCfg.games.enable {

     

       464
       463
        
             environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [

     

       465
       464
        
               aisleriot

     

       466
       465
        
               atomix

     
···

       486
       485
        
           })

     

       487
       486
        
       

     

       488
       487
        
           # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst

     

       489
       489
       -
           (mkIf serviceCfg.core-developer-tools.enable {

     

       488
       488
       +
           (lib.mkIf serviceCfg.core-developer-tools.enable {

     

       490
       489
        
             environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [

     

       491
       490
        
               dconf-editor

     

       492
       491
        
               devhelp