diff --git a/nixos/modules/profiles/cloud.nix b/nixos/modules/profiles/cloud.nix index 39e5bf1..5f33513 100644 --- a/nixos/modules/profiles/cloud.nix +++ b/nixos/modules/profiles/cloud.nix @@ -11,7 +11,7 @@ in enable = true; port = 43235; hostKeys = [ - age.secrets."${initrdHostKey}" + config.age.secrets."${initrdHostKey}".path ]; authorizedKeys = with lib; concatLists (mapAttrsToList @@ -28,7 +28,7 @@ in }; age.secrets."${initrdHostKey}" = { - file = "${secretsPath}/${initrdHostKey}"; + file = "${secretsPath}/${initrdHostKey}.age"; mode = "600"; }; } diff --git a/nixos/modules/profiles/server.nix b/nixos/modules/profiles/server.nix index 31086f2..5652560 100644 --- a/nixos/modules/profiles/server.nix +++ b/nixos/modules/profiles/server.nix @@ -15,7 +15,6 @@ with lib; { dadada.admin.enable = true; dadada.networking.localResolver.enable = true; - environment.noXlibs = mkDefault true; documentation.enable = mkDefault false; documentation.nixos.enable = mkDefault false; diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix index 4e73860..e25c9ab 100644 --- a/nixos/surgat/configuration.nix +++ b/nixos/surgat/configuration.nix @@ -9,6 +9,7 @@ in { imports = [ ./hardware-configuration.nix + ../modules/profiles/cloud.nix ]; networking.hostName = hostName; @@ -50,7 +51,10 @@ in }; networking.useDHCP = false; - networking.interfaces.ens3.useDHCP = true; + networking.interfaces.ens3 = { + useDHCP = true; + ipv4.addresses = [{ address = "49.12.3.98"; prefixLength = 32; }]; + }; networking.firewall = { enable = true; @@ -83,14 +87,6 @@ in interface = "ens3"; }; - #boot.initrd.network.ssh = { - # enable = true; - # port = 22; - # authorizedKeys = "${keys}/dadada.pub"; - # hostKeys = [ - # ]; - #}; - swapDevices = [ { device = "/var/swapfile";