PIR Time light and normal notime switch

Hello!

I have a automation where if it is night and pir is activated and other light is turned off light is turning on for 1min. Everything is working like a charm.

I would like to another function. If i turn this light on by button i dont want to turning it off automatically. Just leave it on untill i press button again.

So we have 2 states of turning on, by PIR and manually by button. If turned on by PIR go off after 1min and If turned by button go off after pressign button again.

Any tips?