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/target-config.nix | |
| parent | e6f67aa910f78ecf75f3a47a0794497148c60c2b (diff) | |
| parent | 53855cd2d0dadb159215c5ed12e6d0be02dca98b (diff) | |
Merge remote-tracking branch 'gum/22.05'
Diffstat (limited to 'makefu/1systems/iso/target-config.nix')
| -rw-r--r-- | makefu/1systems/iso/target-config.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/makefu/1systems/iso/target-config.nix b/makefu/1systems/iso/target-config.nix index 6915e4137..59d2960bc 100644 --- a/makefu/1systems/iso/target-config.nix +++ b/makefu/1systems/iso/target-config.nix @@ -1,12 +1,12 @@ -{ lib, ... }: +{ pkgs, lib, ... }: { imports = [ ./hardware-configuration.nix ./generated.nix ]; boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.zfs.devNodes = "/dev"; # fixes some virtualmachine issues - boot.zfs.forceImportRoot = false; - boot.zfs.forceImportAll = false; + #boot.zfs.forceImportRoot = false; + #boot.zfs.forceImportAll = false; boot.kernelParams = [ "boot.shell_on_fail" "panic=30" "boot.panic_on_fail" # reboot the machine upon fatal boot issues @@ -18,8 +18,15 @@ SystemMaxUse=1G RuntimeMaxUse=128M ''; + 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 + '')]; # minimal + boot.supportedFilesystems = [ "zfs" ]; programs.command-not-found.enable = false; time.timeZone = "Europe/Berlin"; programs.ssh.startAgent = false; @@ -36,5 +43,4 @@ "net.ipv6.conf.all.use_tempaddr" = lib.mkDefault "2"; "net.ipv6.conf.default.use_tempaddr" = lib.mkDefault "2"; }; - services.nscd.enable = false; } |