From 2e0f6163f61cb1e4195f1a08ad1148e57a4f5843 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 2 Aug 2026 18:18:07 +0530 Subject: feat: Added package option to each module, darkman service - Added package options to each module which defines the package/derivation that should be used in all other modules - Added a systemd oneshot service that autosets darkman to dark mode - Removed the prompt from rofi --- modules/security/gopass/default.nix | 6 +++--- modules/security/gpg/default.nix | 8 ++++++++ modules/security/ssh/default.nix | 6 ++++++ 3 files changed, 17 insertions(+), 3 deletions(-) (limited to 'modules/security') diff --git a/modules/security/gopass/default.nix b/modules/security/gopass/default.nix index fa359d8..c4910cb 100644 --- a/modules/security/gopass/default.nix +++ b/modules/security/gopass/default.nix @@ -10,8 +10,8 @@ enable = lib.mkEnableOption "Enables gopass."; package = lib.mkOption { type = lib.types.package; - default = pkgs.gopass.override { passAlias = true; }; - defaultText = lib.literalExpression "pkgs.gopass.override { passAlias = true; }"; + readOnly = true; + default = config.programs.password-store.package; description = "The gopass package to use."; }; ssh-agent.enable = lib.mkEnableOption "gopass-backed SSH keys for git"; @@ -20,7 +20,7 @@ config = lib.mkIf config.security.gopass.enable { programs.password-store = { enable = true; - package = config.security.gopass.package; + package = pkgs.gopass.override { passAlias = true; }; settings = { PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.local/share/pass"; }; diff --git a/modules/security/gpg/default.nix b/modules/security/gpg/default.nix index 1ce1642..cd77549 100644 --- a/modules/security/gpg/default.nix +++ b/modules/security/gpg/default.nix @@ -8,6 +8,14 @@ { options.security.gpg = { enable = lib.mkEnableOption "Enables gpg."; + + package = lib.mkOption { + type = lib.types.package; + default = config.programs.gpg.package; + readOnly = true; + defaultText = lib.literalExpression "config.programs.gpg.package"; + description = "The gpg package to use."; + }; }; config = lib.mkIf config.security.gpg.enable { diff --git a/modules/security/ssh/default.nix b/modules/security/ssh/default.nix index f9e56bd..c616677 100644 --- a/modules/security/ssh/default.nix +++ b/modules/security/ssh/default.nix @@ -10,6 +10,12 @@ options.security.ssh = { enable = lib.mkEnableOption "Enables ssh."; + package = lib.mkOption { + type = lib.types.package; + readOnly = true; + default = config.programs.ssh.package; + description = "The ssh package to use."; + }; }; config = lib.mkIf config.security.ssh.enable { -- cgit v1.2.3