Gigerpunk

I was quibbling with coworkers over lunch as to the definition of cyberpunk.  I said that it was marked by dystopia, a film noir aesthetic, and technology filtering down to a criminal underworld.  But a couple of guys insisted that it had to do with the merging of humans and machines.  When asked what I would call that kind of science fiction if it wasn’t cyberpunk, I replied, “I don’t know, Gigerpunk?”