diff options
Diffstat (limited to 'modules/private/system/dilion.nix')
-rw-r--r-- | modules/private/system/dilion.nix | 11 |
1 files changed, 6 insertions, 5 deletions
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 @@ | |||
1 | { privateFiles }: | ||
2 | { config, pkgs, name, lib, ... }: | 1 | { config, pkgs, name, lib, ... }: |
3 | { | 2 | { |
4 | deployment = { | 3 | deployment = { |
@@ -6,6 +5,8 @@ | |||
6 | targetHost = config.hostEnv.ips.main.ip4; | 5 | targetHost = config.hostEnv.ips.main.ip4; |
7 | substituteOnDestination = true; | 6 | substituteOnDestination = true; |
8 | }; | 7 | }; |
8 | # ssh-keyscan dilion | nix-shell -p ssh-to-age --run ssh-to-age | ||
9 | secrets.ageKeys = [ "age1x49n6qa0arkdpq8530s7umgm0gqkq90exv4jep97q30rfnzknpaqate06a" ]; | ||
9 | nixpkgs.system = lib.mkOverride 900 "x86_64-linux"; | 10 | nixpkgs.system = lib.mkOverride 900 "x86_64-linux"; |
10 | boot = { | 11 | boot = { |
11 | loader = { | 12 | loader = { |
@@ -31,7 +32,7 @@ | |||
31 | powerManagement.cpuFreqGovernor = "powersave"; | 32 | powerManagement.cpuFreqGovernor = "powersave"; |
32 | hardware.enableRedistributableFirmware = true; | 33 | hardware.enableRedistributableFirmware = true; |
33 | 34 | ||
34 | myEnv = import "${privateFiles}/environment.nix" // { inherit privateFiles; }; | 35 | myEnv = import ../../../nixops/secrets/environment.nix; |
35 | 36 | ||
36 | swapDevices = [ { label = "swap"; } ]; | 37 | swapDevices = [ { label = "swap"; } ]; |
37 | fileSystems = { | 38 | fileSystems = { |
@@ -88,10 +89,10 @@ | |||
88 | isSystemUser = true; | 89 | isSystemUser = true; |
89 | group = "libvirtd"; | 90 | group = "libvirtd"; |
90 | packages = [ pkgs.netcat-openbsd ]; | 91 | packages = [ pkgs.netcat-openbsd ]; |
91 | openssh.authorizedKeys.keyFiles = [ | 92 | openssh.authorizedKeys.keys = [ |
92 | "${privateFiles}/buildbot_ssh_key.pub" | 93 | config.myEnv.buildbot.ssh_key.public |
94 | config.myEnv.sshd.rootKeys.ismael_flony | ||
93 | ]; | 95 | ]; |
94 | openssh.authorizedKeys.keys = [ config.myEnv.sshd.rootKeys.ismael_flony ]; | ||
95 | }; | 96 | }; |
96 | 97 | ||
97 | users.users.backup = { | 98 | users.users.backup = { |