diff options
Diffstat (limited to 'hosts/dishwasher')
| -rw-r--r-- | hosts/dishwasher/configuration.nix | 11 | ||||
| -rw-r--r-- | hosts/dishwasher/hardware-configuration.nix | 21 | ||||
| -rw-r--r-- | hosts/dishwasher/mcvm-network.nix | 19 | ||||
| -rw-r--r-- | hosts/dishwasher/oxalab.nix | 10 |
4 files changed, 35 insertions, 26 deletions
diff --git a/hosts/dishwasher/configuration.nix b/hosts/dishwasher/configuration.nix index ea1b070..ffa9ff7 100644 --- a/hosts/dishwasher/configuration.nix +++ b/hosts/dishwasher/configuration.nix @@ -6,9 +6,10 @@ { imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; @@ -35,7 +36,7 @@ }; networkConfig = { DHCP = "yes"; - LinkLocalAddressing="ipv6"; + LinkLocalAddressing = "ipv6"; IPv6AcceptRA = "yes"; }; dhcpV6Config = { @@ -47,7 +48,7 @@ }; }; - services.resolved={ + services.resolved = { enable = true; fallbackDns = [ "8.8.8.8" diff --git a/hosts/dishwasher/hardware-configuration.nix b/hosts/dishwasher/hardware-configuration.nix index ebbd0ff..f9735fb 100644 --- a/hosts/dishwasher/hardware-configuration.nix +++ b/hosts/dishwasher/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; @@ -14,37 +15,43 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; + { + device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; fsType = "btrfs"; options = [ "subvol=nixos" "compress=zstd" "noatime" ]; }; fileSystems."/var/lib" = - { device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; + { + device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; fsType = "btrfs"; options = [ "subvol=var-lib" "compress=zstd" "noatime" ]; }; fileSystems."/var/log" = - { device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; + { + device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; fsType = "btrfs"; options = [ "subvol=var-log" "compress=zstd" "noatime" ]; }; fileSystems."/var/microvms" = - { device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; + { + device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; fsType = "btrfs"; options = [ "subvol=microvms" "compress=zstd" "noatime" ]; }; fileSystems."/nix" = - { device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; + { + device = "/dev/disk/by-uuid/2971597a-b364-405d-8bb2-287556e819e1"; fsType = "btrfs"; options = [ "subvol=nix" "compress=zstd" "noatime" ]; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/2A04-BFAE"; + { + device = "/dev/disk/by-uuid/2A04-BFAE"; fsType = "vfat"; }; diff --git a/hosts/dishwasher/mcvm-network.nix b/hosts/dishwasher/mcvm-network.nix index 518cab8..bd7c1b9 100644 --- a/hosts/dishwasher/mcvm-network.nix +++ b/hosts/dishwasher/mcvm-network.nix @@ -11,14 +11,15 @@ DHCPServer = false; IPv6SendRA = true; }; - addresses = [ { + addresses = [{ addressConfig.Address = "10.99.99.1/24"; - } { - addressConfig.Address = "fd12:3456:789a::1/64"; - } ]; - ipv6Prefixes = [ { + } + { + addressConfig.Address = "fd12:3456:789a::1/64"; + }]; + ipv6Prefixes = [{ ipv6PrefixConfig.Prefix = "fd12:3456:789a::/64"; - } ]; + }]; # networkConfig = { # Address = "10.99.99.1/24"; # IPForward = "ipv4"; @@ -27,9 +28,9 @@ # routeConfig = { # GatewayOnLink = true; # };}]; - # IPForward = "ipv4"; - # DHCPServer = true; - # IPv6SendRA = true; + # IPForward = "ipv4"; + # DHCPServer = true; + # IPv6SendRA = true; # addresses = [{ # addressConfig.Address = "10.99.99.1/24"; # }]; diff --git a/hosts/dishwasher/oxalab.nix b/hosts/dishwasher/oxalab.nix index ffe34fa..7e79971 100644 --- a/hosts/dishwasher/oxalab.nix +++ b/hosts/dishwasher/oxalab.nix @@ -15,11 +15,11 @@ { # cirrus wireguardPeerConfig = { - PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E="; - AllowedIPs = [ "10.66.66.0/24" ]; - Endpoint = [ "95.216.166.21:51820" ]; - PersistentKeepalive = 25; - }; + PublicKey = "5nCVC21BL+1r70OGwA4Q6Z/gcPLC3+ZF8sTurdn7N0E="; + AllowedIPs = [ "10.66.66.0/24" ]; + Endpoint = [ "95.216.166.21:51820" ]; + PersistentKeepalive = 25; + }; } ]; }; |