From be2cdde5644239adb6453a45120137f33ce953df Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Wed, 31 Jul 2024 17:19:08 -0400 Subject: [PATCH] keepassxc: add package option --- homeManagerModules/apps/keepassxc/default.nix | 3 +-- homeManagerModules/options.nix | 1 + homes/aly/windowManagers/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeManagerModules/apps/keepassxc/default.nix b/homeManagerModules/apps/keepassxc/default.nix index 21520e43..ceffa134 100644 --- a/homeManagerModules/apps/keepassxc/default.nix +++ b/homeManagerModules/apps/keepassxc/default.nix @@ -1,11 +1,10 @@ { config, lib, - pkgs, ... }: { config = lib.mkIf config.ar.home.apps.keepassxc.enable { - home.packages = [pkgs.keepassxc]; + home.packages = [config.ar.home.apps.keepassxc.package]; xdg.configFile."keepassxc/keepassxc.ini".text = let defaults = { diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 76d214b0..a6dbb8fe 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -42,6 +42,7 @@ in { keepassxc = { enable = lib.mkEnableOption "KeePassXC password manager."; + package = lib.mkPackageOption pkgs "keepassxc" {}; settings = lib.mkOption { description = "KeePassXC settings."; diff --git a/homes/aly/windowManagers/default.nix b/homes/aly/windowManagers/default.nix index 7c6d233a..9fbf165d 100644 --- a/homes/aly/windowManagers/default.nix +++ b/homes/aly/windowManagers/default.nix @@ -4,7 +4,7 @@ pkgs, ... }: let - keepassxc = "${lib.getExe' pkgs.keepassxc "keepassxc"} --pw-stdin ${config.home.homeDirectory}/sync/Passwords.kdbx < ${config.age.secrets.keepassxc.path}"; + keepassxc = "${lib.getExe' config.ar.home.apps.keepassxc.package "keepassxc"} --pw-stdin ${config.home.homeDirectory}/sync/Passwords.kdbx < ${config.age.secrets.keepassxc.path}"; in { programs.waybar.settings.mainBar."bluetooth" = { "on-click" = lib.mkForce "${lib.getExe pkgs.rofi-bluetooth} -i";