From c9f8285f0566553fe9f4e6b829afd77d26ee7cb9 Mon Sep 17 00:00:00 2001 From: linsui <36977733+linsui@users.noreply.github.com> Date: Sat, 21 Sep 2024 16:28:55 +0800 Subject: [PATCH] nixos/nautilus-open-any-terminal: only set NAUTILUS_4_EXTENSION_DIR in non GNOME environment --- .../programs/nautilus-open-any-terminal.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/nautilus-open-any-terminal.nix b/nixos/modules/programs/nautilus-open-any-terminal.nix index f878a9f26139..41f26e03d312 100644 --- a/nixos/modules/programs/nautilus-open-any-terminal.nix +++ b/nixos/modules/programs/nautilus-open-any-terminal.nix @@ -1,4 +1,9 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.nautilus-open-any-terminal; @@ -23,20 +28,28 @@ in nautilus-open-any-terminal ]; - environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; + environment.sessionVariables = lib.mkIf (!config.services.xserver.desktopManager.gnome.enable) { + NAUTILUS_4_EXTENSION_DIR = "${pkgs.nautilus-python}/lib/nautilus/extensions-4"; + }; + environment.pathsToLink = [ "/share/nautilus-python/extensions" ]; programs.dconf = lib.optionalAttrs (cfg.terminal != null) { enable = true; - profiles.user.databases = [{ - settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; - lockAll = true; - }]; + profiles.user.databases = [ + { + settings."com/github/stunkymonkey/nautilus-open-any-terminal".terminal = cfg.terminal; + lockAll = true; + } + ]; }; }; meta = { - maintainers = with lib.maintainers; [ stunkymonkey linsui ]; + maintainers = with lib.maintainers; [ + stunkymonkey + linsui + ]; }; }