unfinish styling-nix
nix updated
unfinish styling again
conflict resolved
unfinished styling-nix