Continue to fix merge

modules/automatic/nix.nix

@@ -5,6 +5,8 @@
 	nix = {
 		package = pkgs.nixFlakes;
 
+		autoOptimiseStore = true;
+
 		# Keep freespace available, at a minimum, and enable Flakes
 		extraOptions = ''
 experimental-features = nix-command flakes
@@ -17,5 +19,4 @@ keep-derivations = true
 '';
 	};
 	nixpkgs.config.allowUnfree = true;
-	system.stateVersion = "22.05";
 }

modules/automatic/users.nix

@@ -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";