citadel

My dotfiles, scripts and nix configs
git clone git://jb55.com/citadel
Log | Files | Refs | README | LICENSE

commit d49a08a54e2552e0a471f6bb678e81f368ac0a9c
parent 50e4b2040727974c3905968e41910fa0ab9ea641
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 15 Sep 2020 21:39:15 -0700

nix: fix machine forked configs

Diffstat:
Mnix-config/configuration.nix | 2+-
Mnix-config/machines/monad/default.nix | 5+++++
Mnix-config/machines/quiver/default.nix | 5+++++
Mnix-config/services/desktop/default.nix | 4----
Mnix-config/services/mailz/default.nix | 5++---
5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nix-config/configuration.nix b/nix-config/configuration.nix @@ -4,7 +4,7 @@ { config, pkgs, ... }: -let machine = "quiver"; +let machine = private.machine; isDesktop = true; machinePath = p: let m = "/" + machine; in ./machines + m + p; diff --git a/nix-config/machines/monad/default.nix b/nix-config/machines/monad/default.nix @@ -224,6 +224,11 @@ in services.nix-serve.bindAddress = nix-serve.bindAddress; services.nix-serve.port = nix-serve.port; + services.xserver.screenSection = '' + Option "metamodes" "1920x1080_144 +0+0" + Option "dpi" "96 x 96" + ''; + services.nginx.enable = if extra.is-minimal then false else true; services.nginx.httpConfig = '' server { diff --git a/nix-config/machines/quiver/default.nix b/nix-config/machines/quiver/default.nix @@ -31,6 +31,11 @@ extra: services.mysql.enable = true; services.mysql.package = pkgs.mariadb; + services.xserver.screenSection = '' + Option "metamodes" "1920x1080 +0+0" + Option "dpi" "96 x 96" + ''; + services.xinetd.enable = true; services.xinetd.services = [ { name = "gopher"; diff --git a/nix-config/services/desktop/default.nix b/nix-config/services/desktop/default.nix @@ -170,10 +170,6 @@ in xterm.enable = false; }; - screenSection = '' - Option "metamodes" "1920x1080 +0+0" - Option "dpi" "96 x 96" - ''; }; # Enable the OpenSSH daemon. diff --git a/nix-config/services/mailz/default.nix b/nix-config/services/mailz/default.nix @@ -182,13 +182,12 @@ in services.opensmtpd = { enable = true; serverConfiguration = '' - filter smtp connect check-rdns reject "550 you need a reverse DNS" - filter smtp ehlo check-rdns reject "550 your HELO hostname and rDNS mismatch" - filter filter-pause pause filter filter-regex regex "${files.regex}" filter filter-spamassassin spamassassin "-s accept" filter filter-dkim-signer dkim-signer "-d ${cfg.domain}" "-p${cfg.dkimDirectory}/${cfg.domain}/default.private" + filter in chain filter-regex filter-spamassassin + filter out chain filter-dkim-signer pki ${cfg.domain} certificate "/var/lib/acme/${cfg.domain}/fullchain.pem" pki ${cfg.domain} key "/var/lib/acme/${cfg.domain}/key.pem"