diff --git a/home/emacs.nix b/home/emacs.nix index 3e5325c..5853397 100644 --- a/home/emacs.nix +++ b/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]; }; }; } diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index deaa941..1b54f72 100644 --- a/hosts/hades/default.nix +++ b/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; diff --git a/services/nginx.nix b/services/nginx.nix index 6781549..d84425c 100644 --- a/services/nginx.nix +++ b/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.