diff options
author | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2022-06-07 15:46:12 +0200 |
commit | b3786c3a74fce6a742649c37ab2ad1255f5864bf (patch) | |
tree | a5453da91d868781b2339722a4e7bf588993ac09 /makefu/1systems/iso/config.nix | |
parent | e6f67aa910f78ecf75f3a47a0794497148c60c2b (diff) | |
parent | 53855cd2d0dadb159215c5ed12e6d0be02dca98b (diff) |
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems/iso/config.nix')
-rw-r--r-- | makefu/1systems/iso/config.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/makefu/1systems/iso/config.nix b/makefu/1systems/iso/config.nix index 6c4f62310..207121236 100644 --- a/makefu/1systems/iso/config.nix +++ b/makefu/1systems/iso/config.nix @@ -9,17 +9,22 @@ with import <stockholm/lib>; # <stockholm/makefu/2configs/tools/core.nix> ./justdoit.nix { + environment.systemPackages = [ (pkgs.writeScriptBin "network-setup" '' + #!/bin/sh + ip addr add 178.254.30.202/255.255.252.0 dev ens3 + ip route add default via 178.254.28.1 + echo nameserver 1.1.1.1 > /etc/resolv.conf + '')]; kexec.justdoit = { - # bootSize = 512; - rootDevice = "/dev/sdb"; - swapSize = 1024; + bootSize = 512; + rootDevice = "/dev/vda"; bootType = "vfat"; - luksEncrypt = true; - uefi = true; + luksEncrypt = false; + uefi = false; }; } ]; - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + # boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; # TODO: NIX_PATH and nix.nixPath are being set by default.nix right now # cd ~/stockholm ; nix-build -A config.system.build.isoImage -I nixos-config=makefu/1systems/iso/config.nix -I secrets=/home/makefu/secrets/iso /var/src/nixpkgs/nixos #krebs.build.host = { cores = 0; }; @@ -33,7 +38,6 @@ with import <stockholm/lib>; EDITOR=vim ''; # iso-specific - boot.kernelParams = [ "copytoram" ]; services.openssh = { enable = true; hostKeys = [ |