diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index a5dda83edd11..a065adfe61c4 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -19,9 +19,9 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; - systemd.packages = [ pkgs.gnome.gnome-terminal ]; + environment.systemPackages = [ pkgs.gnome-terminal ]; + services.dbus.packages = [ pkgs.gnome-terminal ]; + systemd.packages = [ pkgs.gnome-terminal ]; programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index b4e739029335..6acfce034b85 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -162,7 +162,7 @@ in { ++ cfg.sessionPath; # Both budgie-desktop-view and nemo defaults to this emulator. - programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); # Fonts. fonts.packages = [ diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index fa67441e7ac4..9bbc577c2c6d 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -230,7 +230,7 @@ in (mkIf serviceCfg.apps.enable { programs.gnome-disks.enable = mkDefault (notExcluded pkgs.gnome.gnome-disk-utility); - programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome.gnome-terminal); + programs.gnome-terminal.enable = mkDefault (notExcluded pkgs.gnome-terminal); programs.file-roller.enable = mkDefault (notExcluded pkgs.gnome.file-roller); environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index 3c1188ca88c9..3cf99fe7fc2f 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -42,7 +42,7 @@ let tests = { germinal.pkg = p: p.germinal; - gnome-terminal.pkg = p: p.gnome.gnome-terminal; + gnome-terminal.pkg = p: p.gnome-terminal; guake.pkg = p: p.guake; guake.cmd = "SHELL=$command guake --show"; diff --git a/pkgs/desktops/gnome/core/gnome-terminal/default.nix b/pkgs/by-name/gn/gnome-terminal/package.nix similarity index 100% rename from pkgs/desktops/gnome/core/gnome-terminal/default.nix rename to pkgs/by-name/gn/gnome-terminal/package.nix diff --git a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 78a4f7d94b65..7234d00d9c06 100644 --- a/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -2,7 +2,7 @@ , runCommand , nixos-artwork , glib -, gnome +, gnome-terminal , gtk3 , gsettings-desktop-schemas , extraGSettingsOverrides ? "" @@ -36,7 +36,7 @@ let cinnamon-session cinnamon-settings-daemon cinnamon-common - gnome.gnome-terminal + gnome-terminal gsettings-desktop-schemas gtk3 ] ++ extraGSettingsOverridePackages; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 088114d85ebe..c57934ec0b80 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -81,8 +81,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-system-monitor = callPackage ./core/gnome-system-monitor { }; - gnome-terminal = callPackage ./core/gnome-terminal { }; - gnome-themes-extra = callPackage ./core/gnome-themes-extra { }; gucharmap = callPackage ./core/gucharmap { }; @@ -254,6 +252,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. + gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.