diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-01-18 14:15:59 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2020-01-18 14:19:05 -0500 |
| commit | fda8060dbe7a670c94d9d2ab9b2a3bc12759cc93 (patch) | |
| tree | 7de7d9990063b6fa32b52a19d83874caf2cc0ebe | |
| parent | efe541e2d9ef8d1f9fb4ea88e1f5d5f8f2c54859 (diff) | |
nixos config
| -rw-r--r-- | config/ap.nix | 1 | ||||
| -rw-r--r-- | config/pxe.nix | 12 | ||||
| -rw-r--r-- | machines/x1-pincer.nix | 10 |
3 files changed, 18 insertions, 5 deletions
diff --git a/config/ap.nix b/config/ap.nix index 2e17a1e..9bc2ef6 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -114,6 +114,7 @@ in enable = true; servers = [ "8.8.8.8" "8.8.4.4" ]; extraConfig = '' + dhcp-authoritative dhcp-range=10.64.30.100,10.64.30.255,255.255.255.0,24h dhcp-option=option:router,10.64.30.1 dhcp-option=option:dns-server,10.64.30.1 diff --git a/config/pxe.nix b/config/pxe.nix new file mode 100644 index 0000000..fcf839e --- /dev/null +++ b/config/pxe.nix @@ -0,0 +1,12 @@ +{ config, lib, pkgs, ... }: +{ + services.dnsmasq = { + extraConfig = '' + enable-tftp + tftp-root=${pkgs.ipxe} + dhcp-userclass=set:ipxe,iPXE + dhcp-boot=tag:!ipxe,undionly.kpxe + dhcp-boot=http://boot.ipxe.org/demo/boot.php + ''; + }; +} diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index 246ab0d..bc6d113 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -6,6 +6,7 @@ ../config/yubikey.nix ../config/thinkpad.nix ../config/ap.nix + # ../config/pxe.nix ]; networking = { @@ -19,13 +20,12 @@ kernelPackages = pkgs.linuxPackages_latest; kernelModules = ["xpad"]; - initrd.luks.devices = [ - { + initrd.luks.devices = { + cryptroot = { device = "/dev/sda6"; - name = "cryptroot"; allowDiscards = true; - } - ]; + }; + }; extraModprobeConfig = '' # option iwlwifi swcrypto=1 |