From e237da22a62c05a18950b41e79249daa64e5c099 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 1 Jun 2023 19:23:39 +0200 Subject: [PATCH 1/2] base: switch to new sshd settings format --- base/programs.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base/programs.nix b/base/programs.nix index 3c5d4e4..b9406bd 100644 --- a/base/programs.nix +++ b/base/programs.nix @@ -9,11 +9,11 @@ }; services.openssh = { - passwordAuthentication = false; - permitRootLogin = "no"; - extraConfig = '' - StreamLocalBindUnlink yes - ''; + settings = { + PasswordAuthentication = false; + PermitRootLogin = "no"; + StreamLocalBindUnlink = true; + }; }; environment.systemPackages = builtins.attrValues { From 26d7a0bcd4e1b32b8e4043f4c1d8b60caeadd4b4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 1 Jun 2023 19:24:08 +0200 Subject: [PATCH 2/2] hosts: switch to new tmpfs setting name --- hosts/boreal/default.nix | 2 +- hosts/hades/default.nix | 2 +- hosts/zephyrus/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index 45b7d44..c6d9c3f 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -22,7 +22,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.tmpOnTmpfs = true; + boot.tmp.useTmpfs = true; boot.supportedFilesystems = [ "btrfs" diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index 5e446aa..ddab4b7 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -24,7 +24,7 @@ in { devices = ["/dev/sda" "/dev/sdb"]; }; - boot.tmpOnTmpfs = true; + boot.tmp.UseTmpfs = true; networking.hostName = "hades"; # Define your hostname. networking.domain = "alarsyo.net"; diff --git a/hosts/zephyrus/default.nix b/hosts/zephyrus/default.nix index 05355c7..4e1b423 100644 --- a/hosts/zephyrus/default.nix +++ b/hosts/zephyrus/default.nix @@ -20,7 +20,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.tmpOnTmpfs = true; + boot.tmp.useTmpfs = true; services.btrfs = { autoScrub = {