Statix formatting fixes

modules/apps/development.nix

@@ -21,7 +21,7 @@ with lib;
 				"dev.k8slens.OpenLens"
 			];
 		})
-		(mkIf (cfg.kubernetes.enable) {
+		(mkIf cfg.kubernetes.enable {
 			environment.systemPackages = with pkgs; [
 				kubectl
 				kubernetes-helm

modules/base/system.nix

@@ -106,17 +106,19 @@ with lib;
 			};
 		};
 
+    services = {
       # Scrub BTRFS partitions if the root partition is btrfs
-		services.btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
+      btrfs.autoScrub = lib.mkIf (config.fileSystems."/".fsType == "btrfs") {
         enable = true;
         interval = "weekly";
         fileSystems = [ "/" ];
       };
 
       # Enable fwupd (firmware updater)
-		services.fwupd.enable = true;
+      fwupd.enable = true;
 
       # Allow systemd user services to keep running after the user has logged out
-		services.logind.killUserProcesses = false;
+      logind.killUserProcesses = false;
+    };
 	};
 }

modules/ui/gnome.nix

@@ -12,11 +12,14 @@ with lib;
 	};
 
 	config = mkIf cfg.enable {
-		host.ui.audio.enable = true;
+		host.ui = {
-		host.ui.flatpak.enable = true;
+			audio.enable = true;
+			flatpak.enable = true;
+		};
 		
+		services = {
 			# Configure the xserver
-		services.xserver = {
+			xserver = {
 				# Enable the X11 windowing system.
 				enable = true;
 
@@ -31,48 +34,15 @@ with lib;
 				displayManager = {
 					gdm.enable = true;
 				};
-		};
 
 				# Remove default packages that came with the install
-		services.xserver.excludePackages = with pkgs; [
+				excludePackages = with pkgs; [
 					xterm
 				];
-		environment.gnome.excludePackages = (with pkgs; [
+			};
-			gnome-photos
-			gnome-tour
-			gnomeExtensions.extension-list
-			gedit # text editor
-		]) ++ (with pkgs.gnome; [
-			cheese # webcam tool
-			gnome-music
-			gnome-calendar
-			epiphany # web browser
-			geary # email reader
-			evince # document viewer
-			gnome-characters
-			totem # video player
-			tali # poker game
-			iagno # go game
-			hitori # sudoku game
-			atomix # puzzle game
-		]);
-
-		# Install additional Gnome packages
-		environment.systemPackages = with pkgs; [
-			# Gnome tweak tools
-			gnome.gnome-tweaks
-			# Gnome extensions
-			gnomeExtensions.appindicator
-			gnomeExtensions.dash-to-panel
-			gnomeExtensions.gsconnect
-			gnomeExtensions.forge
-			# Themeing
-			gnome.gnome-themes-extra
-			papirus-icon-theme
-		];
 
 			# Install Flatpaks
-		services.flatpak.packages = [
+			flatpak.packages = [
 				"com.mattjakeman.ExtensionManager"
 				"dev.geopjr.Tuba"
 				"org.bluesabre.MenuLibre"
@@ -94,7 +64,45 @@ with lib;
 			];
 
 			# Disable CUPS - not needed
-		services.printing.enable = false;
+			printing.enable = false;
+		};
+		
+		environment = {
+			# Remove default Gnome packages that came with the install, then install the ones I actually use
+			gnome.excludePackages = (with pkgs; [
+				gnome-photos
+				gnome-tour
+				gnomeExtensions.extension-list
+				gedit # text editor
+			]) ++ (with pkgs.gnome; [
+				cheese # webcam tool
+				gnome-music
+				gnome-calendar
+				epiphany # web browser
+				geary # email reader
+				evince # document viewer
+				gnome-characters
+				totem # video player
+				tali # poker game
+				iagno # go game
+				hitori # sudoku game
+				atomix # puzzle game
+			]);
+
+			# Install additional Gnome packages
+			systemPackages = with pkgs; [
+				# Gnome tweak tools
+				gnome.gnome-tweaks
+				# Gnome extensions
+				gnomeExtensions.appindicator
+				gnomeExtensions.dash-to-panel
+				gnomeExtensions.gsconnect
+				gnomeExtensions.forge
+				# Themeing
+				gnome.gnome-themes-extra
+				papirus-icon-theme
+			];
+		};
 
 		# Manage fonts
 		fonts = {

modules/users/aires/default.nix

@@ -47,23 +47,26 @@ with lib;
 					../common/gnome.nix
 				];
 
+        home = {
           # The state version is required and should stay at the version you originally installed.
-				home.stateVersion = "24.05";
+          stateVersion = "24.05";
-
-				# Let home Manager install and manage itself.
-				programs.home-manager.enable = true;
 
           # Basic setup
-				home.username = "aires";
+          username = "aires";
-				home.homeDirectory = "/home/aires";
+          homeDirectory = "/home/aires";
 
           # Install extra packages, specifically gnome extensions
-				home.packages = lib.mkIf config.host.ui.gnome.enable [
+          packages = lib.mkIf config.host.ui.gnome.enable [
             pkgs.gnomeExtensions.wallpaper-slideshow
           ];
+        };
+
+        programs = {
+          # Let home Manager install and manage itself.
+          home-manager.enable = true;
 
           # Set up git
-				programs.git = {
+          git = {
             enable = true;
             # Username and email set in nix-secrets
             extraConfig = {
@@ -71,10 +74,8 @@ with lib;
             };
           };
 
-				# SSH set up in nix-secrets
-
           # Set up Zsh
-				programs.zsh = {
+          zsh = {
             enable = true;
               oh-my-zsh = {
                 enable = true;
@@ -98,6 +99,9 @@ with lib;
             };
             loginExtra = "fastfetch";
           };
+        };
+
+				# SSH set up in nix-secrets
 
 				# Gnome settings specific to aires on Shura
 				dconf.settings = lib.mkIf (config.networking.hostName == "Shura") {

modules/users/gremlin/default.nix

@@ -46,18 +46,21 @@ with lib;
 					../common/gnome.nix
 				];
 
-				# The state version is required and should stay at the version you originally installed.
+        home = {
-				home.stateVersion = "24.05";
-
-				# Let home Manager install and manage itself.
-				programs.home-manager.enable = true;
-
           # Basic setup
-				home.username = "gremlin";
+          username = "gremlin";
-				home.homeDirectory = "/home/gremlin";
+          homeDirectory = "/home/gremlin";
+
+          # The state version is required and should stay at the version you originally installed.
+				  stateVersion = "24.05";
+        };
+
+        programs = {
+          # Let home Manager install and manage itself.
+          home-manager.enable = true;
 
           # Set up git
-				programs.git = {
+          git = {
             # Name and email set in nix-secrets
             enable = true;
             extraConfig = {
@@ -65,10 +68,8 @@ with lib;
             };
           };
 
-				# SSH entries set in nix-secrets
-
           # Set up Zsh
-				programs.zsh = {
+          zsh = {
             enable = true;
             # Install and source the p10k theme
             plugins = [
@@ -92,6 +93,9 @@ with lib;
               ];
             };
           };
+        };
+
+				# SSH entries set in nix-secrets
 			};
 		})