From bd1628567f81491732fb616f9f807bb70c6bb782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Mon, 3 Feb 2025 08:37:24 +0100 Subject: [PATCH] waydroid --- flake.lock | 24 ++++++++++++------------ hosts/lenar/default.nix | 1 + nixosModules/dev/containers.nix | 6 ++++++ 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1e1b53c..fdf5a97 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1738148035, + "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1738275749, + "narHash": "sha256-PM+cGduJ05EZ+YXulqAwUFjvfKpPmW080mcuN6R1POw=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "a8159195bfaef3c64df75d3b1e6a68d49d392be9", "type": "github" }, "original": { @@ -67,11 +67,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1737806078, - "narHash": "sha256-FjgNPBLMCpmwtJT5LiQYkM2lDY+yAmW1ZN1Idx7QeDg=", + "lastModified": 1738175805, + "narHash": "sha256-fPjaARmK522JLJ7wxFebxG4eE/3HHSmuAA78iAZ+A7g=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "83cc6a28afc4155fd3fe28274f6b5287f51ed2b6", + "rev": "d4c75a33c4a7a16bf87cfd804fb5444a1ec53d49", "type": "github" }, "original": { @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1738142207, + "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "9d3ae807ebd2981d593cddd0080856873139aa40", "type": "github" }, "original": { diff --git a/hosts/lenar/default.nix b/hosts/lenar/default.nix index 71c7731..cd5a6d9 100644 --- a/hosts/lenar/default.nix +++ b/hosts/lenar/default.nix @@ -47,6 +47,7 @@ enable = true; changeDefaultNetwork = true; }; + waydroid.enable = true; podman.enable = true; de.gnome = { enable = true; diff --git a/nixosModules/dev/containers.nix b/nixosModules/dev/containers.nix index 5237c01..3216bf6 100644 --- a/nixosModules/dev/containers.nix +++ b/nixosModules/dev/containers.nix @@ -23,11 +23,15 @@ let podman-cfg = { enable = lib.mkEnableOption "Whether to enable Podman."; }; + waydroid-cfg = { + enable = lib.mkEnableOption "Whence to enable Waydroid."; + }; in { options.krop = { docker = docker-cfg; podman = podman-cfg; + waydroid = waydroid-cfg; }; config = { @@ -47,6 +51,8 @@ in enable = true; }; + virtualisation.waydroid.enable = cfg.waydroid.enable; + users.users.krop = lib.mkIf (cfg.docker.addUserToGroup && cfg.docker.enable) { extraGroups = [ "docker" ]; };