update

modules/hardware/android.nix

@@ -13,11 +13,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    programs.adb = {
-      enable = true;
-    };
     environment.systemPackages = with pkgs; [
       scrcpy # mirrors screen to pc, -S turns off screen while active, --render-driver opengl uses opengl for rendering
+      android-tools
     ];
     users.users.${config.mainUser.name}.extraGroups = [ "adbusers" ];
   };

modules/hardware/vr.nix

@@ -79,8 +79,7 @@ in
     };
     environment.systemPackages = with pkgs; [
       monado
-      wlx-overlay-s
-      wayvr-dashboard
+      wayvr
     ];
     systemd.user.services.monado.environment = {
       STEAMVR_LH_ENABLE = "1";