Jailed packages moved to their own file.

WIP waydroid jail.

Binary caches config update.
This commit is contained in:
boyreau 2026-07-11 19:35:49 +02:00
commit 8233e7abf1
4 changed files with 33 additions and 28 deletions

View file

@ -4,24 +4,7 @@
}: }:
let let
sources = import ./npins/default.nix; pkgs = import ./jailed-packages.nix;
jail-nix = import sources."jail.nix" { };
jailOverlay =
final: prev:
jail-nix.mkOverlay {
inherit final prev;
packages =
combinators: with combinators; {
firefox = [
network
gui
gpu
];
};
};
pkgs = import sources.nixpkgs {
overlays = [ jailOverlay ];
};
in in
{ {
imports = [ imports = [
@ -32,7 +15,6 @@ in
./kernel.nix ./kernel.nix
./nix.nix ./nix.nix
./users.nix ./users.nix
<home-manager/nixos>
]; ];
programs.fuse.userAllowOther = true; programs.fuse.userAllowOther = true;
@ -46,7 +28,7 @@ in
virtualisation = { virtualisation = {
waydroid = { waydroid = {
enable = true; enable = true;
package = pkgs.waydroid-nftables; package = pkgs.waydroid-nftables.unjailed;
}; };
docker = { docker = {
enable = true; enable = true;
@ -111,11 +93,6 @@ in
font-awesome font-awesome
]; ];
nix.settings.substituters = [ "https://nix-community.cachix.org" ];
nix.settings.trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
system.copySystemConfiguration = true; system.copySystemConfiguration = true;
system.stateVersion = "26.05"; # Not here to update, here for data models backward compatibility. Don't change. system.stateVersion = "26.05"; # Not here to update, here for data models backward compatibility. Don't change.

21
jailed-packages.nix Normal file
View file

@ -0,0 +1,21 @@
let
sources = import ./npins/default.nix;
jail-nix = import /home/zo/dev/jail.nix { };
jailOverlay =
final: prev:
jail-nix.lib.mkOverlay {
inherit final prev;
packages =
combinators: with combinators; {
waydroid-nftables = [
network
gui
gpu
];
};
};
pkgs = import sources.nixpkgs {
overlays = [ jailOverlay ];
};
in
pkgs

View file

@ -6,7 +6,4 @@ let
in in
{ {
boot.kernelPackages = cachy-kernel; boot.kernelPackages = cachy-kernel;
nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
} }

10
nix.nix
View file

@ -6,4 +6,14 @@
}; };
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.substituters = [
"https://attic.xuyh0120.win/lantian"
"https://nix-community.cachix.org"
"https://cache.nixos.org/"
];
nix.settings.trusted-public-keys = [
"lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
} }