fix: waydroid

This commit is contained in:
Ryan Yin
2024-08-26 22:36:02 +08:00
parent 11af465bd1
commit 30a288bdb3
5 changed files with 63 additions and 8 deletions

37
flake.lock generated
View File

@@ -715,6 +715,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1702921762,
"narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=",
@@ -749,10 +765,28 @@
"type": "github"
}
},
"nur-ryan4yin": {
"nur-ataraxiasjel": {
"inputs": {
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1723710142,
"narHash": "sha256-2dIz02Upb7k6c6jx41JtLwvGoKFZanu7vS/ZwMW6m+I=",
"owner": "AtaraxiaSjel",
"repo": "nur",
"rev": "433c9d20d40ee728f5a57bc18dd70b714a7d2ff3",
"type": "github"
},
"original": {
"owner": "AtaraxiaSjel",
"repo": "nur",
"type": "github"
}
},
"nur-ryan4yin": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1717568000,
"narHash": "sha256-3VJ+LluCDykchp5J7saJkJLaQG9qxirxNaJIPWWDQTQ=",
@@ -853,6 +887,7 @@
"nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nuenv": "nuenv",
"nur-ataraxiasjel": "nur-ataraxiasjel",
"nur-ryan4yin": "nur-ryan4yin",
"polybar-themes": "polybar-themes",
"pre-commit-hooks": "pre-commit-hooks",

View File

@@ -134,9 +134,7 @@
flake = false;
};
nur-ryan4yin = {
url = "github:ryan4yin/nur-packages";
# inputs.nixpkgs.follows = "nixpkgs";
};
nur-ryan4yin.url = "github:ryan4yin/nur-packages";
nur-ataraxiasjel.url = "github:AtaraxiaSjel/nur";
};
}

View File

@@ -4,6 +4,4 @@
...
}: {
imports = mylib.scanPaths ./.;
boot.loader.timeout = lib.mkForce 10; # wait for x seconds to select the boot entry
}

View File

@@ -0,0 +1,11 @@
{
pkgs,
lib,
...
}: {
boot.loader.timeout = lib.mkForce 10; # wait for x seconds to select the boot entry
environment.systemPackages = with pkgs; [
wl-clipboard
];
}

View File

@@ -1,4 +1,8 @@
{pkgs, ...}: {
{
pkgs,
nur-ataraxiasjel,
...
}: {
###################################################################################
#
# Virtualisation - Libvirt(QEMU/KVM) / Docker / LXD / WayDroid
@@ -32,6 +36,7 @@
enableOnBoot = true;
};
# Usage: https://wiki.nixos.org/wiki/Waydroid
waydroid.enable = true;
# libvirtd = {
@@ -45,6 +50,14 @@
};
environment.systemPackages = with pkgs; [
# This script is used to install the arm translation layer for waydroid
# so that we can install arm apks on x86_64 waydroid
#
# https://github.com/casualsnek/waydroid_script
# https://github.com/AtaraxiaSjel/nur/tree/master/pkgs/waydroid-script
# https://wiki.archlinux.org/title/Waydroid#ARM_Apps_Incompatible
nur-ataraxiasjel.packages.${pkgs.system}.waydroid-script
# Need to add [File (in the menu bar) -> Add connection] when start for the first time
# virt-manager