2 commits

Author	SHA1	Message	Date
Daniel Flanagan	8e9b973c0c	Merge remote-tracking branch 'origin/master' into nixos	2020-10-26 16:33:46 -05:00
Daniel Flanagan	3dc9ab3879	Fixes for arch before moving to NixOS anyways...?	2020-10-26 11:56:49 -05:00