Compare commits
2 commits
7cec1eede3
...
e61c0c8298
Author | SHA1 | Date | |
---|---|---|---|
e61c0c8298 | |||
bd1628567f |
3 changed files with 22 additions and 15 deletions
30
flake.lock
30
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": 1738448366,
|
||||
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "daf04c5950b676f47a794300657f1d3d14c1a120",
|
||||
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
||||
"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": {
|
||||
|
@ -82,11 +82,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1737751639,
|
||||
"narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=",
|
||||
"lastModified": 1738471961,
|
||||
"narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4",
|
||||
"rev": "537286c3c59b40311e5418a180b38034661d2536",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -98,11 +98,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1737885589,
|
||||
"narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=",
|
||||
"lastModified": 1738410390,
|
||||
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8",
|
||||
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -47,6 +47,7 @@
|
|||
enable = true;
|
||||
changeDefaultNetwork = true;
|
||||
};
|
||||
waydroid.enable = true;
|
||||
podman.enable = true;
|
||||
de.gnome = {
|
||||
enable = true;
|
||||
|
|
|
@ -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" ];
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue