various reorgs

modules/nix-tools/rebuild.nix

@@ -140,8 +140,9 @@
       args = [
         "home" "switch"
         "--configuration" "${config.configuration}"
+        "$@"
         "${config.flakeDir}"
-      ] ++ config.extraOptions ++ [ "$@" ];
+      ] ++ config.extraOptions;
     };
   });
 }

modules/nix-tools/user.nix

@@ -14,8 +14,11 @@
         inputs.home-manager.nixosModules.home-manager
       ];
 
+      users.groups."${username}" = {};
+
       users.users."${username}" = {
         isNormalUser = true;
+        group = username;
         home = "/home/${username}";
         shell = lib.mkIf config.programs.zsh.enable pkgs.zsh;
         extraGroups = [ "input" "networkmanager" ]