diff --git a/configuration.nix b/configuration.nix index c082ea3..1e145f4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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 - ]; 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. diff --git a/jailed-packages.nix b/jailed-packages.nix new file mode 100644 index 0000000..02ac73f --- /dev/null +++ b/jailed-packages.nix @@ -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 diff --git a/kernel.nix b/kernel.nix index 79ab665..c0d782f 100644 --- a/kernel.nix +++ b/kernel.nix @@ -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=" ]; } diff --git a/nix.nix b/nix.nix index 3d543f9..6bd7cde 100644 --- a/nix.nix +++ b/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=" + ]; }