cleaning up and breaking everything
fix for last commit
Add basic nix package expression
Move things to ./common in preperation for factoring out into seperate repo