Continue to fix merge

2022-09-07 11:28:09 -05:00
parent c048cc3fd6
commit 16e54a97b4
18 changed files with 54 additions and 315 deletions
@@ -4,9 +4,11 @@
 	imports = [
 		./automatic.nix
 		./backup.nix
+		./darwin.nix
 		./home.nix
 		./gnome.nix
 		./linode.nix
+		./linux.nix
 		./proxy.nix
 		./rpi4.nix
 		./tailscale.nix