diff options
Diffstat (limited to 'modules/nixos')
| -rw-r--r-- | modules/nixos/common.nix | 8 | ||||
| -rw-r--r-- | modules/nixos/networking/ssh-as-root.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/zulip.nix | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix index 3c00de0..c0d1d73 100644 --- a/modules/nixos/common.nix +++ b/modules/nixos/common.nix @@ -1,4 +1,8 @@ -{config, ...}: { +{ + config, + lib, + ... +}: { # flakes usage nix.settings.experimental-features = [ "flakes" @@ -12,5 +16,5 @@ # cleans /tmp to maintain a tidy system boot.tmp.cleanOnBoot = true; - networking.domain = config.networking.hostname; + networking.domain = lib.mkDefault config.networking.hostName; } diff --git a/modules/nixos/networking/ssh-as-root.nix b/modules/nixos/networking/ssh-as-root.nix index d882a46..46cbde6 100644 --- a/modules/nixos/networking/ssh-as-root.nix +++ b/modules/nixos/networking/ssh-as-root.nix @@ -1,3 +1,3 @@ -{ - services.openssh.settings.PermitRootLogin = "yes"; +{lib, ...}: { + services.openssh.settings.PermitRootLogin = lib.mkForce "yes"; } diff --git a/modules/nixos/zulip.nix b/modules/nixos/zulip.nix index 736ffad..de88f9f 100644 --- a/modules/nixos/zulip.nix +++ b/modules/nixos/zulip.nix @@ -15,6 +15,7 @@ EXTERNAL_HOST = "chat.${config.networking.domain}"; }; }; + services.postgresql.enable = true; mailserver.loginAccounts = { "zulip+admin@${config.networking.domain}" = { hashedPasswordFile = builtins.toString config.age.secrets."mailserver-acc-zulip+admin-pw".path; |