summaryrefslogtreecommitdiff
path: root/hosts
diff options
context:
space:
mode:
Diffstat (limited to 'hosts')
-rw-r--r--hosts/cirrus/configuration.nix2
-rw-r--r--hosts/cirrus/hardware-configuration.nix9
-rw-r--r--hosts/cirrus/nextcloud-proxy.nix8
-rw-r--r--hosts/cirrus/wireguard-server.nix32
-rw-r--r--hosts/dishwasher/configuration.nix11
-rw-r--r--hosts/dishwasher/hardware-configuration.nix21
-rw-r--r--hosts/dishwasher/mcvm-network.nix19
-rw-r--r--hosts/dishwasher/oxalab.nix10
8 files changed, 62 insertions, 50 deletions
diff --git a/hosts/cirrus/configuration.nix b/hosts/cirrus/configuration.nix
index d26af82..6b0ba45 100644
--- a/hosts/cirrus/configuration.nix
+++ b/hosts/cirrus/configuration.nix
@@ -22,7 +22,7 @@
networks."uplink" = {
matchConfig = { Name = "enp1s0"; };
networkConfig = {
- DHCP="yes"; # hetzner suggests this as default
+ DHCP = "yes"; # hetzner suggests this as default
};
};
};
diff --git a/hosts/cirrus/hardware-configuration.nix b/hosts/cirrus/hardware-configuration.nix
index bedfc3b..0325243 100644
--- a/hosts/cirrus/hardware-configuration.nix
+++ b/hosts/cirrus/hardware-configuration.nix
@@ -5,7 +5,8 @@
{
imports =
- [ (modulesPath + "/profiles/qemu-guest.nix")
+ [
+ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sd_mod" "sr_mod" ];
@@ -14,12 +15,14 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
- { device = "/dev/disk/by-uuid/627952eb-107a-43c3-8223-bfea9af92837";
+ {
+ device = "/dev/disk/by-uuid/627952eb-107a-43c3-8223-bfea9af92837";
fsType = "ext4";
};
fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/5CA6-CCE4";
+ {
+ device = "/dev/disk/by-uuid/5CA6-CCE4";
fsType = "vfat";
};
diff --git a/hosts/cirrus/nextcloud-proxy.nix b/hosts/cirrus/nextcloud-proxy.nix
index 7e9a351..647d29f 100644
--- a/hosts/cirrus/nextcloud-proxy.nix
+++ b/hosts/cirrus/nextcloud-proxy.nix
@@ -24,14 +24,14 @@
'';
locations = {
"/" = {
- # extraConfig = '' return 503; '';
- proxyPass = "http://10.34.45.100:8080";
+ # extraConfig = '' return 503; '';
+ proxyPass = "http://10.34.45.100:8080";
};
"/well-known/carddav" = {
- return = "301 $scheme://$host/remote.php/dav";
+ return = "301 $scheme://$host/remote.php/dav";
};
"/well-known/caldav" = {
- return = "301 $scheme://$host/remote.php/dav";
+ return = "301 $scheme://$host/remote.php/dav";
};
};
diff --git a/hosts/cirrus/wireguard-server.nix b/hosts/cirrus/wireguard-server.nix
index c474e0f..ee4cf60 100644
--- a/hosts/cirrus/wireguard-server.nix
+++ b/hosts/cirrus/wireguard-server.nix
@@ -19,20 +19,20 @@
{
# microwave
wireguardPeerConfig = {
- # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
- PublicKey = "0zpfcNrmbsNwwbnDDX4SMl4BVTB0zuhGKixT9TJQoHc=";
- AllowedIPs = [ "10.66.66.10/32" ];
- PersistentKeepalive = 25;
- };
+ # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
+ PublicKey = "0zpfcNrmbsNwwbnDDX4SMl4BVTB0zuhGKixT9TJQoHc=";
+ AllowedIPs = [ "10.66.66.10/32" ];
+ PersistentKeepalive = 25;
+ };
}
{
# Dishwasher
wireguardPeerConfig = {
- # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
- PublicKey = "AdWUBbyeRkxdP9HUu25PpISoxbgQ8oeCw3BmV93xtAw=";
- AllowedIPs = [ "10.66.66.100/32" ];
- PersistentKeepalive = 25;
- };
+ # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI
+ PublicKey = "AdWUBbyeRkxdP9HUu25PpISoxbgQ8oeCw3BmV93xtAw=";
+ AllowedIPs = [ "10.66.66.100/32" ];
+ PersistentKeepalive = 25;
+ };
}
];
};
@@ -60,12 +60,12 @@
wireguardPeers = [
# nextcloud
{
- wireguardPeerConfig = {
- PublicKey ="KCYoGx7TGei4X79EZo2NONCcmQjPzBUN1Ds6I9lQbz0=";
- AllowedIPs = [ "10.34.45.100/32" ];
- PersistentKeepalive = 25;
- };
- }
+ wireguardPeerConfig = {
+ PublicKey = "KCYoGx7TGei4X79EZo2NONCcmQjPzBUN1Ds6I9lQbz0=";
+ AllowedIPs = [ "10.34.45.100/32" ];
+ PersistentKeepalive = 25;
+ };
+ }
];
};
networks."oxaproxy" = {
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;
+ };
}
];
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-07-28 06:19:45 +0000