diff options
Diffstat (limited to 'configurations')
-rw-r--r-- | configurations/eonwe/default.nix | 15 | ||||
-rw-r--r-- | configurations/eonwe/ollama.nix | 1 | ||||
-rw-r--r-- | configurations/eonwe/vidya.nix | 1 | ||||
-rw-r--r-- | configurations/manwe/default.nix | 3 | ||||
-rw-r--r-- | configurations/manwe/mailserver/default.nix | 21 | ||||
-rw-r--r-- | configurations/test-headless/default.nix | 8 |
6 files changed, 28 insertions, 21 deletions
diff --git a/configurations/eonwe/default.nix b/configurations/eonwe/default.nix index d6bc46c..d88f31e 100644 --- a/configurations/eonwe/default.nix +++ b/configurations/eonwe/default.nix @@ -17,7 +17,10 @@ openssh.server = { enable = true; - port = 22; + ports = [ + 22 + 22022 + ]; }; android.enable = true; @@ -165,11 +168,6 @@ }; }; - openssh.settings = { - KbdInteractiveAuthentication = lib.mkForce true; - PasswordAuthentication = lib.mkForce true; - }; - udev.packages = [ pkgs.vial ]; xserver.wacom.enable = true; @@ -315,7 +313,10 @@ }; }; - nix.settings.trusted-users = [ "builder" ]; + nix.settings = { + trusted-users = [ "builder" ]; + system-features = [ "big-parallel" ]; + }; # https://cl.tvl.fyi/c/depot/+/12961 systemd.services = diff --git a/configurations/eonwe/ollama.nix b/configurations/eonwe/ollama.nix index 13ff300..4b30e0d 100644 --- a/configurations/eonwe/ollama.nix +++ b/configurations/eonwe/ollama.nix @@ -27,7 +27,6 @@ services = { ollama = { - # FIXME https://github.com/NixOS/nixpkgs/issues/376930 enable = true; host = "0.0.0.0"; diff --git a/configurations/eonwe/vidya.nix b/configurations/eonwe/vidya.nix index 0cde57a..61df505 100644 --- a/configurations/eonwe/vidya.nix +++ b/configurations/eonwe/vidya.nix @@ -31,6 +31,7 @@ # fallout-ce # fallout2-ce # gzdoom + # opengothic # openmw # openttd # qzdl diff --git a/configurations/manwe/default.nix b/configurations/manwe/default.nix index 326cfa6..d750aa3 100644 --- a/configurations/manwe/default.nix +++ b/configurations/manwe/default.nix @@ -6,9 +6,6 @@ { imports = lib.modulesIn ./. |> lib.attrValues; - # Something is broken there. Not sure why it affects me tho. - disabledModules = [ "services/networking/wireguard-networkd.nix" ]; - nixfiles.modules = { wireguard.server.enable = true; diff --git a/configurations/manwe/mailserver/default.nix b/configurations/manwe/mailserver/default.nix index 5160604..a02e8ad 100644 --- a/configurations/manwe/mailserver/default.nix +++ b/configurations/manwe/mailserver/default.nix @@ -98,13 +98,28 @@ }; }; - # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275#note_1746383655 - dovecot2.sieve.extensions = [ "fileinto" ]; - # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/241 redis.servers.rspamd.enable = lib.mkForce false; + + prometheus.exporters.postfix = { + enable = true; + listenAddress = "127.0.0.1"; + port = 9154; + }; }; + environment.etc."alloy/postfix.alloy".text = with config.services.prometheus.exporters.postfix; '' + prometheus.scrape "postfix" { + targets = [ + { + __address__ = "${listenAddress}:${toString port}", + instance = "${config.networking.hostName}", + }, + ] + forward_to = [prometheus.relabel.default.receiver] + } + ''; + systemd.services.rspamd = { requires = lib.mkForce [ "redis-default.service" ]; after = lib.mkForce [ "redis-default.service" ]; diff --git a/configurations/test-headless/default.nix b/configurations/test-headless/default.nix index 622cf0e..f64a050 100644 --- a/configurations/test-headless/default.nix +++ b/configurations/test-headless/default.nix @@ -1,13 +1,7 @@ { lib, ... }: { - nixfiles.modules = { - endlessh-go.enable = lib.mkForce false; - node-exporter.enable = lib.mkForce false; - promtail.enable = lib.mkForce false; - }; - + nixfiles.modules.endlessh-go.enable = lib.mkForce false; boot.loader.systemd-boot.enable = true; fileSystems."/".device = "/dev/null"; - documentation.enable = lib.mkForce false; } |