[m] Android dev, cleanup, qemu,...

This commit is contained in:
soraefir 2024-01-19 11:58:52 +01:00
parent 0486df012d
commit 81be322a80
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
9 changed files with 40 additions and 21 deletions

View File

@ -1,14 +1,19 @@
{ lib, config, pkgs, ... }: { { lib, config, pkgs, ... }:
let
imports = [ ./vscodium ]; android_env = pkgs.androidenv.composeAndroidPackages {
platformVersions = [ "34" ];
abiVersions = [ "x86" "x86_64" ];
includeEmulator = false;
};
in {
imports = [ ./vscodium ];
config = lib.mkIf (config.homecfg.make.develop) { config = lib.mkIf (config.homecfg.make.develop) {
home.packages = with pkgs; [ home.packages = with pkgs; [
blender blender
godot_4 godot_4
androidStudioPackages.canary android-tools
androidStudioPackages.canary
]; ];
}; };
} }

View File

@ -24,6 +24,10 @@ with lib; {
type = types.bool; type = types.bool;
default = false; default = false;
}; };
develop = mkOption {
type = types.bool;
default = false;
};
}; };
net = { net = {
wlp = { wlp = {

View File

@ -1,13 +1,16 @@
{ ... }: { { ... }: {
systemd.services.systemd-udevd.restartIfChanged = false; systemd.services.systemd-udevd.restartIfChanged = false;
services.udev.extraRules = '' services.udev = {
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess" packages = [ ];
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess" extraRules = ''
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess" SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="010a", GROUP="plugdev", TAG+="uaccess"
''; SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0102", GROUP="plugdev", TAG+="uaccess"
SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0313", GROUP="plugdev", TAG+="uaccess"
'';
};
} }

View File

@ -1,9 +1,11 @@
{ lib, config, ... }: { lib, config, pkgs, ... }:
let cfg = config.hostcfg.make.virt; let cfg = config.hostcfg.make.virt;
in { in {
config = lib.mkIf cfg { config = lib.mkIf cfg {
environment.systemPackages = [ pkgs.qemu ];
virtualisation = { virtualisation = {
# libvirtd.enable = true; libvirtd.enable = true;
# waydroid.enable = true; # waydroid.enable = true;
# lxd.enable = true; # lxd.enable = true;
docker = { docker = {

View File

@ -2,6 +2,7 @@
nixpkgs.config = { nixpkgs.config = {
permittedInsecurePackages = [ ]; permittedInsecurePackages = [ ];
allowUnfree = true; allowUnfree = true;
android_sdk.accept_license = true;
packageOverrides = pkgs: rec { packageOverrides = pkgs: rec {
custom = import ../../../../packages { inherit pkgs; }; custom = import ../../../../packages { inherit pkgs; };
}; };

View File

@ -1,6 +1,6 @@
{ pkgs, ... }: { { pkgs, config, ... }: {
programs.adb.enable = true; programs.adb.enable = true;
programs.wireshark.enable = true; programs.wireshark.enable = true;
environment.systemPackages = with pkgs; [ wget dconf ]; environment.systemPackages = with pkgs; [ wget dconf wireshark ];
} }

View File

@ -10,6 +10,8 @@
"wheel" "wheel"
"vboxsf" "vboxsf"
"adbusers" "adbusers"
"libvirtd"
"kvm"
"lp" "lp"
"audio" "audio"
"video" "video"

View File

@ -14,6 +14,7 @@
virt = true; virt = true;
power = false; power = false;
game = true; game = true;
develop = true;
}; };
net = { net = {
wlp = { wlp = {

View File

@ -14,6 +14,7 @@
virt = true; virt = true;
power = true; power = true;
game = true; game = true;
develop = true;
}; };
net = { net = {
wlp = { wlp = {