Fmt & fix inet for tether & add iso pkg
This commit is contained in:
parent
fa714901d0
commit
8a765f001b
3 changed files with 30 additions and 20 deletions
12
flake.nix
12
flake.nix
|
@ -238,7 +238,17 @@
|
|||
in
|
||||
{
|
||||
formatter."${system}" = pkgs.nixpkgs-fmt;
|
||||
packages."${system}" = import ./pkgs { inherit pkgs lib config; };
|
||||
packages."${system}" =
|
||||
import ./pkgs { inherit pkgs lib config; }
|
||||
// {
|
||||
rescue-iso =
|
||||
let
|
||||
mod = "${inputs.nixos-images}/nix/image-installer/module.nix";
|
||||
os = nixpkgs.legacyPackages.${system}.nixos [ mod ];
|
||||
iso = os.config.system.build.isoImage;
|
||||
in
|
||||
iso;
|
||||
};
|
||||
diskoConfigurations = {
|
||||
nixos-desk = import ./systems/nixos-desk/disko.nix;
|
||||
nixos-pulse = import ./systems/nixos-pulse/disko.nix;
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
, relyUdev ? true
|
||||
,
|
||||
}:
|
||||
|
||||
let
|
||||
gstreamerPluginPaths = lib.concatMapStrings (pth: pth + "/lib/gstreamer-1.0:") [
|
||||
(lib.getLib gst_all_1.gstreamer)
|
||||
|
|
|
@ -225,24 +225,25 @@
|
|||
'';
|
||||
interfaces = {
|
||||
eth0 = {
|
||||
useDHCP = false;
|
||||
ipv4.addresses = [
|
||||
{
|
||||
address = "192.168.0.21";
|
||||
prefixLength = 24;
|
||||
}
|
||||
];
|
||||
ipv4.routes = [
|
||||
{
|
||||
address = "192.168.0.0";
|
||||
prefixLength = 24;
|
||||
}
|
||||
{
|
||||
address = "0.0.0.0";
|
||||
prefixLength = 0;
|
||||
via = "192.168.0.5";
|
||||
}
|
||||
];
|
||||
# useDHCP = false;
|
||||
useDHCP = true;
|
||||
# ipv4.addresses = [
|
||||
# {
|
||||
# address = "192.168.0.21";
|
||||
# prefixLength = 24;
|
||||
# }
|
||||
# ];
|
||||
# ipv4.routes = [
|
||||
# {
|
||||
# address = "192.168.0.0";
|
||||
# prefixLength = 24;
|
||||
# }
|
||||
# {
|
||||
# address = "0.0.0.0";
|
||||
# prefixLength = 0;
|
||||
# via = "192.168.0.5";
|
||||
# }
|
||||
# ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue