git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66990 from worldofpeace/gnome-vte-config

nixos/gnome-terminal: init

commit4ba10fbbfddd4fc4b556ca84f6b2ec78162104da authorworldofpeace <worldofpeace@protonmail.ch> dateWed 21 Aug 2019, 16:17 (7 years ago) parenta887fed4a46140
5 files changed+91−43
nixos/modules/config/vte.nix+52 nixos/modules/module-list.nix+2−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/config/vte.nixnew file+52
@@ -0,0 +1,52 @@
1+# VTE
2+
3+{ config, pkgs, lib, ... }:
4+
5+with lib;
6+
7+let
8+
9+ vteInitSnippet = ''
10+ # Show current working directory in VTE terminals window title.
11+ # Supports both bash and zsh, requires interactive shell.
12+ . ${pkgs.vte}/etc/profile.d/vte.sh
13+ '';
14+
15+in
16+
17+{
18+
19+ options = {
20+
21+ programs.bash.vteIntegration = mkOption {
22+ default = false;
23+ type = types.bool;
24+ description = ''
25+ Whether to enable Bash integration for VTE terminals.
26+ This allows it to preserve the current directory of the shell
27+ across terminals.
28+ '';
29+ };
30+
31+ programs.zsh.vteIntegration = mkOption {
32+ default = false;
33+ type = types.bool;
34+ description = ''
35+ Whether to enable Zsh integration for VTE terminals.
36+ This allows it to preserve the current directory of the shell
37+ across terminals.
38+ '';
39+ };
40+
41+ };
42+
43+ config = mkMerge [
44+ (mkIf config.programs.bash.vteIntegration {
45+ programs.bash.interactiveShellInit = vteInitSnippet;
46+ })
47+
48+ (mkIf config.programs.zsh.vteIntegration {
49+ programs.zsh.interactiveShellInit = vteInitSnippet;
50+ })
51+ ];
52+}
nixos/modules/module-list.nix+2−1
@@ -38,6 +38,7 @@
3838 ./config/unix-odbc-drivers.nix
3939 ./config/users-groups.nix
4040 ./config/vpnc.nix
41+ ./config/vte.nix
4142 ./config/zram.nix
4243 ./hardware/acpilight.nix
4344 ./hardware/all-firmware.nix
@@ -116,6 +117,7 @@
116117 ./programs/fuse.nix
117118 ./programs/gnome-disks.nix
118119 ./programs/gnome-documents.nix
120+ ./programs/gnome-terminal.nix
119121 ./programs/gpaste.nix
120122 ./programs/gnupg.nix
121123 ./programs/gphoto2.nix
@@ -297,7 +299,6 @@
297299 ./services/desktops/gnome3/gnome-remote-desktop.nix
298300 ./services/desktops/gnome3/gnome-online-miners.nix
299301 ./services/desktops/gnome3/gnome-settings-daemon.nix
300− ./services/desktops/gnome3/gnome-terminal-server.nix
301302 ./services/desktops/gnome3/gnome-user-share.nix
302303 ./services/desktops/gnome3/rygel.nix
303304 ./services/desktops/gnome3/seahorse.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.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";