diff --git a/hardware/apu.nix b/hardware/apu.nix index ae8c2ac..5a121e3 100644 --- a/hardware/apu.nix +++ b/hardware/apu.nix @@ -4,16 +4,19 @@ { config, lib, pkgs, ... }: { - imports = - [ - ]; + imports = [ ]; - boot.loader.grub.extraConfig = " - serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 - terminal_input serial - terminal_output serial - "; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ehci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.loader.grub.extraConfig = + "\n serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1\n terminal_input serial\n terminal_output serial\n "; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "ehci_pci" + "usbhid" + "usb_storage" + "sd_mod" + "sdhci_pci" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" "virtio" "tun" ]; boot.extraModulePackages = [ ]; @@ -21,6 +24,5 @@ hardware.cpu.amd.updateMicrocode = true; - nix.maxJobs = lib.mkDefault 4; } diff --git a/hardware/nuc.nix b/hardware/nuc.nix index e5d0a42..8472a64 100644 --- a/hardware/nuc.nix +++ b/hardware/nuc.nix @@ -4,16 +4,15 @@ { config, lib, pkgs, ... }: { - imports = - [ - ]; + imports = [ ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "e1000e" "virtio-pci"]; + boot.initrd.availableKernelModules = + [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "e1000e" "virtio-pci" ]; boot.initrd.kernelModules = [ ]; -# boot.kernelModules = [ "kvm-intel" "virtio" "tun" ]; + # boot.kernelModules = [ "kvm-intel" "virtio" "tun" ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; -# boot.kernelParams = [ "console=ttyS0,115200n8" ]; + # boot.kernelParams = [ "console=ttyS0,115200n8" ]; hardware.cpu.intel.updateMicrocode = true; powerManagement.cpuFreqGovernor = "ondemand"; diff --git a/hardware/wle900vx.nix b/hardware/wle900vx.nix index 8fae325..3720d61 100644 --- a/hardware/wle900vx.nix +++ b/hardware/wle900vx.nix @@ -1,14 +1,13 @@ -{ config, lib, pkgs, ... }: -{ +{ config, lib, pkgs, ... }: { boot.kernelPatches = [{ name = "ath10k-override-eeprom-regulatory-domain"; patch = ./wle900vx/ath10k-override-eeprom-regulatory-domain.patch; extraConfig = '' - EXPERT y - CFG80211_CERTIFICATION_ONUS y - ATH_REG_DYNAMIC_USER_REG_HINTS y - ATH_REG_DYNAMIC_USER_CERT_TESTING y - ATH_REG_DYNAMIC_USER_CERT_TESTING y - ''; + EXPERT y + CFG80211_CERTIFICATION_ONUS y + ATH_REG_DYNAMIC_USER_REG_HINTS y + ATH_REG_DYNAMIC_USER_CERT_TESTING y + ATH_REG_DYNAMIC_USER_CERT_TESTING y + ''; }]; } diff --git a/host/bachtel.nix b/host/bachtel.nix index 6b4a2eb..e8a6cf9 100644 --- a/host/bachtel.nix +++ b/host/bachtel.nix @@ -4,47 +4,44 @@ { config, pkgs, ... }: -let routerConfig = { - wanInterface = "wwp0s19u1u3i12"; - wireless = { - wleInterface = "wlp5s0"; - wleSSID = "hauser"; - wlePassphrase = "mifatielma"; - }; - lanInterfaces = [ "enp1s0" "enp2s0" "enp3s0" "enp4s0" ]; - lanNetwork = { - routerAddress = "10.2.1.1"; - netid = "10.2.1.0"; - revIpDomain = "1.2.10"; - prefixLength = 24; - domain = "rappi.fh2.ch"; - dhcpRange = "10.2.1.2,10.2.1.249"; - routerHostName = "bachtel"; - }; -}; - -in - -{ - - imports = - [ - ../hardware/apu.nix - ../hardware/wle900vx.nix - ../role/base - ../role/wwan - (import ../role/router routerConfig) - ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5"; - fsType = "btrfs"; - options = [ "defaults" "subvol=nixos" "noatime" ]; +let + routerConfig = { + wanInterface = "wwp0s19u1u3i12"; + wireless = { + wleInterface = "wlp5s0"; + wleSSID = "hauser"; + wlePassphrase = "mifatielma"; }; + lanInterfaces = [ "enp1s0" "enp2s0" "enp3s0" "enp4s0" ]; + lanNetwork = { + routerAddress = "10.2.1.1"; + netid = "10.2.1.0"; + revIpDomain = "1.2.10"; + prefixLength = 24; + domain = "rappi.fh2.ch"; + dhcpRange = "10.2.1.2,10.2.1.249"; + routerHostName = "bachtel"; + }; + }; + +in { + + imports = [ + ../hardware/apu.nix + ../hardware/wle900vx.nix + ../role/base + ../role/wwan + (import ../role/router routerConfig) + ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/360a6bc9-fc4e-4803-bd53-69320ac32ac5"; + fsType = "btrfs"; + options = [ "defaults" "subvol=nixos" "noatime" ]; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/73f91e99-d856-4504-b6b2-d60f855d6d95"; } - ]; + [{ device = "/dev/disk/by-uuid/73f91e99-d856-4504-b6b2-d60f855d6d95"; }]; services.wwan = { enable = true; @@ -61,7 +58,8 @@ in # Define on which hard drive you want to install Grub. boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - networking.hostName = routerConfig.lanNetwork.routerHostName; # Define your hostname. + networking.hostName = + routerConfig.lanNetwork.routerHostName; # Define your hostname. #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. #networking.wireless.networks = { # yummi = { diff --git a/host/calanda.nix b/host/calanda.nix index 3dd1505..b4f9f67 100644 --- a/host/calanda.nix +++ b/host/calanda.nix @@ -5,22 +5,20 @@ { config, pkgs, ... }: { - imports = - [ - ../hardware/apu.nix - ../role/base -# ../role/router.nix #TODO - ]; + imports = [ + ../hardware/apu.nix + ../role/base + # ../role/router.nix #TODO + ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625"; - fsType = "btrfs"; - options = [ "defaults" "subvol=nixos" "noatime" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/16efc5db-0697-4f39-b64b-fc18ac318625"; + fsType = "btrfs"; + options = [ "defaults" "subvol=nixos" "noatime" ]; + }; swapDevices = - [ { device = "/dev/disk/by-uuid/b5104a7c-4a4a-4048-a9f8-44ddb0082632"; } - ]; + [{ device = "/dev/disk/by-uuid/b5104a7c-4a4a-4048-a9f8-44ddb0082632"; }]; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/host/kastanje.nix b/host/kastanje.nix index c445b5b..2dc91d9 100644 --- a/host/kastanje.nix +++ b/host/kastanje.nix @@ -5,17 +5,13 @@ { config, pkgs, ... }: { - imports = - [ - ../hardware/apu.nix - ../role/base - ]; + imports = [ ../hardware/apu.nix ../role/base ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a"; - fsType = "btrfs"; - options = [ "defaults" "noatime" ]; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ab5a598b-6609-465f-8ab8-b894b8a5e32a"; + fsType = "btrfs"; + options = [ "defaults" "noatime" ]; + }; # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; diff --git a/host/montalin.nix b/host/montalin.nix index 01e470b..034dda3 100644 --- a/host/montalin.nix +++ b/host/montalin.nix @@ -6,13 +6,15 @@ { - imports = - [ - ../hardware/nuc.nix - ../role/base - ../role/dropbear - (import ../role/backup { systemdMount = "var-backup.mount"; borgArchiveFolder = "/var/backup/montalin";}) - ]; + imports = [ + ../hardware/nuc.nix + ../role/base + ../role/dropbear + (import ../role/backup { + systemdMount = "var-backup.mount"; + borgArchiveFolder = "/var/backup/montalin"; + }) + ]; boot.initrd.luks.devices = { "root".device = "/dev/disk/by-uuid/3a0a5071-67ab-4e13-a0b7-d31b86f5e8b1"; @@ -21,9 +23,21 @@ }; fileSystems = { - "/" = { device = "/dev/mapper/root"; fsType = "btrfs"; options = [ "defaults" "noatime" ]; }; - "/var/backup" = { device = "/dev/mapper/backup"; fsType = "ext4"; options = [ "defaults" "noauto" "noatime" ]; }; - "/boot" = { device = "/dev/disk/by-uuid/0065-E4EA"; fsType = "vfat"; options = [ "defaults" "noatime" ]; }; + "/" = { + device = "/dev/mapper/root"; + fsType = "btrfs"; + options = [ "defaults" "noatime" ]; + }; + "/var/backup" = { + device = "/dev/mapper/backup"; + fsType = "ext4"; + options = [ "defaults" "noauto" "noatime" ]; + }; + "/boot" = { + device = "/dev/disk/by-uuid/0065-E4EA"; + fsType = "vfat"; + options = [ "defaults" "noatime" ]; + }; }; swapDevices = [{ device = "/dev/mapper/swap"; }]; diff --git a/role/backup/default.nix b/role/backup/default.nix index 759304f..5348c9a 100644 --- a/role/backup/default.nix +++ b/role/backup/default.nix @@ -1,33 +1,29 @@ # Regular backup role to a separate device -{ - systemdMount, # Systemd mount name - borgArchiveFolder, # Absolute borg root folder - keepWithin? "14d", - keepWeekly? "4", - keepMonthly? "6", - keepYearly? "-1", - schedule? "13:37", # Systemd Schedule of backup timer +{ systemdMount, # Systemd mount name +borgArchiveFolder, # Absolute borg root folder +keepWithin ? "14d", keepWeekly ? "4", keepMonthly ? "6", keepYearly ? "-1" +, schedule ? "13:37", # Systemd Schedule of backup timer }: -let pkgs = import{}; -in -{ +let pkgs = import { }; +in { - systemd = { + systemd = { services.backup = { - description = "Backup of all user data and system configuration with BorgBackup"; + description = + "Backup of all user data and system configuration with BorgBackup"; serviceConfig.Type = "oneshot"; path = with pkgs; [ bash borgbackup ]; script = '' #!/usr/bin/env bash set -euo pipefail IFS=$'\n\t' - + systemctl start ${systemdMount} export BORG_REPO=${borgArchiveFolder} \ BORG_BASE_DIR=${borgArchiveFolder}/borg-base-dir - + echo "Backup started at `date`" borg create --exclude /var/backup \ --exclude /var/tmp \ @@ -37,10 +33,10 @@ in /home \ /root \ /var - + sync echo "Backup finished at `date`" - + echo "Backup prune started at `date`" borg prune --prefix '{hostname}-' \ --keep-within ${keepWithin} \ diff --git a/role/base/default.nix b/role/base/default.nix index 5f33f55..3ac430d 100644 --- a/role/base/default.nix +++ b/role/base/default.nix @@ -13,16 +13,26 @@ consoleKeyMap = "sg-latin1"; defaultLocale = "en_US.UTF-8"; }; - + environment.systemPackages = with pkgs; [ - wget curl vim tmux git ncat bind ack - fwupd pciutils dmidecode smartmontools parted + wget + curl + vim + tmux + git + ncat + bind + ack + fwupd + pciutils + dmidecode + smartmontools + parted borgbackup ]; services.fwupd.enable = true; - # Networking networking.firewall = { allowPing = true; diff --git a/role/dropbear/default.nix b/role/dropbear/default.nix index 19ab61a..210a65a 100644 --- a/role/dropbear/default.nix +++ b/role/dropbear/default.nix @@ -18,7 +18,7 @@ echo 'cryptsetup-askpass' >> /root/.profile ''; }; - boot.kernelParams = ["ip=::::montalin:eth0:dhcp"]; + boot.kernelParams = [ "ip=::::montalin:eth0:dhcp" ]; boot.initrd.postMountCommands = '' ip link set eth0 down diff --git a/role/router/default.nix b/role/router/default.nix index 9082be7..cbe0247 100644 --- a/role/router/default.nix +++ b/role/router/default.nix @@ -1,33 +1,29 @@ { - # To get the MAC address of each card, use this command: cat /sys/class/net/*device_name*/address - # Make sure to use the lower-case hex values in your udev rules. It does not like upper-case. - wanInterface, - wireless ? { - wleInterface = "wlp5s0"; - wleSSID = "hauser"; - # Generate Encrypted Passphrase with: wpa_passphrase - wlePassphrase = "a5e42b914b5ad2b7e0474c3b9b35d0843a52668d30cd6aa8650ec43263a60b6e"; - }, - lanInterfaces ? [ "enp2s0" "enp3s0" ], - lanNetwork ? { - routerAddress = "10.1.1.1"; - netid = "10.1.1.0"; - revIpDomain = "1.1.10"; - prefixLength = 24; - domain = "ilanz.fh2.ch"; - dhcpRange = "10.1.1.2,10.1.1.249"; - routerHostName = "router"; - }, -}: +# To get the MAC address of each card, use this command: cat /sys/class/net/*device_name*/address +# Make sure to use the lower-case hex values in your udev rules. It does not like upper-case. +wanInterface, wireless ? { + wleInterface = "wlp5s0"; + wleSSID = "hauser"; + # Generate Encrypted Passphrase with: wpa_passphrase + wlePassphrase = + "a5e42b914b5ad2b7e0474c3b9b35d0843a52668d30cd6aa8650ec43263a60b6e"; +}, lanInterfaces ? [ "enp2s0" "enp3s0" ], lanNetwork ? { + routerAddress = "10.1.1.1"; + netid = "10.1.1.0"; + revIpDomain = "1.1.10"; + prefixLength = 24; + domain = "ilanz.fh2.ch"; + dhcpRange = "10.1.1.2,10.1.1.249"; + routerHostName = "router"; +}, }: -let pkgs = import{}; -in -{ +let pkgs = import { }; +in { imports = [ - (import ./wireless-access-point.nix wireless) - (import ./dns-recursive.nix lanNetwork) + (import ./wireless-access-point.nix wireless) + (import ./dns-recursive.nix lanNetwork) ]; - + networking = { nat = { enable = true; @@ -37,8 +33,11 @@ in bridges.lan.interfaces = lanInterfaces ++ [ wireless.wleInterface ]; interfaces.lan = { - ipv4 = { - addresses = [ { address = lanNetwork.routerAddress; prefixLength = lanNetwork.prefixLength; } ]; + ipv4 = { + addresses = [{ + address = lanNetwork.routerAddress; + prefixLength = lanNetwork.prefixLength; + }]; }; }; firewall.trustedInterfaces = [ "lan" ]; diff --git a/role/router/dns-recursive.nix b/role/router/dns-recursive.nix index 7f10805..8aa15d3 100644 --- a/role/router/dns-recursive.nix +++ b/role/router/dns-recursive.nix @@ -1,22 +1,13 @@ +{ routerAddress, netid, revIpDomain, prefixLength, domain, dhcpRange +, routerHostName, }: -{ - routerAddress, - netid, - revIpDomain, - prefixLength, - domain, - dhcpRange, - routerHostName, -}: - -let pkgs = import{}; -in -{ +let pkgs = import { }; +in { services.unbound = { enable = true; interfaces = [ "127.0.0.1" routerAddress ]; - allowedAccess = [ "127.0.0.0/24" "${netid}/${toString prefixLength}" ]; + allowedAccess = [ "127.0.0.0/24" "${netid}/${toString prefixLength}" ]; extraConfig = '' # Custom configuration (leave this note to assure indentation!) do-not-query-localhost: no @@ -37,24 +28,24 @@ in }; services.dnsmasq.enable = true; - services.dnsmasq.extraConfig = '' + services.dnsmasq.extraConfig = '' # Listen on this specific port instead of the standard DNS port # (53). Setting this to zero completely disables DNS function, # leaving only DHCP and/or TFTP. port=5553 - + # The following two options make you a better netizen, since they # tell dnsmasq to filter out queries which the public DNS cannot # answer, and which load the servers (especially the root servers) # unnecessarily. If you have a dial-on-demand link they also stop # these requests from bringing up the link unnecessarily. - + # Never forward plain names (without a dot or domain part) domain-needed # Never forward addresses in the non-routed address spaces. bogus-priv - - + + # Uncomment this to filter useless windows-originated DNS requests # which can trigger dial-on-demand links needlessly. # Note that (amongst other things) this blocks all SRV requests, @@ -62,62 +53,62 @@ in # This option only affects forwarding, SRV records originating for # dnsmasq (via srv-host= lines) are not suppressed by it. #filterwin2k - + # Change this line if you want dns to get its upstream servers from # somewhere other that /etc/resolv.conf #resolv-file= - + # By default, dnsmasq will send queries to any of the upstream # servers it knows about and tries to favour servers to are known # to be up. Uncommenting this forces dnsmasq to try each query # with each server strictly in the order they appear in # /etc/resolv.conf #strict-order - + # If you don't want dnsmasq to read /etc/resolv.conf or any other # file, getting its servers from this file instead (see below), then # uncomment this. #no-resolv - + # If you don't want dnsmasq to poll /etc/resolv.conf or other resolv # files for changes and re-read them then uncomment this. no-poll - + # Add other name servers here, with domain specs if they are for # non-public domains. #server=/localnet/192.168.0.1 - + # Example of routing PTR queries to nameservers: this will send all # address->name queries for 192.168.3/24 to nameserver 10.1.2.3 #server=/3.168.192.in-addr.arpa/10.1.2.3 - + # Add local-only domains here, queries in these domains are answered # from /etc/hosts or DHCP only. local=/${domain}/ - + # Add domains which you want to force to an IP address here. # The example below send any host in double-click.net to a local # web-server. #address=/double-click.net/127.0.0.1 address=/${routerHostName}.${domain}/${routerAddress} - + # --address (and --server) work with IPv6 addresses too. #address=/www.thekelleys.org.uk/fe80::20d:60ff:fe36:f83 - + # You can control how dnsmasq talks to a server: this forces # queries to 10.1.2.3 to be routed via eth1 # server=10.1.2.3@eth1 - + # and this sets the source (ie local) address used to talk to # 10.1.2.3 to 192.168.1.1 port 55 (there must be a interface with that # IP on the machine, obviously). # server=10.1.2.3@192.168.1.1#55 - + # If you want dnsmasq to change uid and gid to something other # than the default, edit the following lines. #user= #group= - + # If you want dnsmasq to listen for DHCP and DNS requests only on # specified interfaces (and the loopback) give the name of the # interface (eg eth0) here. @@ -133,7 +124,7 @@ in # configure it as shown above, and then use the following line to # disable DHCP and TFTP on it. no-dhcp-interface=lo - + # On systems which support it, dnsmasq binds the wildcard address, # even when it is listening on only some interfaces. It then discards # requests that it shouldn't reply to. This has the advantage of @@ -142,18 +133,18 @@ in # uncomment this option. About the only time you may need this is when # running another nameserver on the same machine. bind-interfaces - + # If you don't want dnsmasq to read /etc/hosts, uncomment the # following line. no-hosts # or if you want it to read another file, as well as /etc/hosts, use # this. #addn-hosts=/etc/banner_add_hosts - + # Set this (and domain: see below) if you want to have a domain # automatically added to simple names in a hosts-file. expand-hosts - + # Set the domain for dnsmasq. this is optional, but if it is set, it # does the following things. # 1) Allows DHCP hosts to have fully qualified domain names, as long @@ -162,33 +153,33 @@ in # domain of all systems configured by DHCP # 3) Provides the domain part for "expand-hosts" domain=${domain} - + # Set a different domain for a particular subnet #domain=wireless.thekelleys.org.uk,192.168.2.0/24 - + # Same idea, but range rather then subnet #domain=reserved.thekelleys.org.uk,192.68.3.100,192.168.3.200 - + # Uncomment this to enable the integrated DHCP server, you need # to supply the range of addresses available for lease and optionally # a lease time. If you have more than one network, you will need to # repeat this for each network on which you want to supply DHCP # service. dhcp-range=${dhcpRange},48h - + # This is an example of a DHCP range where the netmask is given. This # is needed for networks we reach the dnsmasq DHCP server via a relay # agent. If you don't know what a DHCP relay agent is, you probably # don't need to worry about this. #dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - + # This is an example of a DHCP range which sets a tag, so that # some DHCP options may be set only for this network. #dhcp-range=set:red,192.168.0.50,192.168.0.150 - + # Use this DHCP range only when the tag "green" is set. #dhcp-range=tag:green,192.168.0.50,192.168.0.150,12h - + # Specify a subnet which can't be used for dynamic address allocation, # is available for hosts with matching --dhcp-host lines. Note that # dhcp-host declarations will be ignored unless there is a dhcp-range @@ -197,64 +188,64 @@ in # configuration on the machine running dnsmasq) it is possible to give # an explicit netmask instead. #dhcp-range=192.168.0.0,static - + # Enable DHCPv6. Note that the prefix-length does not need to be specified # and defaults to 64 if missing/ #dhcp-range=1234::2, 1234::500, 64, 12h - + # Do Router Advertisements, BUT NOT DHCP for this subnet. #dhcp-range=1234::, ra-only - + # Do Router Advertisements, BUT NOT DHCP for this subnet, also try and # add names to the DNS for the IPv6 address of SLAAC-configured dual-stack # hosts. Use the DHCPv4 lease to derive the name, network segment and # MAC address and assume that the host will also have an # IPv6 address calculated using the SLAAC alogrithm. #dhcp-range=1234::, ra-names - + # Do Router Advertisements, BUT NOT DHCP for this subnet. # Set the lifetime to 46 hours. (Note: minimum lifetime is 2 hours.) #dhcp-range=1234::, ra-only, 48h - + # Do DHCP and Router Advertisements for this subnet. Set the A bit in the RA # so that clients can use SLAAC addresses as well as DHCP ones. #dhcp-range=1234::2, 1234::500, slaac - + # Do Router Advertisements and stateless DHCP for this subnet. Clients will # not get addresses from DHCP, but they will get other configuration information. # They will use SLAAC for addresses. #dhcp-range=1234::, ra-stateless - + # Do stateless DHCP, SLAAC, and generate DNS names for SLAAC addresses # from DHCPv4 leases. #dhcp-range=1234::, ra-stateless, ra-names - + # Do router advertisements for all subnets where we're doing DHCPv6 # Unless overriden by ra-stateless, ra-names, et al, the router # advertisements will have the M and O bits set, so that the clients # get addresses and configuration from DHCPv6, and the A bit reset, so the # clients don't use SLAAC addresses. #enable-ra - + # Supply parameters for specified hosts using DHCP. There are lots # of valid alternatives, so we will give examples of each. Note that # IP addresses DO NOT have to be in the range given above, they just # need to be on the same network. The order of the parameters in these # do not matter, it's permissible to give name, address and MAC in any # order. - + # Always allocate the host with Ethernet address 11:22:33:44:55:66 # The IP address 192.168.0.60 #dhcp-host=11:22:33:44:55:66,192.168.0.60 - + # Always set the name of the host with hardware address # 11:22:33:44:55:66 to be "fred" #dhcp-host=11:22:33:44:55:66,fred - + # Always give the host with Ethernet address 11:22:33:44:55:66 # the name fred and IP address 192.168.0.60 and lease time 45 minutes #dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - + # Give a host with Ethernet address 11:22:33:44:55:66 or # 12:34:56:78:90:12 the IP address 192.168.0.60. Dnsmasq will assume # that these two Ethernet interfaces will never be in use at the same @@ -262,72 +253,72 @@ in # in use by the first. Useful for laptops with wired and wireless # addresses. #dhcp-host=11:22:33:44:55:66,12:34:56:78:90:12,192.168.0.60 - + # Give the machine which says its name is "bert" IP address # 192.168.0.70 and an infinite lease #dhcp-host=bert,192.168.0.70,infinite - + # Always give the host with client identifier 01:02:02:04 # the IP address 192.168.0.60 #dhcp-host=id:01:02:02:04,192.168.0.60 - + # Always give the host with client identifier "marjorie" # the IP address 192.168.0.60 #dhcp-host=id:marjorie,192.168.0.60 - + # Enable the address given for "judge" in /etc/hosts # to be given to a machine presenting the name "judge" when # it asks for a DHCP lease. #dhcp-host=judge - + # Never offer DHCP service to a machine whose Ethernet # address is 11:22:33:44:55:66 #dhcp-host=11:22:33:44:55:66,ignore - + # Ignore any client-id presented by the machine with Ethernet # address 11:22:33:44:55:66. This is useful to prevent a machine # being treated differently when running under different OS's or # between PXE boot and OS boot. #dhcp-host=11:22:33:44:55:66,id:* - + # Send extra options which are tagged as "red" to # the machine with Ethernet address 11:22:33:44:55:66 #dhcp-host=11:22:33:44:55:66,set:red - + # Send extra options which are tagged as "red" to # any machine with Ethernet address starting 11:22:33: #dhcp-host=11:22:33:*:*:*,set:red - + # Give a fixed IPv6 address and name to client with # DUID 00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2 # Note the MAC addresses CANNOT be used to identify DHCPv6 clients. # Note also the they [] around the IPv6 address are obilgatory. #dhcp-host=id:00:01:00:01:16:d2:83:fc:92:d4:19:e2:d8:b2, fred, [1234::5] - + # Ignore any clients which are not specified in dhcp-host lines # or /etc/ethers. Equivalent to ISC "deny unknown-clients". # This relies on the special "known" tag which is set when # a host is matched. #dhcp-ignore=tag:!known - + # Send extra options which are tagged as "red" to any machine whose # DHCP vendorclass string includes the substring "Linux" #dhcp-vendorclass=set:red,Linux - + # Send extra options which are tagged as "red" to any machine one # of whose DHCP userclass strings includes the substring "accounts" #dhcp-userclass=set:red,accounts - + # Send extra options which are tagged as "red" to any machine whose # MAC address matches the pattern. #dhcp-mac=set:red,00:60:8C:*:*:* - + # If this line is uncommented, dnsmasq will read /etc/ethers and act # on the ethernet-address/IP pairs found there just as if they had # been given as --dhcp-host options. Useful if you keep # MAC-address/host mappings there for other purposes. #read-ethers - + # Send options to hosts which ask for a DHCP lease. # See RFC 2132 for details of available options. # Common options can be given to dnsmasq by name: @@ -338,53 +329,53 @@ in # any dhcp-options. If you use Windows clients and Samba, there # are some options which are recommended, they are detailed at the # end of this section. - + # Override the default route supplied by dnsmasq, which assumes the # router is the same machine as the one running dnsmasq. #dhcp-option=3,1.2.3.4 dhcp-option=6,${routerAddress} - + # Do the same thing, but using the option name #dhcp-option=option:router,1.2.3.4 - + # Override the default route supplied by dnsmasq and send no default # route at all. Note that this only works for the options sent by # default (1, 3, 6, 12, 28) the same line will send a zero-length option # for all other option numbers. #dhcp-option=3 - + # Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 #dhcp-option=option:ntp-server,192.168.0.4,10.10.0.5 - + # Send DHCPv6 option. Note [] around IPv6 addresses. #dhcp-option=option6:dns-server,[1234::77],[1234::88] - + # Send DHCPv6 option for namservers as the machine running # dnsmasq and another. #dhcp-option=option6:dns-server,[::],[1234::88] - + # Set the NTP time server address to be the same machine as # is running dnsmasq #dhcp-option=42,0.0.0.0 - + # Set the NIS domain name to "welly" #dhcp-option=40,welly - + # Set the default time-to-live to 50 #dhcp-option=23,50 - + # Set the "all subnets are local" flag #dhcp-option=27,1 - + # Send the etherboot magic flag and then etherboot options (a string). #dhcp-option=128,e4:45:74:68:00:00 #dhcp-option=129,NIC=eepro100 - + # Specify an option which will only be sent to the "red" network # (see dhcp-range for the declaration of the "red" network) # Note that the tag: part must precede the option: part. #dhcp-option = tag:red, option:ntp-server, 192.168.1.1 - + # The following DHCP options set up dnsmasq in the same way as is specified # for the ISC dhcpcd in # http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt @@ -396,17 +387,17 @@ in #dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) #dhcp-option=45,0.0.0.0 # netbios datagram distribution server #dhcp-option=46,8 # netbios node type - + # Send an empty WPAD option. This may be REQUIRED to get windows 7 to behave. #dhcp-option=252,"\n" - + # Send RFC-3397 DNS domain search DHCP option. WARNING: Your DHCP client # probably doesn't support this...... dhcp-option=option:domain-search,${domain} - + # Send RFC-3442 classless static routes (note the netmask encoding) #dhcp-option=121,192.168.1.0/24,1.2.3.4,10.0.0.0/8,5.6.7.8 - + # Send vendor-class specific options encapsulated in DHCP option 43. # The meaning of the options is defined by the vendor-class so # options are sent only when the client supplied vendor class @@ -414,17 +405,17 @@ in # matches "MSFT" and "MSFT 5.0"). This example sets the # mtftp address to 0.0.0.0 for PXEClients. #dhcp-option=vendor:PXEClient,1,0.0.0.0 - + # Send microsoft-specific option to tell windows to release the DHCP lease # when it shuts down. Note the "i" flag, to tell dnsmasq to send the # value as a four-byte integer - that's what microsoft wants. See # http://technet2.microsoft.com/WindowsServer/en/library/a70f1bb7-d2d4-49f0-96d6-4b7414ecfaae1033.mspx?mfr=true #dhcp-option=vendor:MSFT,2,1i - + # Send the Encapsulated-vendor-class ID needed by some configurations of # Etherboot to allow is to recognise the DHCP server. #dhcp-option=vendor:Etherboot,60,"Etherboot" - + # Send options to PXELinux. Note that we need to send the options even # though they don't appear in the parameter request list, so we need # to use dhcp-option-force here. @@ -437,23 +428,23 @@ in #dhcp-option-force=210,/tftpboot/pxelinux/files/ # Reboot time. (Note 'i' to send 32-bit value) #dhcp-option-force=211,30i - + # Set the boot filename for netboot/PXE. You will only need # this is you want to boot machines over the network and you will need # a TFTP server; either dnsmasq's built in TFTP server or an # external one. (See below for how to enable the TFTP server.) #dhcp-boot=pxelinux.0 - + # The same as above, but use custom tftp-server instead machine running dnsmasq #dhcp-boot=pxelinux,server.name,192.168.1.100 - + # Boot for Etherboot gPXE. The idea is to send two different # filenames, the first loads gPXE, and the second tells gPXE what to # load. The dhcp-match sets the gpxe tag for requests from gPXE. #dhcp-match=set:gpxe,175 # gPXE sends a 175 option. #dhcp-boot=tag:!gpxe,undionly.kpxe #dhcp-boot=mybootimage - + # Encapsulated options for Etherboot gPXE. All the options are # encapsulated within option 175 #dhcp-option=encap:175, 1, 5b # priority code @@ -462,65 +453,65 @@ in #dhcp-option=encap:175, 189, 1b # BIOS drive code #dhcp-option=encap:175, 190, user # iSCSI username #dhcp-option=encap:175, 191, pass # iSCSI password - + # Test for the architecture of a netboot client. PXE clients are # supposed to send their architecture as option 93. (See RFC 4578) #dhcp-match=peecees, option:client-arch, 0 #x86-32 #dhcp-match=itanics, option:client-arch, 2 #IA64 #dhcp-match=hammers, option:client-arch, 6 #x86-64 #dhcp-match=mactels, option:client-arch, 7 #EFI x86-64 - + # Do real PXE, rather than just booting a single file, this is an # alternative to dhcp-boot. #pxe-prompt="What system shall I netboot?" # or with timeout before first available action is taken: #pxe-prompt="Press F8 for menu.", 60 - + # Available boot services. for PXE. #pxe-service=x86PC, "Boot from local disk" - + # Loads /pxelinux.0 from dnsmasq TFTP server. #pxe-service=x86PC, "Install Linux", pxelinux - + # Loads /pxelinux.0 from TFTP server at 1.2.3.4. # Beware this fails on old PXE ROMS. #pxe-service=x86PC, "Install Linux", pxelinux, 1.2.3.4 - + # Use bootserver on network, found my multicast or broadcast. #pxe-service=x86PC, "Install windows from RIS server", 1 - + # Use bootserver at a known IP address. #pxe-service=x86PC, "Install windows from RIS server", 1, 1.2.3.4 - + # If you have multicast-FTP available, # information for that can be passed in a similar way using options 1 # to 5. See page 19 of # http://download.intel.com/design/archives/wfm/downloads/pxespec.pdf - - + + # Enable dnsmasq's built-in TFTP server #enable-tftp - + # Set the root directory for files available via FTP. #tftp-root=/var/ftpd - + # Make the TFTP server more secure: with this set, only files owned by # the user dnsmasq is running as will be send over the net. #tftp-secure - + # This option stops dnsmasq from negotiating a larger blocksize for TFTP # transfers. It will slow things down, but may rescue some broken TFTP # clients. #tftp-no-blocksize - + # Set the boot file name only when the "red" tag is set. #dhcp-boot=net:red,pxelinux.red-net - + # An example of dhcp-boot with an external TFTP server: the name and IP # address of the server are given after the filename. # Can fail with old PXE ROMS. Overridden by --pxe-service. #dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - + # If there are multiple external tftp servers having a same name # (using /etc/hosts) then that name can be specified as the # tftp_servername (the third option to dhcp-boot) and in that @@ -528,15 +519,15 @@ in # addresses in round robin fasion. This facility can be used to # load balance the tftp load among a set of servers. #dhcp-boot=/var/ftpd/pxelinux.0,boothost,tftp_server_name - + # Set the limit on DHCP leases, the default is 150 #dhcp-lease-max=150 - + # The DHCP server needs somewhere on disk to keep its lease database. # This defaults to a sane location, but if you want to change it, use # the line below. #dhcp-leasefile=/var/lib/misc/dnsmasq.leases - + # Set the DHCP server to authoritative mode. In this mode it will barge in # and take over the lease for any client which broadcasts on the network, # whether it has a record of the lease or not. This avoids long timeouts @@ -546,33 +537,33 @@ in # the same option, and this URL provides more information: # http://www.isc.org/files/auth.html dhcp-authoritative - + # Run an executable when a DHCP lease is created or destroyed. # The arguments sent to the script are "add" or "del", # then the MAC address, the IP address and finally the hostname # if there is one. #dhcp-script=/bin/echo - + # Set the cachesize here. #cache-size=150 - + # If you want to disable negative caching, uncomment this. #no-negcache - + # Normally responses which come form /etc/hosts and the DHCP lease # file have Time-To-Live set as zero, which conventionally means # do not cache further. If you are happy to trade lower load on the # server for potentially stale date, you can set a time-to-live (in # seconds) here. #local-ttl= - + # If you want dnsmasq to detect attempts by Verisign to send queries # to unregistered .com and .net hosts to its sitefinder service and # have dnsmasq instead return the correct NXDOMAIN response, uncomment # this line. You can add similar lines to do the same for other # registries which have implemented wildcard A records. #bogus-nxdomain=64.94.110.11 - + # If you want to fix up DNS results from upstream servers, use the # alias option. This only works for IPv4. # This alias makes a result of 1.2.3.4 appear as 5.6.7.8 @@ -581,23 +572,23 @@ in #alias=1.2.3.0,5.6.7.0,255.255.255.0 # and this maps 192.168.0.10->192.168.0.40 to 10.0.0.10->10.0.0.40 #alias=192.168.0.10-192.168.0.40,10.0.0.0,255.255.255.0 - + # Change these lines if you want dnsmasq to serve MX records. - + # Return an MX record named "maildomain.com" with target # servermachine.com and preference 50 #mx-host=maildomain.com,servermachine.com,50 - + # Set the default target for MX records created using the localmx option. #mx-target=servermachine.com - + # Return an MX record pointing to the mx-target for all local # machines. #localmx - + # Return an MX record pointing to itself for all local machines. #selfmx - + # Change the following lines if you want dnsmasq to serve SRV # records. These are useful if you want to serve ldap requests for # Active Directory and other windows-originated DNS requests. @@ -608,55 +599,53 @@ in # service and protocol sections) then the domain given by the domain= # config option is used. (Note that expand-hosts does not need to be # set for this to work.) - + # A SRV record sending LDAP for the example.com domain to # ldapserver.example.com port 389 #srv-host=_ldap._tcp.example.com,ldapserver.example.com,389 - + # A SRV record sending LDAP for the example.com domain to # ldapserver.example.com port 389 (using domain=) #domain=example.com #srv-host=_ldap._tcp,ldapserver.example.com,389 - + # Two SRV records for LDAP, each with different priorities #srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,1 #srv-host=_ldap._tcp.example.com,ldapserver.example.com,389,2 - + # A SRV record indicating that there is no LDAP server for the domain # example.com #srv-host=_ldap._tcp.example.com - + # The following line shows how to make dnsmasq serve an arbitrary PTR # record. This is useful for DNS-SD. (Note that the # domain-name expansion done for SRV records _does_not # occur for PTR records.) #ptr-record=_http._tcp.dns-sd-services,"New Employee Page._http._tcp.dns-sd-services" - + # Change the following lines to enable dnsmasq to serve TXT records. # These are used for things like SPF and zeroconf. (Note that the # domain-name expansion done for SRV records _does_not # occur for TXT records.) - + #Example SPF. #txt-record=example.com,"v=spf1 a -all" - + #Example zeroconf #txt-record=_http._tcp.example.com,name=value,paper=A4 - + # Provide an alias for a "local" DNS name. Note that this _only_ works # for targets which are names from DHCP or /etc/hosts. Give host # "bert" another name, bertrand #cname=bertand,bert - + # For debugging purposes, log each DNS query as it passes through # dnsmasq. #log-queries - + # Log lots of extra information about DHCP transactions. #log-dhcp ''; - systemd.services.dnsmasq = { - bindsTo = [ "network-addresses-lan.service" ]; - }; + systemd.services.dnsmasq = { bindsTo = [ "network-addresses-lan.service" ]; }; } diff --git a/role/router/wireless-access-point.nix b/role/router/wireless-access-point.nix index 496011c..27da08f 100644 --- a/role/router/wireless-access-point.nix +++ b/role/router/wireless-access-point.nix @@ -1,15 +1,12 @@ -{ - wleInterface, - wleSSID, - # Generate Encrypted Passphrase with: wpa_passphrase - wlePassphrase, - # TODO: Type - # TODO: Multi-Band, if available +{ wleInterface, wleSSID, +# Generate Encrypted Passphrase with: wpa_passphrase +wlePassphrase, +# TODO: Type +# TODO: Multi-Band, if available }: -let pkgs = import{}; -in -{ +let pkgs = import { }; +in { boot.extraModprobeConfig = '' options cfg80211 ieee80211_regdom=US ''; diff --git a/role/wwan/default.nix b/role/wwan/default.nix index fa6cd6e..71899ab 100644 --- a/role/wwan/default.nix +++ b/role/wwan/default.nix @@ -24,47 +24,48 @@ let systemctl restart wwan.service fi ''; -in -{ +in { options.services.wwan = { enable = mkEnableOption "wwan client service"; apn = mkOption { - type = types.str; + type = types.str; description = '' - APN domain of provider. + APN domain of provider. ''; }; apnUser = mkOption { - type = types.str; + type = types.str; default = ""; description = '' - APN username (optional). + APN username (optional). ''; }; apnPass = mkOption { - type = types.str; + type = types.str; default = ""; description = '' - APN password (optional). + APN password (optional). ''; }; apnAuth = mkOption { - type = types.enum [ "PAP" "CHAP" "MSCHAPV2" "" ]; + type = types.enum [ "PAP" "CHAP" "MSCHAPV2" "" ]; default = ""; description = '' - APN authentication type, one of ${concatMapStringsSep ", " show values} (optional). + APN authentication type, one of ${ + concatMapStringsSep ", " show values + } (optional). ''; }; mbimProxy = mkOption { - type = types.bool; + type = types.bool; default = true; description = '' - Whether to use the mbim proxy or not. + Whether to use the mbim proxy or not. ''; }; @@ -91,8 +92,10 @@ in path = with pkgs; [ libmbim iproute ]; serviceConfig = { - ExecStart = "${mbim-ip-configured}/bin/mbim-ip-configured start ${cfg.networkInterface}"; - ExecStop = "${mbim-ip-configured}/bin/mbim-ip-configured stop ${cfg.networkInterface}"; + ExecStart = + "${mbim-ip-configured}/bin/mbim-ip-configured start ${cfg.networkInterface}"; + ExecStop = + "${mbim-ip-configured}/bin/mbim-ip-configured stop ${cfg.networkInterface}"; RemainAfterExit = true; }; @@ -111,8 +114,8 @@ in wantedBy = [ "timers.target" ]; timerConfig = { Unit = "wwan-check"; - OnBootSec="2m"; - OnUnitActiveSec="1m"; + OnBootSec = "2m"; + OnUnitActiveSec = "1m"; }; };