Restructure flake.nix for a simpler config for building different images off the same NixOS config.

nix/configuration/roles/openpgp_card_tools/default.nix

@@ -19,31 +19,27 @@
     };
   };
 
-  config = lib.mkIf config.me.openpgp_card_tools.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          openpgp-card-tools
-          openpgp-card-tool-git
-          openpgp-card-ssh-agent
-        ];
+  config = lib.mkIf config.me.openpgp_card_tools.enable {
+    environment.systemPackages = with pkgs; [
+      openpgp-card-tools
+      openpgp-card-tool-git
+      openpgp-card-ssh-agent
+    ];
 
-        nixpkgs.overlays = [
-          (final: prev: {
-            openpgp-card-tool-git = (final.callPackage ./package/openpgp-card-tool-git/package.nix { });
-            openpgp-card-ssh-agent = (final.callPackage ./package/openpgp-card-ssh-agent/package.nix { });
-          })
-        ];
+    nixpkgs.overlays = [
+      (final: prev: {
+        openpgp-card-tool-git = (final.callPackage ./package/openpgp-card-tool-git/package.nix { });
+        openpgp-card-ssh-agent = (final.callPackage ./package/openpgp-card-ssh-agent/package.nix { });
+      })
+    ];
 
-        me.install.user.talexander.file = {
-          ".config/openpgp-card-state/config.toml" = {
-            source = ./files/openpgp-card-state.toml;
-          };
-        };
+    me.install.user.talexander.file = {
+      ".config/openpgp-card-state/config.toml" = {
+        source = ./files/openpgp-card-state.toml;
+      };
+    };
 
-        # The current openpgp-card-ssh-agent has an outdated dependency on openpgp-card-state which makes it not handle my current openpgp-card-state.toml
-        # services.openpgp-card-ssh-agent.enable = true;
-      }
-    ]
-  );
+    # The current openpgp-card-ssh-agent has an outdated dependency on openpgp-card-state which makes it not handle my current openpgp-card-state.toml
+    # services.openpgp-card-ssh-agent.enable = true;
+  };
 }

nix/configuration/roles/openpgp_card_tools/openpgp-card-ssh-agent.nix

@@ -9,13 +9,7 @@
 let
   inherit (lib)
     mkIf
-    mkOption
-    mkEnableOption
     mkPackageOption
-    mkDefault
-    types
-    concatMapStringsSep
-    generators
     ;
   cfg = config.services.openpgp-card-ssh-agent;
 in