home/emacs.nix

@@ -38,13 +38,12 @@ in {
       enable = true;
       # generate emacsclient desktop file
       client.enable = true;
-      socketActivation.enable = true;
     };
 
     programs.emacs = {
       enable = true;
       package = pkgs.emacsNativeComp;
-      extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools pkgs.lilypond epkgs.mu4e];
+      extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools pkgs.lilypond];
     };
   };
 }

hosts/hades/default.nix

@@ -92,8 +92,6 @@ in {
       adminpassFile = config.age.secrets."nextcloud/admin-pass".path;
     };
 
-    nginx.enable = true;
-
     paperless = {
       enable = true;
       port = 8085;

services/nginx.nix

@@ -9,19 +9,12 @@
 }: let
   inherit
     (lib)
-    mkEnableOption
     mkIf
     ;
-
-  cfg = config.my.services.nginx;
 in {
-  options.my.services.nginx = {
-    enable = mkEnableOption "Nginx reverse proxy";
-  };
-
   # Whenever something defines an nginx vhost, ensure that nginx defaults are
   # properly set.
-  config = mkIf (cfg.enable) {
+  config = mkIf ((builtins.attrNames config.services.nginx.virtualHosts) != ["localhost"]) {
     services.nginx = {
       enable = true;
       statusPage = true; # For monitoring scraping.