diff options
Diffstat (limited to 'hosts/cirrus')
| -rw-r--r-- | hosts/cirrus/configuration.nix | 2 | ||||
| -rw-r--r-- | hosts/cirrus/hardware-configuration.nix | 9 | ||||
| -rw-r--r-- | hosts/cirrus/nextcloud-proxy.nix | 8 | ||||
| -rw-r--r-- | hosts/cirrus/wireguard-server.nix | 32 |
4 files changed, 27 insertions, 24 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" = { |