Merge remote-tracking branch 'origin/main' into darwin

profiles/linux/default.nix

@@ -1,6 +1,7 @@
 { config, pkgs, agenix, ... }:
 
 {
+<<<<<<<< HEAD:profiles/linux/default.nix
 	imports = [
 		../shared
 		./programs.nix
@@ -15,6 +16,8 @@
 	# 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";
@@ -37,8 +40,4 @@
 		font = "Lat2-Terminus16";
 		keyMap = "us";
 	};
-
-	# The set of default values, which allow syou to keep system defaults set
-	# to a predictable value as you upgrade the system
-	system.stateVersion = "21.11";
 }