From fb442560064f98ee850c71d78330b9b3abda4774 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 20 Sep 2026 04:00:07 +0530 Subject: chore: added option guards to desktop entries for tuis --- modules/security/gopass/default.nix | 4 ++-- modules/security/gpg-tui/default.nix | 35 +++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 18 deletions(-) (limited to 'modules/security') diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix index 123b33f..aa0a0d6 100644 --- a/modules/security/gopass/default.nix +++ b/modules/security/gopass/default.nix @@ -95,7 +95,8 @@ $DRY_RUN_CMD cp -r $VERBOSE_ARG --no-preserve=mode ${./creation-templates} "${config.programs.password-store.settings.PASSWORD_STORE_DIR}/.gopass/create" '' ); - + }) + (lib.mkIf (config.security.gopass.enable && config.terminal.kitty.enable) { xdg.desktopEntries."gopass" = { name = "gopass"; exec = "${lib.getExe config.terminal.kitty.package} --class gopass -e ${lib.getExe config.security.gopass.package}"; @@ -106,7 +107,6 @@ type = "Application"; }; }) - (lib.mkIf config.security.gopass.sync.enable { home.activation.gopassSyncInit = let diff --git a/modules/security/gpg-tui/default.nix b/modules/security/gpg-tui/default.nix index ea9364f..bc4ac4f 100644 --- a/modules/security/gpg-tui/default.nix +++ b/modules/security/gpg-tui/default.nix @@ -16,21 +16,24 @@ }; }; - config = lib.mkIf config.security.gpg-tui.enable { - home.file.".local/share/icons/hicolor/scalable/apps/gpg.svg" = { - source = ../../../assets/icons/apps/gpg.svg; - }; - - xdg.desktopEntries."gpg-tui" = { - name = "gpg-tui"; - exec = "${lib.getExe config.terminal.kitty.package} --class gpg-tui -e ${lib.getExe config.security.gpg-tui.package}"; - icon = "gpg"; - categories = [ "Security" ]; - comment = "Terminal UI for GnuPG"; - terminal = false; - type = "Application"; - }; + config = lib.mkMerge [ + (lib.mkIf config.security.gpg-tui.enable { + home.file.".local/share/icons/hicolor/scalable/apps/gpg.svg" = { + source = ../../../assets/icons/apps/gpg.svg; + }; - home.packages = [ config.security.gpg-tui.package ]; - }; + home.packages = [ config.security.gpg-tui.package ]; + }) + (lib.mkIf (config.security.gpg-tui.enable && config.terminal.kitty.enable) { + xdg.desktopEntries."gpg-tui" = { + name = "gpg-tui"; + exec = "${lib.getExe config.terminal.kitty.package} --class gpg-tui -e ${lib.getExe config.security.gpg-tui.package}"; + icon = "gpg"; + categories = [ "Security" ]; + comment = "Terminal UI for GnuPG"; + terminal = false; + type = "Application"; + }; + }) + ]; } -- cgit v1.2.3