X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fsystem%2Fdilion.nix;h=b9be8b073430b7e7019526b099d5bb3fcf5684f9;hp=a59d60797dc79b7f173e1a7a6573105a021f34cc;hb=282c67a117b7d349b30a96972b050d630f906dec;hpb=97f5a24bc8839328571b23eb5f910de206ddbe1f diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix index a59d607..b9be8b0 100644 --- a/modules/private/system/dilion.nix +++ b/modules/private/system/dilion.nix @@ -1,4 +1,3 @@ -{ privateFiles }: { config, pkgs, name, lib, ... }: { deployment = { @@ -6,6 +5,8 @@ targetHost = config.hostEnv.ips.main.ip4; substituteOnDestination = true; }; + # ssh-keyscan dilion | nix-shell -p ssh-to-age --run ssh-to-age + secrets.ageKeys = [ "age1x49n6qa0arkdpq8530s7umgm0gqkq90exv4jep97q30rfnzknpaqate06a" ]; nixpkgs.system = lib.mkOverride 900 "x86_64-linux"; boot = { loader = { @@ -31,7 +32,7 @@ powerManagement.cpuFreqGovernor = "powersave"; hardware.enableRedistributableFirmware = true; - myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; + myEnv = import ../../../nixops/secrets/environment.nix; swapDevices = [ { label = "swap"; } ]; fileSystems = { @@ -88,10 +89,10 @@ isSystemUser = true; group = "libvirtd"; packages = [ pkgs.netcat-openbsd ]; - openssh.authorizedKeys.keyFiles = [ - "${privateFiles}/buildbot_ssh_key.pub" + openssh.authorizedKeys.keys = [ + config.myEnv.buildbot.ssh_key.public + config.myEnv.sshd.rootKeys.ismael_flony ]; - openssh.authorizedKeys.keys = [ config.myEnv.sshd.rootKeys.ismael_flony ]; }; users.users.backup = {