From 3437797721e3be9204deaf5d2264d8526dd8bc27 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 15 Mar 2023 14:39:33 +0100 Subject: profiles/base: Fix deprecated option definitions Essentially gets rid of these warnings: * The option `services.openssh.permitRootLogin' defined in `...' has been renamed to `services.openssh.settings.PermitRootLogin'. * The option `services.openssh.passwordAuthentication' defined in `...' has been renamed to `services.openssh.settings.PasswordAuthentication'. * The option `services.openssh.kbdInteractiveAuthentication' defined in `...' has been renamed to `services.openssh.settings.KbdInteractiveAuthentication'. * The option `nix.readOnlyStore' defined in `...' has been renamed to `boot.readOnlyNixStore'. Evaluation leads to the same derivation path as before, so apart from shutting up warnings this should not change any functionality. Signed-off-by: aszlig --- modules/user/aszlig/profiles/base.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'modules') diff --git a/modules/user/aszlig/profiles/base.nix b/modules/user/aszlig/profiles/base.nix index 52649cbd..de76c766 100644 --- a/modules/user/aszlig/profiles/base.nix +++ b/modules/user/aszlig/profiles/base.nix @@ -9,7 +9,8 @@ in { }; config = lib.mkIf cfg.enable { - nix.readOnlyStore = true; + boot.readOnlyNixStore = true; + nix.settings = { sandbox = true; auto-optimise-store = true; @@ -51,9 +52,11 @@ in { MaxRetentionSec=3month ''; - services.openssh.passwordAuthentication = lib.mkOverride 500 false; - services.openssh.permitRootLogin = lib.mkOverride 500 "no"; - services.openssh.kbdInteractiveAuthentication = lib.mkOverride 500 false; + services.openssh.settings = { + PasswordAuthentication = lib.mkOverride 500 false; + PermitRootLogin = lib.mkOverride 500 "no"; + KbdInteractiveAuthentication = lib.mkOverride 500 false; + }; environment.systemPackages = with pkgs; [ binutils -- cgit 1.4.1