about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2023-03-15 14:39:33 +0100
committeraszlig <aszlig@nix.build>2023-03-15 14:39:33 +0100
commit3437797721e3be9204deaf5d2264d8526dd8bc27 (patch)
tree5b499eee7e81561722606b94c00131df3dc3d201
parentc1d772ec004c83413af2eb790e3fe719ad61c622 (diff)
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 <aszlig@nix.build>
-rw-r--r--modules/user/aszlig/profiles/base.nix11
1 files changed, 7 insertions, 4 deletions
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