Simplify my PS1 logic
Merge branch 'laptop' into my-rpi