From b4485c3d25f0529ae396f84c8b38ed1bf5dbe2eb Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Wed, 10 Jul 2024 17:02:55 -0400
Subject: [PATCH] system: remove android-tools backport stuff

android-tools is up-to-date on all branches, so it is no longer needed.
---
 flake.lock                  | 17 -----------------
 flake.nix                   | 13 +++----------
 modules/nixos/adb-old.nix   | 34 ----------------------------------
 modules/nixos/default.nix   |  1 -
 system/programs/android.nix |  2 --
 5 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100644 modules/nixos/adb-old.nix

diff --git a/flake.lock b/flake.lock
index 24dc84b..71af8d2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -786,22 +786,6 @@
         "type": "github"
       }
     },
-    "pkg-android-tools": {
-      "locked": {
-        "lastModified": 1676239704,
-        "narHash": "sha256-eKJDKTzI/uHNmfOX1Ln7Y1cjyA9XAkf5vyWdz03EXAA=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "55070e598e0e03d1d116c49b9eff322ef07c6ac6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "55070e598e0e03d1d116c49b9eff322ef07c6ac6",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -819,7 +803,6 @@
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixpkgs-yt-dlp-2024": "nixpkgs-yt-dlp-2024",
-        "pkg-android-tools": "pkg-android-tools",
         "rust-overlay": "rust-overlay",
         "stylix": "stylix",
         "systems": "systems_8"
diff --git a/flake.nix b/flake.nix
index e6fa155..098ea51 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,10 +21,6 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
 
-    # 33.0.3p2 as suggested by https://xdaforums.com/t/guide-january-3-2024-root-pixel-7-pro-unlock-bootloader-pass-safetynet-both-slots-bootable-more.4505353/
-    # android tools versions [ 34.0.0, 34.0.5 ) causes bootloops somehow and 34.0.5 isn't in nixpkgs yet
-    pkg-android-tools.url = "github:NixOS/nixpkgs/55070e598e0e03d1d116c49b9eff322ef07c6ac6";
-
     nix-minecraft = {
       url = "github:Silveere/nix-minecraft/quilt-revert";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
@@ -107,10 +103,6 @@
           minecraftServers = prev.minecraftServers // x.quiltServers;
         });
     in [
-      /* android-tools 33.0.3p2 */ (final: prev: {
-        inherit (inputs.pkg-android-tools.legacyPackages.${final.system})
-          android-tools android-udev-rules;
-      })
       (final: prev: let
         packages = import ./pkgs { inherit (prev) pkgs; };
       in {
@@ -138,10 +130,11 @@
     # My current timezone for any mobile devices (i.e., my laptop)
     mobileTimeZone = "America/New_York";
 
+    # TODO this was something for android-tools. overlays are a better way to
+    # define packages anyway, probably remove this.
+    #
     # define extra packages here
     mkExtraPkgs = system: {
-      # android-tools = inputs.pkg-android-tools.legacyPackages.${system}.android-tools;
-      inherit (inputs.pkg-android-tools.legacyPackages.${system}) android-tools android-udev-rules;
     };
 
     # Variables to be passed to NixOS modules in the vars attrset
diff --git a/modules/nixos/adb-old.nix b/modules/nixos/adb-old.nix
deleted file mode 100644
index d784360..0000000
--- a/modules/nixos/adb-old.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{...}@moduleInputs:
-{ config, lib, pkgs, ... }:
-with lib;
-
-let
-  extraPkgs = (moduleInputs.mkExtraPkgs pkgs.system);
-in
-{
-  meta.maintainers = [ maintainers.mic92 ];
-
-  disabledModules = [ "programs/adb.nix" ];
-
-  ###### interface
-  options = {
-    programs.adb = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = lib.mdDoc ''
-          Whether to configure system to use Android Debug Bridge (adb).
-          To grant access to a user, it must be part of adbusers group:
-          `users.users.alice.extraGroups = ["adbusers"];`
-        '';
-      };
-    };
-  };
-
-  ###### implementation
-  config = mkIf config.programs.adb.enable {
-    services.udev.packages = [ extraPkgs.android-udev-rules ];
-    environment.systemPackages = [ extraPkgs.android-tools ];
-    users.groups.adbusers = {};
-  };
-}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 5147d24..76c5b7a 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,4 +1,3 @@
 {...}@moduleInputs:
 {
-  adb = (import ./adb-old.nix) moduleInputs;
 }
diff --git a/system/programs/android.nix b/system/programs/android.nix
index d5464de..77bdf7c 100644
--- a/system/programs/android.nix
+++ b/system/programs/android.nix
@@ -3,8 +3,6 @@ let
   cfg = config.nixfiles.programs.adb;
 in
 {
-  # imports = [ outputs.nixosModules.adb ];
-
   options.nixfiles.programs.adb = {
     enable = lib.mkEnableOption "adb configuration";
   };