Jailed packages moved to their own file.
WIP waydroid jail. Binary caches config update.
This commit is contained in:
parent
d155222026
commit
8233e7abf1
4 changed files with 33 additions and 28 deletions
|
|
@ -4,24 +4,7 @@
|
|||
}:
|
||||
|
||||
let
|
||||
sources = import ./npins/default.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 ];
|
||||
};
|
||||
pkgs = import ./jailed-packages.nix;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
|
|
@ -32,7 +15,6 @@ in
|
|||
./kernel.nix
|
||||
./nix.nix
|
||||
./users.nix
|
||||
<home-manager/nixos>
|
||||
];
|
||||
|
||||
programs.fuse.userAllowOther = true;
|
||||
|
|
@ -46,7 +28,7 @@ in
|
|||
virtualisation = {
|
||||
waydroid = {
|
||||
enable = true;
|
||||
package = pkgs.waydroid-nftables;
|
||||
package = pkgs.waydroid-nftables.unjailed;
|
||||
};
|
||||
docker = {
|
||||
enable = true;
|
||||
|
|
@ -111,11 +93,6 @@ in
|
|||
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.stateVersion = "26.05"; # Not here to update, here for data models backward compatibility. Don't change.
|
||||
|
|
|
|||
21
jailed-packages.nix
Normal file
21
jailed-packages.nix
Normal 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
|
||||
|
|
@ -6,7 +6,4 @@ let
|
|||
in
|
||||
{
|
||||
boot.kernelPackages = cachy-kernel;
|
||||
|
||||
nix.settings.substituters = [ "https://attic.xuyh0120.win/lantian" ];
|
||||
nix.settings.trusted-public-keys = [ "lantian:EeAUQ+W+6r7EtwnmYjeVwx5kOGEBpjlBfPlzGlTNvHc=" ];
|
||||
}
|
||||
|
|
|
|||
10
nix.nix
10
nix.nix
|
|
@ -6,4 +6,14 @@
|
|||
};
|
||||
|
||||
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="
|
||||
];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue