From da6a7d5c69aa3e8b70755e88be0f44b642422114 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 7 Dec 2023 20:32:45 +0100
Subject: bump

---
 modules/envfs.nix               |  8 ++++++++
 modules/openssh.nix             | 12 ++++++------
 modules/pgbackrest.nix          |  2 ++
 modules/tinc-networkmanager.nix |  1 +
 modules/uucp.nix                |  5 +++++
 5 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/envfs.nix b/modules/envfs.nix
index 1463dce8..83cad8d0 100644
--- a/modules/envfs.nix
+++ b/modules/envfs.nix
@@ -50,6 +50,14 @@ in {
             ln -s ${config.environment.binsh} $out/sh
           '')
         ];
+        defaultText = lib.literalExpression ''
+          [ (pkgs.runCommand "fallback-path-environment" {} '''
+              mkdir -p $out
+              ln -s ''${config.environment.usrbinenv} $out/env
+              ln -s ''${config.environment.binsh} $out/sh
+            ''')
+          ]
+        '';
         description = lib.mdDoc "Extra packages to join into collection of fallback executables in case not other executable is found";
       };
     };
diff --git a/modules/openssh.nix b/modules/openssh.nix
index b5950610..78749869 100644
--- a/modules/openssh.nix
+++ b/modules/openssh.nix
@@ -6,8 +6,8 @@ with lib;
   options = {
     services.openssh = {
       settings.HostKeyAlgorithms = mkOption {
-        type = types.listOf types.str;
-        default = [
+        type = types.str;
+        default = concatStringsSep "," [
           "ssh-ed25519"
           "ssh-ed25519-cert-v01@openssh.com"
           "sk-ssh-ed25519@openssh.com"
@@ -32,8 +32,8 @@ with lib;
         ];
       };
       settings.CASignatureAlgorithms = mkOption {
-        type = types.listOf types.str;
-        default = [
+        type = types.str;
+        default = concatStringsSep "," [
           "ssh-ed25519"
           "ecdsa-sha2-nistp256"
           "ecdsa-sha2-nistp384"
@@ -45,8 +45,8 @@ with lib;
         ];
       };
       settings.PubkeyAcceptedAlgorithms = mkOption {
-        type = types.listOf types.str;
-        default = [
+        type = types.str;
+        default = concatStringsSep "," [
           "ssh-ed25519"
           "ssh-ed25519-cert-v01@openssh.com"
           "sk-ssh-ed25519@openssh.com"
diff --git a/modules/pgbackrest.nix b/modules/pgbackrest.nix
index ca319ccd..ac0f9a35 100644
--- a/modules/pgbackrest.nix
+++ b/modules/pgbackrest.nix
@@ -54,6 +54,7 @@ in {
         stanza = mkOption {
           type = types.str;
           default = config.networking.hostName;
+          defaultText = literalExpression "config.networking.hostName";
         };
       };
 
@@ -115,6 +116,7 @@ in {
             stanza = mkOption {
               type = types.str;
               default = cfg.configurePostgresql.stanza;
+              defaultText = literalExpression "config.services.pgbackrest.configurePostgresql.stanza";
             };
             repo = mkOption {
               type = types.nullOr (types.strMatching "^[0-9]+$");
diff --git a/modules/tinc-networkmanager.nix b/modules/tinc-networkmanager.nix
index ff03abd2..4beba737 100644
--- a/modules/tinc-networkmanager.nix
+++ b/modules/tinc-networkmanager.nix
@@ -8,6 +8,7 @@ in {
         options.nmDispatch = lib.mkOption {
           type = lib.types.bool;
           default = config.networking.networkmanager.enable;
+          defaultText = lib.literalExpression "config.networking.networkmanager.enable";
           description = ''
             Install a network-manager dispatcher script to automatically
             connect to all remotes when networking is available
diff --git a/modules/uucp.nix b/modules/uucp.nix
index 95b675a6..abca2acb 100644
--- a/modules/uucp.nix
+++ b/modules/uucp.nix
@@ -48,12 +48,14 @@ let
       commands = mkOption {
         type = types.listOf types.str;
         default = cfg.defaultCommands;
+        defaultText = literalExpression "config.services.uucp.defaultCommands";
         description = "Commands to allow for this remote";
       };
 
       protocols = mkOption {
         type = types.separatedString "";
 	      default = cfg.defaultProtocols;
+        defaultText = literalExpression "config.services.uucp.defaultProtocols";
 	      description = "UUCP protocols to use for this remote";
       };
 
@@ -119,6 +121,7 @@ in {
       commandPath = mkOption {
         type = types.listOf types.path;
         default = [ "${pkgs.rmail}/bin" ];
+        defaultText = literalExpression ''[ "''${pkgs.rmail}/bin" ]'';
         description = ''
           Command search path for all systems
         '';
@@ -151,6 +154,7 @@ in {
       sshKeyDir = mkOption {
         type = types.path;
         default = "${cfg.homeDir}/.ssh/";
+        defaultText = literalExpression ''''${config.services.uucp.homeDir}/.ssh/'';
         description = "Directory to store ssh keypairs";
       };
 
@@ -202,6 +206,7 @@ in {
       nmDispatch = mkOption {
         type = types.bool;
         default = config.networking.networkmanager.enable;
+        defaultText = literalExpression "config.networking.networkmanager.enable";
         description = ''
           Install a network-manager dispatcher script to automatically
           call all remotes when networking is available
-- 
cgit v1.2.3