From b9d740b9f09e5302a560a66e577516b0c53c260d Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Wed, 8 Mar 2023 21:16:55 -0500 Subject: [PATCH] changed sops key generation --- modules/misc.nix | 11 +++-------- modules/sops.nix | 5 +++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/misc.nix b/modules/misc.nix index 5b2a80a..691bf00 100644 --- a/modules/misc.nix +++ b/modules/misc.nix @@ -1,14 +1,9 @@ -_: { +_: {lib, ...}: { #enable ssh - programs = { - mtr.enable = true; #ping and traceroute - gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - }; + programs.mtr.enable = true; #ping and traceroute services.openssh = { enable = true; + hostKeys = lib.mkForce []; settings = { PermitRootLogin = "yes"; PasswordAuthentication = false; diff --git a/modules/sops.nix b/modules/sops.nix index 78a4622..9010195 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -3,6 +3,7 @@ settings, self, config, + lib, ... }: { imports = [ @@ -14,8 +15,8 @@ sops = { defaultSopsFile = "${self}/systems/${config.networking.hostName}/secrets.yaml"; age = { - sshKeyPaths = ["/home/${settings.username}/.ssh/id_ed25519"]; - keyFile = "/home/${settings.username}/.config/sops/age/keys.txt"; + sshKeyPaths = lib.mkForce ["/home/${settings.username}/.ssh/id_ed25519"]; + keyFile = "/etc/sops/age/keys.txt"; generateKey = true; }; };