From 6a0898753d9420670033ce7aae48fe9bb6b17d11 Mon Sep 17 00:00:00 2001
From: reo101 <pavel.atanasov2001@gmail.com>
Date: Sun, 12 Feb 2023 11:38:17 +0200
Subject: [PATCH] fix(cicd): ssh option names, `inherit (nixpkgs)  lib`

---
 flake.nix                                              |  6 +++---
 .../nixos/x86_64-linux/__template__/configuration.nix  | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5e422fc..7a70915 100644
--- a/flake.nix
+++ b/flake.nix
@@ -74,9 +74,10 @@
     } @ inputs:
     let
       inherit (self) outputs;
-      helpers = (import ./lib/helpers.nix) { lib = nixpkgs.lib; };
+      inherit (nixpkgs) lib;
+      helpers = (import ./lib/helpers.nix) { inherit lib; };
       inherit (helpers) recurseDir hasFiles hasDirectories;
-      forEachSystem = nixpkgs.lib.genAttrs [
+      forEachSystem = lib.genAttrs [
         "aarch64-linux"
         "i686-linux"
         "x86_64-linux"
@@ -93,7 +94,6 @@
 
       # Apps (`nix run`)
       apps = {};
-      apps.default = null;
 
       # Dev Shells (`nix develop`)
       devShells = forEachPkgs (pkgs:
diff --git a/machines/nixos/x86_64-linux/__template__/configuration.nix b/machines/nixos/x86_64-linux/__template__/configuration.nix
index 7db9279..536c1f5 100644
--- a/machines/nixos/x86_64-linux/__template__/configuration.nix
+++ b/machines/nixos/x86_64-linux/__template__/configuration.nix
@@ -88,10 +88,12 @@
   # Feel free to remove if you don't need it.
   services.openssh = {
     enable = true;
-    # Forbid root login through SSH.
-    permitRootLogin = "no";
-    # Use keys only. Remove if you want to SSH using password (not recommended)
-    passwordAuthentication = false;
+    settings = {
+      # Forbid root login through SSH.
+      PermitRootLogin = "no";
+      # Use keys only. Remove if you want to SSH using password (not recommended)
+      PasswordAuthentication = false;
+    };
   };
 
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion