diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-18 00:02:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-18 00:02:44 +0000 |
| commit | 2ad339408a0a9f3b7e0854a244c8b6d0b4f232b5 (patch) | |
| tree | 45114809bc03d6988c2a4503ae50314426282b58 /nixos/modules/config | |
| parent | 8bc9edd60dc4417cceeb3d338028b92b59dd35a6 (diff) | |
| parent | d743b18aae9fb2beb87bd09d61079e7cbbe0b1a2 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/config')
| -rw-r--r-- | nixos/modules/config/no-x-libs.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/config/vte.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index 03a4516b85164..870b3fe77cca9 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -83,6 +83,7 @@ with lib; # translateManpages -> perlPackages.po4a -> texlive-combined-basic -> texlive-core-big -> libX11 util-linux = super.util-linux.override { translateManpages = false; }; vim-full = super.vim-full.override { guiSupport = false; }; + vte = super.vte.override { gtkVersion = null; }; zbar = super.zbar.override { enableVideo = false; withXorg = false; }; })); }; diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index a969607f6e0b0..48f85246560a9 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -1,5 +1,3 @@ -# VTE - { config, pkgs, lib, ... }: with lib; @@ -9,7 +7,7 @@ let vteInitSnippet = '' # Show current working directory in VTE terminals window title. # Supports both bash and zsh, requires interactive shell. - . ${pkgs.vte}/etc/profile.d/vte.sh + . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh ''; in |