diff --git a/modules/home/gui/apps/develop/default.nix b/modules/home/gui/apps/develop/default.nix index 2f6e915..8b31d6e 100644 --- a/modules/home/gui/apps/develop/default.nix +++ b/modules/home/gui/apps/develop/default.nix @@ -1,14 +1,19 @@ -{ lib, config, pkgs, ... }: { - - imports = [ ./vscodium ]; +{ lib, config, pkgs, ... }: +let + android_env = pkgs.androidenv.composeAndroidPackages { + platformVersions = [ "34" ]; + abiVersions = [ "x86" "x86_64" ]; + includeEmulator = false; + }; +in { + imports = [ ./vscodium ]; config = lib.mkIf (config.homecfg.make.develop) { - home.packages = with pkgs; [ - blender - godot_4 - androidStudioPackages.canary - + blender + godot_4 + android-tools + androidStudioPackages.canary ]; }; } diff --git a/modules/nixos/hostcfg/default.nix b/modules/nixos/hostcfg/default.nix index fd8d096..414c460 100755 --- a/modules/nixos/hostcfg/default.nix +++ b/modules/nixos/hostcfg/default.nix @@ -24,6 +24,10 @@ with lib; { type = types.bool; default = false; }; + develop = mkOption { + type = types.bool; + default = false; + }; }; net = { wlp = { diff --git a/modules/nixos/system/hw/udev/default.nix b/modules/nixos/system/hw/udev/default.nix index dc59092..35bc7aa 100644 --- a/modules/nixos/system/hw/udev/default.nix +++ b/modules/nixos/system/hw/udev/default.nix @@ -1,13 +1,16 @@ { ... }: { systemd.services.systemd-udevd.restartIfChanged = false; - services.udev.extraRules = '' - SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess" - SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", 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" - ''; + services.udev = { + packages = [ ]; + extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0127", GROUP="plugdev", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0118", GROUP="plugdev", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0106", GROUP="plugdev", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="2104", ATTRS{idProduct}=="0128", 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" + ''; + }; } diff --git a/modules/nixos/system/hw/virt/default.nix b/modules/nixos/system/hw/virt/default.nix index 5ecdf96..a64f0a9 100644 --- a/modules/nixos/system/hw/virt/default.nix +++ b/modules/nixos/system/hw/virt/default.nix @@ -1,9 +1,11 @@ -{ lib, config, ... }: +{ lib, config, pkgs, ... }: let cfg = config.hostcfg.make.virt; in { config = lib.mkIf cfg { + + environment.systemPackages = [ pkgs.qemu ]; virtualisation = { - # libvirtd.enable = true; + libvirtd.enable = true; # waydroid.enable = true; # lxd.enable = true; docker = { diff --git a/modules/nixos/system/nix/default.nix b/modules/nixos/system/nix/default.nix index 6d58495..f02042c 100644 --- a/modules/nixos/system/nix/default.nix +++ b/modules/nixos/system/nix/default.nix @@ -2,6 +2,7 @@ nixpkgs.config = { permittedInsecurePackages = [ ]; allowUnfree = true; + android_sdk.accept_license = true; packageOverrides = pkgs: rec { custom = import ../../../../packages { inherit pkgs; }; }; diff --git a/modules/nixos/tools/debug/default.nix b/modules/nixos/tools/debug/default.nix index ff3d5f0..5245c1a 100644 --- a/modules/nixos/tools/debug/default.nix +++ b/modules/nixos/tools/debug/default.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: { +{ pkgs, config, ... }: { programs.adb.enable = true; programs.wireshark.enable = true; - environment.systemPackages = with pkgs; [ wget dconf ]; + environment.systemPackages = with pkgs; [ wget dconf wireshark ]; } diff --git a/modules/nixos/users/default.nix b/modules/nixos/users/default.nix index cf55158..8e214c9 100644 --- a/modules/nixos/users/default.nix +++ b/modules/nixos/users/default.nix @@ -10,6 +10,8 @@ "wheel" "vboxsf" "adbusers" + "libvirtd" + "kvm" "lp" "audio" "video" diff --git a/systems/iriy/default.nix b/systems/iriy/default.nix index 9632ac2..367a7f6 100644 --- a/systems/iriy/default.nix +++ b/systems/iriy/default.nix @@ -14,6 +14,7 @@ virt = true; power = false; game = true; + develop = true; }; net = { wlp = { diff --git a/systems/valinor/default.nix b/systems/valinor/default.nix index 82ff84e..6adb102 100644 --- a/systems/valinor/default.nix +++ b/systems/valinor/default.nix @@ -14,6 +14,7 @@ virt = true; power = true; game = true; + develop = true; }; net = { wlp = {