git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/gnome-terminal: init

This module obsoletes services.gnome3.gnome-terminal-server as that's a confusing option for users, and sounds internal. It's much simpler to have a gnome-terminal module.

commit4a46140d29bd4e1b75ac61070b8272728aa819ba authorworldofpeace <worldofpeace@protonmail.ch> dateWed 21 Aug 2019, 15:58 (7 years ago) parent79dd78b
4 files changed+38−43
nixos/modules/module-list.nix+1−1 nixos/modules/programs/gnome-terminal.nix+36 nixos/modules/services/desktops/gnome3/gnome-terminal-server.nix−41 nixos/modules/services/x11/desktop-managers/gnome3.nix+1−1
nixos/modules/module-list.nix+1−1
@@ -116,6 +116,7 @@
116116 ./programs/fuse.nix
117117 ./programs/gnome-disks.nix
118118 ./programs/gnome-documents.nix
119+ ./programs/gnome-terminal.nix
119120 ./programs/gpaste.nix
120121 ./programs/gnupg.nix
121122 ./programs/gphoto2.nix
@@ -296,7 +297,6 @@
296297 ./services/desktops/gnome3/gnome-remote-desktop.nix
297298 ./services/desktops/gnome3/gnome-online-miners.nix
298299 ./services/desktops/gnome3/gnome-settings-daemon.nix
299− ./services/desktops/gnome3/gnome-terminal-server.nix
300300 ./services/desktops/gnome3/gnome-user-share.nix
301301 ./services/desktops/gnome3/gvfs.nix
302302 ./services/desktops/gnome3/rygel.nix
nixos/modules/programs/gnome-terminal.nixnew file+36
@@ -0,0 +1,36 @@
1+# GNOME Terminal.
2+
3+{ config, pkgs, lib, ... }:
4+
5+with lib;
6+
7+let
8+
9+ cfg = config.programs.gnome-terminal;
10+
11+in
12+
13+{
14+
15+ # Added 2019-08-19
16+ imports = [
17+ (mkRenamedOptionModule
18+ [ "services" "gnome3" "gnome-terminal-server" "enable" ]
19+ [ "programs" "gnome-terminal" "enable" ])
20+ ];
21+
22+ options = {
23+
24+ programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal";
25+
26+ };
27+
28+ config = mkIf cfg.enable {
29+ environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
30+ services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
31+ systemd.packages = [ pkgs.gnome3.gnome-terminal ];
32+
33+ programs.bash.vteIntegration = true;
34+ programs.zsh.vteIntegration = true;
35+ };
36+}
nixos/modules/services/desktops/gnome3/gnome-terminal-server.nixdeleted−41
@@ -1,41 +0,0 @@
1−# GNOME Documents daemon.
2−
3−{ config, pkgs, lib, ... }:
4−
5−with lib;
6−
7−{
8−
9− ###### interface
10−
11− options = {
12−
13− services.gnome3.gnome-terminal-server = {
14−
15− enable = mkOption {
16− type = types.bool;
17− default = false;
18− description = ''
19− Whether to enable GNOME Terminal server service,
20− needed for gnome-terminal.
21− '';
22− };
23−
24− };
25−
26− };
27−
28−
29− ###### implementation
30−
31− config = mkIf config.services.gnome3.gnome-terminal-server.enable {
32−
33− environment.systemPackages = [ pkgs.gnome3.gnome-terminal ];
34−
35− services.dbus.packages = [ pkgs.gnome3.gnome-terminal ];
36−
37− systemd.packages = [ pkgs.gnome3.gnome-terminal ];
38−
39− };
40−
41−}
nixos/modules/services/x11/desktop-managers/gnome3.nix+1−1
@@ -136,7 +136,6 @@ in {
136136 services.gnome3.gnome-online-accounts.enable = mkDefault true;
137137 services.gnome3.gnome-remote-desktop.enable = mkDefault true;
138138 services.gnome3.gnome-settings-daemon.enable = true;
139− services.gnome3.gnome-terminal-server.enable = mkDefault true;
140139 services.gnome3.gnome-user-share.enable = mkDefault true;
141140 services.gnome3.gvfs.enable = true;
142141 services.gnome3.rygel.enable = mkDefault true;
@@ -166,6 +165,7 @@ in {
166165 programs.file-roller.enable = mkDefault true;
167166 programs.gnome-disks.enable = mkDefault true;
168167 programs.gnome-documents.enable = mkDefault true;
168+ programs.gnome-terminal.enable = mkDefault true;
169169
170170 # If gnome3 is installed, build vim for gtk3 too.
171171 nixpkgs.config.vim.gui = "gtk3";