Yeah, 1password or keepass are both fine solutions for password managers in my mind.