diff --git a/hosts/tor/default.nix b/hosts/tor/default.nix index 4686cfe..8e81e65 100644 --- a/hosts/tor/default.nix +++ b/hosts/tor/default.nix @@ -14,7 +14,7 @@ loader = { grub = { enable = true; - device = "/dev/vda"; + device = "/dev/sda"; }; }; initrd.luks.devices.crypted.device = "/dev/disk/by-label/crypted"; diff --git a/hosts/tor/hardware.nix b/hosts/tor/hardware.nix index 5f2eda7..0a546a1 100644 --- a/hosts/tor/hardware.nix +++ b/hosts/tor/hardware.nix @@ -9,7 +9,7 @@ (modulesPath + "/profiles/qemu-guest.nix") ]; - boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk"]; boot.initrd.kernelModules = ["dm-snapshot"]; boot.kernelModules = []; boot.extraModulePackages = []; diff --git a/hosts/tor/network.nix b/hosts/tor/network.nix index ac60e16..a4c24cf 100644 --- a/hosts/tor/network.nix +++ b/hosts/tor/network.nix @@ -8,21 +8,19 @@ systemd.network = { networks."10-lan" = { - # IPv4 settings are from `sudo dhcpcd --test`. - # IPv6 settings are from https://www.ssdvps.dk/knowledgebase/18/IPv6-Gateway.html. - matchConfig.Name = "ens3"; + matchConfig.Name = "enp0s18"; address = [ - "91.210.59.57/25" - "2a12:bec4:11d3:de9f::1/64" + "185.231.102.51/24" + "2a0c:5700:3133:650:b0ea:eeff:fedb:1f7b/64" ]; routes = [ - {routeConfig = {Gateway = "91.210.59.1";};} - { - routeConfig = { - Gateway = "2a12:bec4:11d3::1"; - GatewayOnLink = true; - }; - } + {routeConfig = {Gateway = "185.231.102.1";};} + # { + # routeConfig = { + # Gateway = "fe80::200:5eff:fe00:20c"; + # GatewayOnLink = true; + # }; + # } ]; }; }; diff --git a/hosts/tor/tor.nix b/hosts/tor/tor.nix index 17c9ffe..7aee169 100644 --- a/hosts/tor/tor.nix +++ b/hosts/tor/tor.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { services.tor = { enable = true; openFirewall = true; @@ -15,11 +11,11 @@ ContactInfo = "admin@caspervk.net"; ORPort = [ { - addr = "91.210.59.57"; + addr = "185.231.102.51"; port = 443; } { - addr = "[2a12:bec4:11d3:de9f::1]"; + addr = "[2a0c:5700:3133:650:b0ea:eeff:fedb:1f7b]"; port = 443; } ];