Revert "Merge commit 'efcef47c37e27be128082fa9585b8fa1be3c4dd5' into master"

This reverts commit 93d87124e90859011855467b93592bd3d1bb7723, reversing
changes made to 194efc5c4b7c1dabebd0731c81952e17d935c4d8.

3 files changed, 34 insertions, 39 deletions

diff --git a/trivionomicon/modules/athena-bccr/hm.nix b/trivionomicon/modules/athena-bccr/hm.nix
index df41f12..683cb4d 100644
--- a/trivionomicon/modules/athena-bccr/hm.nix
+++ b/trivionomicon/modules/athena-bccr/hm.nix
@@ -5,12 +5,11 @@
   doctrine,
   ...
 }: let
-  athena =
-    (pkgs.${doctrine.prefix}.athena-bccr.override {
-      inherit (cfg) mirror;
-    }).${
-      cfg.release
-    };
+  releases = pkgs.${doctrine.prefix}.athena-bccr.override {
+    inherit (cfg) mirror vendor;
+  };
+
+  athena = releases.${cfg.release};
 in {
   home.packages = [
     athena.firmador
diff --git a/trivionomicon/modules/athena-bccr/options.nix b/trivionomicon/modules/athena-bccr/options.nix
index 7b6cf93..dc4c986 100644
--- a/trivionomicon/modules/athena-bccr/options.nix
+++ b/trivionomicon/modules/athena-bccr/options.nix
@@ -1,42 +1,40 @@
 {lib, ...}:
-with lib.types; {
+with lib.types; let
+  mirror = lib.mkOption {
+    type = nullOr str;
+    default = null;
+    description = "release zip mirror base URL, if null then the release zip must be manually added to the Nix store";
+  };
+
+  release = lib.mkOption {
+    type = str;
+    default = "latest";
+    description = "pinned athena-bccr release tag";
+  };
+
+  vendor = lib.mkOption {
+    type = enum ["athena" "idopte"];
+    default = "idopte";
+    description = "driver dvendor";
+  };
+in {
   hm = {
+    inherit mirror release vendor;
+
     gaudiHash = lib.mkOption {
       type = nullOr str;
       default = null;
       description = "hash of the Gaudi client";
     };
-
-    mirror = lib.mkOption {
-      type = nullOr str;
-      default = null;
-      description = "release zip mirror base URL, if null then the release zip must be manually added to the Nix store";
-    };
-
-    release = lib.mkOption {
-      type = str;
-      default = "latest";
-      description = "pinned athena-bccr release tag";
-    };
   };
 
   sys = {
+    inherit mirror release vendor;
+
     group = lib.mkOption {
       type = str;
       default = "users";
       description = "user group with full access to the smartcard reader";
     };
-
-    mirror = lib.mkOption {
-      type = nullOr str;
-      default = null;
-      description = "release zip mirror base URL, if null then the release zip must be manually added to the Nix store";
-    };
-
-    release = lib.mkOption {
-      type = str;
-      default = "latest";
-      description = "pinned athena-bccr release tag";
-    };
   };
 }
diff --git a/trivionomicon/modules/athena-bccr/sys.nix b/trivionomicon/modules/athena-bccr/sys.nix
index bd7d758..0b4658c 100644
--- a/trivionomicon/modules/athena-bccr/sys.nix
+++ b/trivionomicon/modules/athena-bccr/sys.nix
@@ -6,17 +6,15 @@
   doctrine,
   ...
 }: let
-  athena =
-    (pkgs.${doctrine.prefix}.athena-bccr.override {
-      inherit (cfg) mirror;
-    }).${
-      cfg.release
-    };
-
-  inherit (athena) vendor;
+  releases = pkgs.${doctrine.prefix}.athena-bccr.override {
+    inherit (cfg) mirror vendor;
+  };
 
+  athena = releases.${cfg.release};
   driver = athena.card-driver.lib;
   scmiddleware = "${driver}/lib/SCMiddleware";
+
+  inherit (cfg) vendor;
 in {
   environment = {
     etc =