From 62ac639d0870bb67e54c2786ec91bd37a93a7a01 Mon Sep 17 00:00:00 2001 From: Kabbone Date: Tue, 2 Apr 2024 11:49:46 +0200 Subject: [PATCH] hosts: server: fix initial mistakes and add pub --- hosts/default.nix | 2 +- hosts/server_big/hardware-configuration.nix | 10 ++++++++-- secrets/secrets.nix | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 790665a..3047ce7 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -144,7 +144,7 @@ in modules = [ agenix.nixosModules.default microvm.nixosModules.host - ./server + ./server_big ./configuration_server.nix nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-pc-ssd diff --git a/hosts/server_big/hardware-configuration.nix b/hosts/server_big/hardware-configuration.nix index 754c390..5e51b6b 100644 --- a/hosts/server_big/hardware-configuration.nix +++ b/hosts/server_big/hardware-configuration.nix @@ -78,6 +78,12 @@ options = [ "compress=zstd,space_cache=v2,ssd,noatime,subvol=@srv,discard=async" ]; }; + fileSystems."/var" = + { device = "/dev/disk/by-label/NIXROOT"; + fsType = "btrfs"; + options = [ "space_cache=v2,ssd,noatime,subvol=@var,discard=async" ]; + }; + fileSystems."/nix" = { device = "/dev/disk/by-label/NIXROOT"; fsType = "btrfs"; @@ -115,12 +121,12 @@ prefixLength = 24; } ]; ipv6.addresses = [ { - address = "2a13:7e80:0:ef::"; + address = "2a13:7e80:0:ef::2"; prefixLength = 64; } ]; }; }; - defaultGateway = "37.44.215.182"; + defaultGateway = "37.44.215.1"; defaultGateway6 = { address = "fe80::1"; interface = "ens18"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6be31ad..8e1cda1 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -19,6 +19,7 @@ let ]; server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDwN8p78OncPIRUfV64PLHOem4LtlQ3opOJwLEYqdGVx"; + server2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPm3epi3v+yuskxQZgmPdkVDET8IGeYA6LbTCqPWqkz+"; dmz = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAmivVLbkJJ1anwQ8CeNT7rv0Qxinp1LIQIjVWZpnIE5"; hades = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEgnWyQUUa+vcHAKx6edbTgqW8ph+MCiS6fUwYjYcS+o"; nasbak = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOdoxslkKn3ouadPOHmDN7e5AtoJmnllnUmhl1j9qfzz"; @@ -29,6 +30,7 @@ let serverrunner="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJacRr6zXpyWsN9lcu+zZ+Mu09FselLq1b6jDvOLiKPs"; systems = [ server + server2 dmz hades nasbak @@ -40,6 +42,7 @@ let ]; servers = [ server + server2 ]; homerunners = [ homerunner