Merge branch 'main' of https://git.thomasfamily.duckdns.org/michael/nix-dots

machines/kitchen/configuration.nix

@@ -28,13 +28,13 @@
 		micro
 		firefox
 		chromium
-		pkgs.gnome.gnome-tweaks
+		gnome.gnome-tweaks
 	];
 
 	home-manager = {
-    users.michael = import ../../user/environments/nixos/home.nix pkgs;
+    	users.michael = import ../../user/environments/nixos/home.nix pkgs;
-    useGlobalPkgs = true;
+    	useGlobalPkgs = true;
-  };
+  	};
 
 	# Some programs need SUID wrappers, can be configured further or are
 	# started in user sessions.
@@ -73,6 +73,6 @@
 	# this value at the release version of the first install of this system.
 	# Before changing this value read the documentation for this option
 	# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-	system.stateVersion = "20.03"; # Did you read the comment?
+	system.stateVersion = "22.05"; # Did you read the comment?
 
 }

machines/kitchen/hardware-configuration.nix

@@ -31,7 +31,7 @@
 		}
 	];
 
-	nix.maxJobs = lib.mkDefault 12;
+	nix.settings.maxJobs = lib.mkDefault 12;
 	# High-DPI console
 	console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz";
 }

modules/gnome.nix

@@ -3,6 +3,6 @@
 	services.xserver.enable = true;
 	services.xserver.displayManager.gdm.enable = true;
 	services.xserver.desktopManager.gnome.enable = true;
-	services.gnome.chrome-gnome-shell.enable = true;
+	services.gnome.gnome-browser-connector.enable = true;
 	programs.dconf.enable = true;
 }

modules/nix.nix

@@ -7,7 +7,7 @@
 		# this is required until nix 2.4 is released
 		package = pkgs.nixFlakes;
 
-		autoOptimiseStore = true;
+		settings.autoOptimiseStore = true;
 		gc = {
 			automatic = true;
 			dates = "weekly";

user/environments/nixos/home.nix

@@ -13,7 +13,8 @@
 
 	home.packages = with pkgs; [
 		firefox
-		foxitreader
+		# foxitreader
 	];
   
+	home.stateVersion = "21.05";
 }