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
@@ -1,23 +1,8 @@
-{ config, pkgs, agenix, ... }:
+# Only imported from the Linux modules
+
+{ pkgs, ... }:

 {
-<<<<<<<< HEAD:profiles/linux/default.nix
-	imports = [
-		../shared
-		./programs.nix
-		./syncthing.nix
-		./xonsh.nix
-	];
-
-
-	# Use hardlinking instead of copying when possible
-	nix.autoOptimiseStore = true;
-
-	# I am a fan of network manager, myself
-	networking.networkmanager.enable = true;
-
-========
->>>>>>>> origin/main:modules/automatic/users.nix
 	# Enable the OpenSSH daemon for remote control
 	services.openssh.enable = true;
 	#services.openssh.permitRootLogin = "yes";