commit f07fd89111a0dd3da11ad764064df454399332e6 · pyrox.dev/nixpkgs

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.at-spi2-core.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.at_spi2_core ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.at_spi2_core ];

     

       34
       37
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.at_spi2_core ];

     

       38
       38
       +
           services.dbus.packages = [ gnome3.at_spi2_core ];

     

       36
       39
        
       

     

       37
       40
        
         };

     

       38
       41

+5 -2

nixos/modules/services/desktops/gnome3/gnome-documents.nix

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.gnome-documents.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome-documents ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.gnome-documents ];

     

       34
       37
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.gnome-documents ];

     

       38
       38
       +
           services.dbus.packages = [ gnome3.gnome-documents ];

     

       36
       39
        
       

     

       37
       40
        
           services.gnome3.gnome-online-accounts.enable = true;

     

       38
       41

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       31
       34
        
       

     

       32
       35
        
         config = mkIf config.services.gnome3.gnome-keyring.enable {

     

       33
       36
        
       

     

       34
       34
       -
           environment.systemPackages = [ pkgs.gnome3.gnome_keyring ];

     

       37
       37
       +
           environment.systemPackages = [ gnome3.gnome_keyring ];

     

       35
       38
        
       

     

       36
       36
       -
           services.dbus.packages = [ pkgs.gnome3.gnome_keyring ];

     

       39
       39
       +
           services.dbus.packages = [ gnome3.gnome_keyring ];

     

       37
       40
        
       

     

       38
       41
        
         };

     

       39
       42

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.gnome-online-accounts.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome_online_accounts ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.gnome_online_accounts ];

     

       34
       37
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.gnome_online_accounts ];

     

       38
       38
       +
           services.dbus.packages = [ gnome3.gnome_online_accounts ];

     

       36
       39
        
       

     

       37
       40
        
         };

     

       38
       41

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.gnome-online-miners.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.gnome-online-miners ];

     

       34
       37
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ];

     

       38
       38
       +
           services.dbus.packages = [ gnome3.gnome-online-miners ];

     

       36
       39
        
       

     

       37
       40
        
         };

     

       38
       41

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.gnome-user-share.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.gnome-user-share ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.gnome-user-share ];

     

       34
       37
        
       

     

       35
       35
       -
           services.xserver.displayManager.sessionCommands = with pkgs.gnome3; ''

     

       38
       38
       +
           services.xserver.displayManager.sessionCommands = with gnome3; ''

     

       36
       39
        
             # Don't let gnome-control-center depend upon gnome-user-share

     

       37
       40
        
             export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome-user-share}/share/gsettings-schemas/${gnome-user-share.name}

     

       38
       41
        
           '';

+5 -2

nixos/modules/services/desktops/gnome3/seahorse.nix

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       29
       32
        
       

     

       30
       33
        
         config = mkIf config.services.gnome3.seahorse.enable {

     

       31
       34
        
       

     

       32
       32
       -
           environment.systemPackages = [ pkgs.gnome3.seahorse ];

     

       35
       35
       +
           environment.systemPackages = [ gnome3.seahorse ];

     

       33
       36
        
       

     

       34
       34
       -
           services.dbus.packages = [ pkgs.gnome3.seahorse ];

     

       37
       37
       +
           services.dbus.packages = [ gnome3.seahorse ];

     

       35
       38
        
       

     

       36
       39
        
         };

     

       37
       40

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       29
       32
        
       

     

       30
       33
        
         config = mkIf config.services.gnome3.sushi.enable {

     

       31
       34
        
       

     

       32
       32
       -
           environment.systemPackages = [ pkgs.gnome3.sushi ];

     

       35
       35
       +
           environment.systemPackages = [ gnome3.sushi ];

     

       33
       36
        
       

     

       34
       34
       -
           services.dbus.packages = [ pkgs.gnome3.sushi ];

     

       37
       37
       +
           services.dbus.packages = [ gnome3.sushi ];

     

       35
       38
        
       

     

       36
       39
        
         };

     

       37
       40

+5 -2

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

···

       4
       4
        
       

     

       5
       5
        
       with pkgs.lib;

     

       6
       6
        
       

     

       7
       7
       +
       let

     

       8
       8
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       9
       9
       +
       in

     

       7
       10
        
       {

     

       8
       11
        
       

     

       9
       12
        
         ###### interface

     
···

       30
       33
        
       

     

       31
       34
        
         config = mkIf config.services.gnome3.tracker.enable {

     

       32
       35
        
       

     

       33
       33
       -
           environment.systemPackages = [ pkgs.gnome3.tracker ];

     

       36
       36
       +
           environment.systemPackages = [ gnome3.tracker ];

     

       34
       37
        
       

     

       35
       35
       -
           services.dbus.packages = [ pkgs.gnome3.tracker ];

     

       38
       38
       +
           services.dbus.packages = [ gnome3.tracker ];

     

       36
       39
        
       

     

       37
       40
        
         };

     

       38
       41

+9 -3

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

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         cfg = config.services.xserver.desktopManager.gnome3;

     

       7
       7
       -
         gnome3 = pkgs.gnome3;

     

       7
       7
       +
         gnome3 = config.environment.gnome3.packageSet;

     

       8
       8
        
       

     

       9
       9
        
         # Remove packages of ys from xs, based on their names

     

       10
       10
        
         removePackagesByName = xs: ys:

     

       11
       11
        
           let

     

       12
       12
        
             pkgName = drv: (builtins.parseDrvName drv.name).name;

     

       13
       13
       -
       	  ysNames = map pkgName ys;

     

       13
       13
       +
             ysNames = map pkgName ys;

     

       14
       14
        
             res = (filter (x: !(builtins.elem (pkgName x) ysNames)) xs);

     

       15
       15
        
           in

     

       16
       16
        
             filter (x: !(builtins.elem (pkgName x) ysNames)) xs;

     
···

       35
       35
        
             description = "Enable Gnome 3 desktop manager.";

     

       36
       36
        
           };

     

       37
       37
        
       

     

       38
       38
       +
           environment.gnome3.packageSet = mkOption {

     

       39
       39
       +
             default = pkgs.gnome3;

     

       40
       40
       +
             example = literalExample "pkgs.gnome3_12";

     

       41
       41
       +
             description = "Which Gnome 3 package set to use.";

     

       42
       42
       +
           };

     

       43
       43
       +
           

     

       38
       44
        
           environment.gnome3.excludePackages = mkOption {

     

       39
       45
        
             default = [];

     

       40
       46
        
             example = "[ pkgs.gnome3.totem ]";

     
···

       80
       86
        
       

     

       81
       87
        
                 # Don't let epiphany depend upon gnome-shell

     

       82
       88
        
                 # Override default mimeapps

     

       83
       83
       -
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}:${mimeAppsList}/share

     

       89
       89
       +
                 export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${gnome3.gnome_shell}/share/gsettings-schemas/${gnome3.gnome_shell.name}:${mimeAppsList}/share

     

       84
       90
        
       

     

       85
       91
        
                 # Let gnome-control-center find gnome-shell search providers

     

       86
       92
        
                 export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/