Compare commits

...

4 commits

Author SHA1 Message Date
Antoine Martin f7490e5bad home: emacs: use socket activation 2023-12-05 09:20:54 +01:00
Antoine Martin d1b49fb8a5 hades: enable nginx module 2023-12-05 09:20:44 +01:00
Antoine Martin 1bd88ce3df services: nginx: use enable option
conditional enabling caused circular dependencies somehow
2023-12-05 09:20:13 +01:00
Antoine Martin 003d1c801d home: emacs: add mu4e to emacs packages
23.11 removed mu4e from the mu package
2023-11-30 14:08:25 +01:00
3 changed files with 12 additions and 2 deletions

View file

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

View file

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

View file

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