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

nix/configuration/roles/tekton/default.nix

@@ -17,13 +17,9 @@
     };
   };
 
-  config = lib.mkIf config.me.tekton.enable (
-    lib.mkMerge [
-      {
-        environment.systemPackages = with pkgs; [
-          tektoncd-cli
-        ];
-      }
-    ]
-  );
+  config = lib.mkIf config.me.tekton.enable {
+    environment.systemPackages = with pkgs; [
+      tektoncd-cli
+    ];
+  };
 }