From 38cad649bf9df85faf5eaa7b1a27afac0863c0d1 Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Sun, 14 May 2023 22:47:20 +0200
Subject: [PATCH] [Services] Make journald log storage persistent in developer
 mode

---
 desktop/developer.nix | 4 ++++
 services.nix          | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/desktop/developer.nix b/desktop/developer.nix
index 7d6cb67..1e18779 100644
--- a/desktop/developer.nix
+++ b/desktop/developer.nix
@@ -80,6 +80,10 @@ in {
       "doc" "info" "dev" "debug" "static"
     ];
 
+    aviallon.services.journald.extraConfig = {
+      Storage = mkForce "persistent";
+    };
+
     aviallon.boot.configurationLimit = mkDefault 10;
 
     aviallon.programs.allowUnfreeList = [
diff --git a/services.nix b/services.nix
index 3ac219b..167b32d 100644
--- a/services.nix
+++ b/services.nix
@@ -39,7 +39,7 @@ in {
     journald.extraConfig = mkOption {
       default = {};
       example = {};
-      type = types.attrs;
+      type = with types; attrsOf (oneOf [ bool int str ]);
       description = "Add extra config to journald with Nix language";
     };
   };
@@ -151,10 +151,10 @@ in {
 
     services.fwupd.enable = true;
 
-    services.journald.extraConfig = journaldConfig cfg.journald.extraConfig;
+    services.journald.extraConfig = mkOverride 2 (journaldConfig cfg.journald.extraConfig);
 
-    aviallon.services.journald.extraConfig = ifEnable generalCfg.unsafeOptimizations {
-      Storage = "volatile";
+    aviallon.services.journald.extraConfig = {
+      Storage = mkIf generalCfg.unsafeOptimizations "volatile";
     };
 
     services.ananicy.enable = false;