diff --git a/flake.nix b/flake.nix index 5448dbec..f0e985d7 100644 --- a/flake.nix +++ b/flake.nix @@ -694,10 +694,10 @@ sshlog = nixosSystem' { modules = [ - ./hosts/sshlog self.nixosModules.cluster-options self.nixosModules.microvm sshlogd.nixosModule + ./hosts/sshlog ]; }; diff --git a/hosts/activity-relay/default.nix b/hosts/activity-relay/default.nix index 719decd3..050613c9 100644 --- a/hosts/activity-relay/default.nix +++ b/hosts/activity-relay/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, ... }: { c3d2 = { deployment.server = "server10"; diff --git a/hosts/home-assistant/default.nix b/hosts/home-assistant/default.nix index 0913bf93..63610050 100644 --- a/hosts/home-assistant/default.nix +++ b/hosts/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: let c3d2MacAddress = "00:0b:ad:00:1d:ea"; diff --git a/hosts/mailtngbert/default.nix b/hosts/mailtngbert/default.nix index 7135bd9f..9363749e 100644 --- a/hosts/mailtngbert/default.nix +++ b/hosts/mailtngbert/default.nix @@ -48,6 +48,7 @@ in services = { portunus.addToHosts = true; + postfix = { enable = true; enableSmtp = true; diff --git a/hosts/radiobert/default.nix b/hosts/radiobert/default.nix index 85512347..5764d09e 100644 --- a/hosts/radiobert/default.nix +++ b/hosts/radiobert/default.nix @@ -111,9 +111,8 @@ journald.extraConfig = '' Storage=volatile ''; - openssh = { - enable = true; - }; + openssh.enable = true; + # Allow access to USB udev.extraRules = '' SUBSYSTEM=="usb", MODE:="0666" diff --git a/modules/backup.nix b/modules/backup.nix index c62d396d..f4488fe1 100644 --- a/modules/backup.nix +++ b/modules/backup.nix @@ -43,9 +43,9 @@ in "/etc/machine-id" "/etc/passwd" "/etc/shadow" - "/etc/ssh/ssh_host_rsa_key" "/etc/ssh/ssh_host_ed25519_key" "/etc/ssh/ssh_host_ed25519_key.pub" + "/etc/ssh/ssh_host_rsa_key" "/etc/ssh/ssh_host_rsa_key.pub" "/etc/subgid" "/etc/subuid" diff --git a/modules/microvm.nix b/modules/microvm.nix index 397aafaa..a05166fd 100644 --- a/modules/microvm.nix +++ b/modules/microvm.nix @@ -1,4 +1,4 @@ -{ zentralwerk, options, config, lib, pkgs, ... }: +{ zentralwerk, config, lib, pkgs, ... }: let defaultGateways = { @@ -60,9 +60,7 @@ in }; mountBase = mkOption { - description = '' - Location (ZFS dataset, ...) where all the shares live. - ''; + description = "Location (ZFS dataset, ...) where all the shares live."; type = types.path; default = "/var/lib/microvms/${hostName}"; };