From db00b39a9abec04245486a01b236b8d9734c9ad0 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 21 Apr 2021 01:45:39 +0200 Subject: [PATCH] termite: add option to enable VTE integration (#1917) This also migrates to using the VTE module directly, centralising bug fixes. Fixes #1909. --- modules/programs/termite.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/programs/termite.nix b/modules/programs/termite.nix index 8959e042b..ccf3cabb3 100644 --- a/modules/programs/termite.nix +++ b/modules/programs/termite.nix @@ -6,13 +6,6 @@ let cfg = config.programs.termite; - vteInitStr = '' - # See https://github.com/thestinger/termite#id1 - if [[ $TERM == xterm-termite ]]; then - . ${pkgs.termite.vte-ng}/etc/profile.d/vte.sh - fi - ''; - in { options = { programs.termite = { @@ -50,6 +43,10 @@ in { ''; }; + enableVteIntegration = mkEnableOption "Shell VTE integration" // { + default = true; + }; + fullscreen = mkOption { default = null; type = types.nullOr types.bool; @@ -381,7 +378,7 @@ in { ${cfg.hintsExtra} ''; - programs.bash.initExtra = vteInitStr; - programs.zsh.initExtra = vteInitStr; + programs.bash.enableVteIntegration = lib.mkDefault cfg.enableVteIntegration; + programs.zsh.enableVteIntegration = lib.mkDefault cfg.enableVteIntegration; }); }