diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2023-12-07 20:32:45 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2023-12-07 20:32:45 +0100 |
commit | da6a7d5c69aa3e8b70755e88be0f44b642422114 (patch) | |
tree | bb64c8f76a0655b0967d73d7de3541fe2825aa57 /modules | |
parent | 26ba0280e38648a787a5ef60807f91765c40d1d5 (diff) | |
download | nixos-da6a7d5c69aa3e8b70755e88be0f44b642422114.tar nixos-da6a7d5c69aa3e8b70755e88be0f44b642422114.tar.gz nixos-da6a7d5c69aa3e8b70755e88be0f44b642422114.tar.bz2 nixos-da6a7d5c69aa3e8b70755e88be0f44b642422114.tar.xz nixos-da6a7d5c69aa3e8b70755e88be0f44b642422114.zip |
bump
Diffstat (limited to 'modules')
-rw-r--r-- | modules/envfs.nix | 8 | ||||
-rw-r--r-- | modules/openssh.nix | 12 | ||||
-rw-r--r-- | modules/pgbackrest.nix | 2 | ||||
-rw-r--r-- | modules/tinc-networkmanager.nix | 1 | ||||
-rw-r--r-- | modules/uucp.nix | 5 |
5 files changed, 22 insertions, 6 deletions
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 { | |||
50 | ln -s ${config.environment.binsh} $out/sh | 50 | ln -s ${config.environment.binsh} $out/sh |
51 | '') | 51 | '') |
52 | ]; | 52 | ]; |
53 | defaultText = lib.literalExpression '' | ||
54 | [ (pkgs.runCommand "fallback-path-environment" {} ''' | ||
55 | mkdir -p $out | ||
56 | ln -s ''${config.environment.usrbinenv} $out/env | ||
57 | ln -s ''${config.environment.binsh} $out/sh | ||
58 | ''') | ||
59 | ] | ||
60 | ''; | ||
53 | description = lib.mdDoc "Extra packages to join into collection of fallback executables in case not other executable is found"; | 61 | description = lib.mdDoc "Extra packages to join into collection of fallback executables in case not other executable is found"; |
54 | }; | 62 | }; |
55 | }; | 63 | }; |
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; | |||
6 | options = { | 6 | options = { |
7 | services.openssh = { | 7 | services.openssh = { |
8 | settings.HostKeyAlgorithms = mkOption { | 8 | settings.HostKeyAlgorithms = mkOption { |
9 | type = types.listOf types.str; | 9 | type = types.str; |
10 | default = [ | 10 | default = concatStringsSep "," [ |
11 | "ssh-ed25519" | 11 | "ssh-ed25519" |
12 | "ssh-ed25519-cert-v01@openssh.com" | 12 | "ssh-ed25519-cert-v01@openssh.com" |
13 | "sk-ssh-ed25519@openssh.com" | 13 | "sk-ssh-ed25519@openssh.com" |
@@ -32,8 +32,8 @@ with lib; | |||
32 | ]; | 32 | ]; |
33 | }; | 33 | }; |
34 | settings.CASignatureAlgorithms = mkOption { | 34 | settings.CASignatureAlgorithms = mkOption { |
35 | type = types.listOf types.str; | 35 | type = types.str; |
36 | default = [ | 36 | default = concatStringsSep "," [ |
37 | "ssh-ed25519" | 37 | "ssh-ed25519" |
38 | "ecdsa-sha2-nistp256" | 38 | "ecdsa-sha2-nistp256" |
39 | "ecdsa-sha2-nistp384" | 39 | "ecdsa-sha2-nistp384" |
@@ -45,8 +45,8 @@ with lib; | |||
45 | ]; | 45 | ]; |
46 | }; | 46 | }; |
47 | settings.PubkeyAcceptedAlgorithms = mkOption { | 47 | settings.PubkeyAcceptedAlgorithms = mkOption { |
48 | type = types.listOf types.str; | 48 | type = types.str; |
49 | default = [ | 49 | default = concatStringsSep "," [ |
50 | "ssh-ed25519" | 50 | "ssh-ed25519" |
51 | "ssh-ed25519-cert-v01@openssh.com" | 51 | "ssh-ed25519-cert-v01@openssh.com" |
52 | "sk-ssh-ed25519@openssh.com" | 52 | "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 { | |||
54 | stanza = mkOption { | 54 | stanza = mkOption { |
55 | type = types.str; | 55 | type = types.str; |
56 | default = config.networking.hostName; | 56 | default = config.networking.hostName; |
57 | defaultText = literalExpression "config.networking.hostName"; | ||
57 | }; | 58 | }; |
58 | }; | 59 | }; |
59 | 60 | ||
@@ -115,6 +116,7 @@ in { | |||
115 | stanza = mkOption { | 116 | stanza = mkOption { |
116 | type = types.str; | 117 | type = types.str; |
117 | default = cfg.configurePostgresql.stanza; | 118 | default = cfg.configurePostgresql.stanza; |
119 | defaultText = literalExpression "config.services.pgbackrest.configurePostgresql.stanza"; | ||
118 | }; | 120 | }; |
119 | repo = mkOption { | 121 | repo = mkOption { |
120 | type = types.nullOr (types.strMatching "^[0-9]+$"); | 122 | 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 { | |||
8 | options.nmDispatch = lib.mkOption { | 8 | options.nmDispatch = lib.mkOption { |
9 | type = lib.types.bool; | 9 | type = lib.types.bool; |
10 | default = config.networking.networkmanager.enable; | 10 | default = config.networking.networkmanager.enable; |
11 | defaultText = lib.literalExpression "config.networking.networkmanager.enable"; | ||
11 | description = '' | 12 | description = '' |
12 | Install a network-manager dispatcher script to automatically | 13 | Install a network-manager dispatcher script to automatically |
13 | connect to all remotes when networking is available | 14 | 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 | |||
48 | commands = mkOption { | 48 | commands = mkOption { |
49 | type = types.listOf types.str; | 49 | type = types.listOf types.str; |
50 | default = cfg.defaultCommands; | 50 | default = cfg.defaultCommands; |
51 | defaultText = literalExpression "config.services.uucp.defaultCommands"; | ||
51 | description = "Commands to allow for this remote"; | 52 | description = "Commands to allow for this remote"; |
52 | }; | 53 | }; |
53 | 54 | ||
54 | protocols = mkOption { | 55 | protocols = mkOption { |
55 | type = types.separatedString ""; | 56 | type = types.separatedString ""; |
56 | default = cfg.defaultProtocols; | 57 | default = cfg.defaultProtocols; |
58 | defaultText = literalExpression "config.services.uucp.defaultProtocols"; | ||
57 | description = "UUCP protocols to use for this remote"; | 59 | description = "UUCP protocols to use for this remote"; |
58 | }; | 60 | }; |
59 | 61 | ||
@@ -119,6 +121,7 @@ in { | |||
119 | commandPath = mkOption { | 121 | commandPath = mkOption { |
120 | type = types.listOf types.path; | 122 | type = types.listOf types.path; |
121 | default = [ "${pkgs.rmail}/bin" ]; | 123 | default = [ "${pkgs.rmail}/bin" ]; |
124 | defaultText = literalExpression ''[ "''${pkgs.rmail}/bin" ]''; | ||
122 | description = '' | 125 | description = '' |
123 | Command search path for all systems | 126 | Command search path for all systems |
124 | ''; | 127 | ''; |
@@ -151,6 +154,7 @@ in { | |||
151 | sshKeyDir = mkOption { | 154 | sshKeyDir = mkOption { |
152 | type = types.path; | 155 | type = types.path; |
153 | default = "${cfg.homeDir}/.ssh/"; | 156 | default = "${cfg.homeDir}/.ssh/"; |
157 | defaultText = literalExpression ''''${config.services.uucp.homeDir}/.ssh/''; | ||
154 | description = "Directory to store ssh keypairs"; | 158 | description = "Directory to store ssh keypairs"; |
155 | }; | 159 | }; |
156 | 160 | ||
@@ -202,6 +206,7 @@ in { | |||
202 | nmDispatch = mkOption { | 206 | nmDispatch = mkOption { |
203 | type = types.bool; | 207 | type = types.bool; |
204 | default = config.networking.networkmanager.enable; | 208 | default = config.networking.networkmanager.enable; |
209 | defaultText = literalExpression "config.networking.networkmanager.enable"; | ||
205 | description = '' | 210 | description = '' |
206 | Install a network-manager dispatcher script to automatically | 211 | Install a network-manager dispatcher script to automatically |
207 | call all remotes when networking is available | 212 | call all remotes when networking is available |