From 003d1c801dbf019ace7b5efdef3c9277bc3caee9 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Thu, 30 Nov 2023 14:08:25 +0100
Subject: [PATCH 1/4] home: emacs: add mu4e to emacs packages

23.11 removed mu4e from the mu package
---
 home/emacs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home/emacs.nix b/home/emacs.nix
index 5853397..2bad59d 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -43,7 +43,7 @@ in {
     programs.emacs = {
       enable = true;
       package = pkgs.emacsNativeComp;
-      extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools pkgs.lilypond];
+      extraPackages = epkgs: [epkgs.vterm epkgs.pdf-tools pkgs.lilypond epkgs.mu4e];
     };
   };
 }

From 1bd88ce3dfda0bdbc0bec3ad6692ecd553e9a3e7 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:20:13 +0100
Subject: [PATCH 2/4] services: nginx: use enable option

conditional enabling caused circular dependencies somehow
---
 services/nginx.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/services/nginx.nix b/services/nginx.nix
index d84425c..6781549 100644
--- a/services/nginx.nix
+++ b/services/nginx.nix
@@ -9,12 +9,19 @@
 }: 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 ((builtins.attrNames config.services.nginx.virtualHosts) != ["localhost"]) {
+  config = mkIf (cfg.enable) {
     services.nginx = {
       enable = true;
       statusPage = true; # For monitoring scraping.

From d1b49fb8a5825c703db9dfb44656b65ae67e3558 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:20:44 +0100
Subject: [PATCH 3/4] hades: enable nginx module

---
 hosts/hades/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix
index 1b54f72..deaa941 100644
--- a/hosts/hades/default.nix
+++ b/hosts/hades/default.nix
@@ -92,6 +92,8 @@ in {
       adminpassFile = config.age.secrets."nextcloud/admin-pass".path;
     };
 
+    nginx.enable = true;
+
     paperless = {
       enable = true;
       port = 8085;

From f7490e5bad5f5ace72f0fb50db89e1a2d04be03f Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@alarsyo.net>
Date: Tue, 5 Dec 2023 09:20:54 +0100
Subject: [PATCH 4/4] home: emacs: use socket activation

---
 home/emacs.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/emacs.nix b/home/emacs.nix
index 2bad59d..3e5325c 100644
--- a/home/emacs.nix
+++ b/home/emacs.nix
@@ -38,6 +38,7 @@ in {
       enable = true;
       # generate emacsclient desktop file
       client.enable = true;
+      socketActivation.enable = true;
     };
 
     programs.emacs = {