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

profiles/linux/programs.nix

@@ -1,22 +1,30 @@
 { pkgs, agenix, ... }:
 
-{
+let
+	myPackages = pypackages: with pypackages; [
+		pkgs.xonsh-direnv
+	];
+
+	myPython = pkgs.python3.withPackages myPackages;
+in {
 	# Base packages that need to be in all my hosts
 	environment.systemPackages = with pkgs; [
 		agenix.defaultPackage."${system}"
+		bitwarden-cli
 		diffutils
 		git
 		gnupatch
 		findutils
+		hms # My own home manager switcher
 		home-manager
 		htop
-		python3
+		myPython
 		pwgen
 		tmux
 		transcrypt
+		unzip
 		vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
 		wget
-		xonsh
 		yamllint  # Used in vim
 	];
 }

profiles/linux/syncthing.nix

@@ -32,13 +32,13 @@ in
 				addresses = [
 					"tcp://linode.thehellings.com:22000"
 				];
-				id = "3PHWAI5-ILAWGGD-S5FC5QM-M2WQ2FX-PZ3IXQF-QVRKANG-WXAACJC-2MZN3Q5";
+				id = "ROZPUG5-G4IAXYA-JNRQXRD-5PFU2BQ-WVJTOGZ-DFMGJ5E-Q4IGXCJ-JHSNDQ6";
 			};
 		};
 		folders = {
 			"mkrvy-tc6x9" = {
-				enable = true;
 				path = "/home/greg/drive";
+				enable = true;
 				devices = syncs;
 			};
 		};