Move home config back into nixos, too annoying to maintain as separate when not needed Regoup nix expressions logically, make use of defaults and create GUI collections to minimise code needed for common machine definitions