small refactor

cfg/winter/default.nix

@@ -3,6 +3,7 @@
   system.stateVersion = "20.09";
 
   environment.etc."machine-id".source = "/mnt/bcachefs/machine-id";
+  users.mutableUsers = false;
 
   imports = [
     ./audio.nix
@@ -28,17 +29,13 @@
   ];
   nixpkgs.config.allowUnfree = true;
 
-  # set in flakes-secrets
-  # time.timeZone = "";
-  i18n.defaultLocale = "en_GB.UTF-8";
-
-  users.mutableUsers = false;
   users.users.lava = {
     isNormalUser = true;
     extraGroups = [ "wheel" ];
     shell = pkgs.zsh;
   };
 
+  i18n.defaultLocale = "en_GB.UTF-8";
   console.useXkbConfig = true;
 }
 

flake.nix

@@ -33,7 +33,7 @@
         modules = [
           base
           secrets.nixosModules.winter
-          ./cfg/winter/main.nix
+          ./cfg/winter
         ];
         specialArgs = { inherit overlays; };
       };