gnome: rename from gnome3

Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
This commit is contained in:
Jan Tojnar
2021-05-08 09:47:42 +02:00
parent d03a5eb097
commit 468cb5980b
550 changed files with 1512 additions and 1327 deletions
+2 -2
View File
@@ -30,9 +30,9 @@ with lib;
config = mkIf config.programs.file-roller.enable {
environment.systemPackages = [ pkgs.gnome3.file-roller ];
environment.systemPackages = [ pkgs.gnome.file-roller ];
services.dbus.packages = [ pkgs.gnome3.file-roller ];
services.dbus.packages = [ pkgs.gnome.file-roller ];
};
+3 -3
View File
@@ -15,10 +15,10 @@ in {
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.geary ];
environment.systemPackages = [ pkgs.gnome.geary ];
programs.dconf.enable = true;
services.gnome3.gnome-keyring.enable = true;
services.gnome3.gnome-online-accounts.enable = true;
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-online-accounts.enable = true;
};
}
+2 -2
View File
@@ -41,9 +41,9 @@ with lib;
config = mkIf config.programs.gnome-disks.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ];
environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ];
services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ];
};
+5 -5
View File
@@ -13,7 +13,7 @@ with lib;
# Added 2019-08-09
imports = [
(mkRenamedOptionModule
[ "services" "gnome3" "gnome-documents" "enable" ]
[ "services" "gnome" "gnome-documents" "enable" ]
[ "programs" "gnome-documents" "enable" ])
];
@@ -41,13 +41,13 @@ with lib;
config = mkIf config.programs.gnome-documents.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-documents ];
environment.systemPackages = [ pkgs.gnome.gnome-documents ];
services.dbus.packages = [ pkgs.gnome3.gnome-documents ];
services.dbus.packages = [ pkgs.gnome.gnome-documents ];
services.gnome3.gnome-online-accounts.enable = true;
services.gnome.gnome-online-accounts.enable = true;
services.gnome3.gnome-online-miners.enable = true;
services.gnome.gnome-online-miners.enable = true;
};
+3 -3
View File
@@ -28,9 +28,9 @@ in
};
config = mkIf cfg.enable {
environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
systemd.packages = [ pkgs.gnome3.gnome-terminal ];
environment.systemPackages = [ pkgs.gnome.gnome-terminal ];
services.dbus.packages = [ pkgs.gnome.gnome-terminal ];
systemd.packages = [ pkgs.gnome.gnome-terminal ];
programs.bash.vteIntegration = true;
programs.zsh.vteIntegration = true;
+4 -4
View File
@@ -27,10 +27,10 @@ with lib;
###### implementation
config = mkIf config.programs.gpaste.enable {
environment.systemPackages = [ pkgs.gnome3.gpaste ];
services.dbus.packages = [ pkgs.gnome3.gpaste ];
systemd.packages = [ pkgs.gnome3.gpaste ];
environment.systemPackages = [ pkgs.gnome.gpaste ];
services.dbus.packages = [ pkgs.gnome.gpaste ];
systemd.packages = [ pkgs.gnome.gpaste ];
# gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas.
services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ];
services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
};
}
+2 -2
View File
@@ -155,8 +155,8 @@ in {
'';
};
services.gnome3.core-shell.enable = true;
services.gnome3.core-os-services.enable = true;
services.gnome.core-shell.enable = true;
services.gnome.core-os-services.enable = true;
services.xserver.displayManager.sessionPackages = [ pkgs.phosh ];
environment.etc."phosh/phoc.ini".source =
+3 -3
View File
@@ -31,14 +31,14 @@ with lib;
config = mkIf config.programs.seahorse.enable {
programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass";
programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass";
environment.systemPackages = [
pkgs.gnome3.seahorse
pkgs.gnome.seahorse
];
services.dbus.packages = [
pkgs.gnome3.seahorse
pkgs.gnome.seahorse
];
};