flake.lock

@@ -124,16 +124,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814205,
+        "lastModified": 1700392168,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
+        "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -270,16 +270,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701263465,
+        "lastModified": 1700989516,
-        "narHash": "sha256-lNXUIlkfyDyp9Ox21hr+wsEf/IBklLvb6bYcyeXbdRc=",
+        "narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "50aa30a13c4ab5e7ba282da460a3e3d44e9d0eb3",
+        "rev": "d2e4de209881b38392933fabf303cde3454b0b4c",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
         "type": "indirect"
       }
     },

flake.nix

@@ -2,7 +2,7 @@
 	description = "Configuration for Everest";
 
 	inputs = {
-		nixpkgs.url = "nixpkgs/nixos-23.11";
+		nixpkgs.url = "nixpkgs/nixos-23.05";
 		nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
 		agenix = {
@@ -14,7 +14,7 @@
 		};
 
 		home-manager = {
-			url = "github:nix-community/home-manager/release-23.11";
+			url = "github:nix-community/home-manager/release-23.05";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
 

machines/Everest/configuration.nix

@@ -28,14 +28,10 @@
 				prefixLength = 24;
 			} ];
 		};
-		# I use networkd, so I need to declare the interface for the default gateway
+		defaultGateway = "192.168.0.1";
-		defaultGateway = {
-			address = "192.168.0.1";
-			interface = "eno1";
-		};
 		nameservers = [ "8.8.8.8" ];
 	};
-  
+
 	# Define a user account. Don't forget to set a password with ‘passwd’.
 	users.users.toast = {
 		isNormalUser = true;

roles/common/configuration.nix

@@ -69,7 +69,7 @@
 		useGlobalPkgs = true;
 		verbose = true;
 		users.toast = { config, ... }: {
-			home.stateVersion = "23.11";
+			home.stateVersion = "23.05";
 			xdg = {
 				userDirs = {
 					enable = true;
@@ -100,7 +100,7 @@
 	*/	
 	
 	system =  {
-		stateVersion = "23.11";
+		stateVersion = "23.05";
 		# Nix on nixos 23.05 does not have dirtyRev
 		configurationRevision = flakeSelf.sourceInfo.rev or flakeSelf.sourceInfo.dirtyRev or "dirty";
 		nixos.variant_id = lib.strings.toLower config.networking.hostName;

roles/common/services/syncthing.nix

@@ -5,39 +5,39 @@
 		overrideDevices = true;
 		overrideFolders = true;
 		openDefaultPorts = true;
-		settings = {
+		extraOptions = {
 			options = {
 				urAccepted = 3;
 			};
-			# Set up devices and folders common to every device
+		};
-			devices = {
+		# Set up devices and folders common to every device
-				"phone" = {
+		devices = {
-					name = "Xiaomi Redmi Note 10 Pro";
+			"phone" = {
-					id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6";
+				name = "Xiaomi Redmi Note 10 Pro";
-				};
+				id = "K7KNZ5V-XREUADL-CROQXPV-6AA4H65-2VUD34Z-VQWKJ6S-LWWW4EE-XPNEZQ6";
-				"pc" = {
-					name = "Archie";
-					id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
-				};
-				"steamdeck" = {
-					name = "Steam Deck";
-					id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
-				};
-				"server" = {
-					name = "Everest";
-					id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
-				};
-				"surface" = {
-					name = "Surface Go";
-					id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
-				};
 			};
-			folders = {
+			"pc" = {
-				"passwords" = {
+				name = "Archie";
-					label = "KeePassXC Passwords";
+				id = "NJPX754-64AQNP3-7GZFIRZ-W2EDRJQ-27ORWYM-X5YXEXQ-ERRTRTQ-BSYD4AY";
-					id = "rdyaq-ex659";
+			};
-					devices = [ "phone" "pc" "steamdeck" "server" "surface"];
+			"steamdeck" = {
-				};
+				name = "Steam Deck";
+				id = "DNFEGEA-PDEVW5A-O5VBVQK-IUXI7J5-MAHCQAG-2JLEFFM-DSXB6AS-TX6ZHAN";
+			};
+			"server" = {
+				name = "Everest";
+				id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
+			};
+			"surface" = {
+				name = "Surface Go";
+				id = "HTVSF3O-AHY3TNH-BLVSEGK-HRRSMHC-H5LJWVF-NDKGM6O-ATWZALC-YXNV2Q4";
+			};
+		};
+		folders = {
+			"passwords" = {
+				label = "KeePassXC Passwords";
+				id = "rdyaq-ex659";
+				devices = [ "phone" "pc" "steamdeck" "server" "surface"];
 			};
 		};
 	};

roles/desktop/services/syncthing.nix

@@ -6,7 +6,7 @@
 		user = "toast";
 		group = "users";
 		dataDir = config.users.users.toast.home;
-		settings.folders."passwords".path = "~/Documents/Passwords";
+		folders."passwords".path = "~/Documents/Passwords";
 	};
 	# Allow regular users to stop syncthing
 	# https://stackoverflow.com/questions/61480914/using-policykit-to-allow-non-root-users-to-start-and-stop-a-service

roles/gaming/services/syncthing.nix

@@ -6,7 +6,7 @@
 	TODO: turn this into a module eventually
 	*/
 
-	services.syncthing.settings.folders = {
+	services.syncthing.folders = {
 		"steam-201810" = {
 			label = "Wolfenstein The New Order Saves";
 			id = "laxxf-t2wmy";

roles/school/services/syncthing.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-	services.syncthing.settings.folders = {
+	services.syncthing.folders = {
 		"school-things" = {
 			label = "School things";
 			id = "z6alc-nfoqr";

roles/server/syncthing.nix

@@ -11,7 +11,7 @@
 		key = config.age.secrets.syncthingKey.path;
 		cert = config.age.secrets.syncthingCert.path;
 		guiAddress = "0.0.0.0:8384";
-		settings.folders = {
+		folders = {
 			"passwords" = {
 				path = "${config.services.syncthing.dataDir}/passwords";
 			};