From bef474ed7830db7db458d3650fa1eb6ebd5ecb7a Mon Sep 17 00:00:00 2001 From: unexplrd Date: Sun, 6 Apr 2025 13:24:23 +0300 Subject: [PATCH] hosts/dunamis/nix.nix: sync nix hosts/eldrid/nix.nix: sync nix hosts/sarien/nix.nix: sync nix Signed-off-by: unexplrd --- hosts/dunamis/nix.nix | 4 +++- hosts/eldrid/nix.nix | 14 ++++++++++---- hosts/sarien/nix.nix | 12 ++++++++---- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/hosts/dunamis/nix.nix b/hosts/dunamis/nix.nix index 488e915..e5b5925 100644 --- a/hosts/dunamis/nix.nix +++ b/hosts/dunamis/nix.nix @@ -2,12 +2,14 @@ { config, inputs, + # pkgs, ... }: { imports = with inputs; [ - lix.nixosModules.default + determinate.nixosModules.default ]; nix = { + # package = pkgs.lix; channel.enable = false; settings.experimental-features = ["nix-command" "flakes"]; daemonCPUSchedPolicy = "idle"; diff --git a/hosts/eldrid/nix.nix b/hosts/eldrid/nix.nix index 6dadc3e..31cb5d3 100644 --- a/hosts/eldrid/nix.nix +++ b/hosts/eldrid/nix.nix @@ -1,12 +1,18 @@ +# TODO: better file name { config, inputs, + # pkgs, ... -}: { +}: let + inherit (config.sops) secrets; + inherit (inputs) mysecrets; +in { imports = with inputs; [ - lix.nixosModules.default + determinate.nixosModules.default ]; nix = { + # package = pkgs.lix; channel.enable = false; daemonCPUSchedPolicy = "idle"; settings = { @@ -19,9 +25,9 @@ hostName = "dunamis"; sshUser = "nix-ssh"; system = "x86_64-linux"; - sshKey = config.sops.secrets."ssh-eldrid-user".path; + sshKey = secrets."ssh-eldrid-user".path; supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"]; - publicHostKey = builtins.readFile "${inputs.mysecrets}/ssh/ssh_host_ed25519_dunamis.base64"; + publicHostKey = builtins.readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64"; } ]; }; diff --git a/hosts/sarien/nix.nix b/hosts/sarien/nix.nix index f647e67..31cb5d3 100644 --- a/hosts/sarien/nix.nix +++ b/hosts/sarien/nix.nix @@ -1,9 +1,13 @@ +# TODO: better file name { config, inputs, - pkgs, + # pkgs, ... -}: { +}: let + inherit (config.sops) secrets; + inherit (inputs) mysecrets; +in { imports = with inputs; [ determinate.nixosModules.default ]; @@ -21,9 +25,9 @@ hostName = "dunamis"; sshUser = "nix-ssh"; system = "x86_64-linux"; - sshKey = config.sops.secrets."ssh-sarien-user".path; + sshKey = secrets."ssh-eldrid-user".path; supportedFeatures = ["nixos-test" "big-parallel" "kvm" "benchmark"]; - publicHostKey = builtins.readFile "${inputs.mysecrets}/ssh/ssh_host_ed25519_dunamis.base64"; + publicHostKey = builtins.readFile "${mysecrets}/ssh/ssh_host_ed25519_dunamis.base64"; } ]; };