diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953444abe586..ad943c98fc9b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -160,7 +160,6 @@ ./misc/wordlist.nix ./programs/_1password-gui.nix ./programs/_1password.nix - ./programs/adb.nix ./programs/alvr.nix ./programs/amnezia-vpn.nix ./programs/appgate-sdp.nix diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix deleted file mode 100644 index 4ae2569049ed..000000000000 --- a/nixos/modules/programs/adb.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -{ - meta.maintainers = [ lib.maintainers.mic92 ]; - - ###### interface - options = { - programs.adb = { - enable = lib.mkOption { - default = false; - type = lib.types.bool; - description = '' - Whether to configure system to use Android Debug Bridge (adb). - ''; - }; - }; - }; - - ###### implementation - config = lib.mkIf config.programs.adb.enable { - environment.systemPackages = [ pkgs.android-tools ]; - }; -} diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1f01c20575c3..0a661c984c2c 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -63,6 +63,13 @@ in "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule + [ + "programs" + "adb" + ] + "This option is no longer needed as systemd 258 handles uaccess rules automatically. Please add `pkgs.android-tools` to your system packages to get the adb command." + ) (mkRemovedOptionModule [ "programs" "cardboard"