Rebase to flake parts #11

modules/desktop/niri/default.nix

@@ -124,17 +124,27 @@ let
       };
     };
 
+  keyringNiriStartupKdl = ''
+    spawn-at-startup "dbus-update-activation-environment" "--systemd" "--all"
+  '';
+
   mergeNiriSettings =
-    pkgs: niriCfg:
+    pkgs: niriCfg: keyringEnable:
     let
       lib = pkgs.lib;
       pi5 = self.lib.pi5NiriKdl;
       rpi5Extra = lib.optionalString (niriCfg.raspberryPi5DrmWorkaround or false) pi5.drmExtraConfig;
+      base = niriBaseSettings pkgs;
       userExtra = niriCfg.extraSettings or { };
-      extraConfigMerged = rpi5Extra + (userExtra.extraConfig or "");
+      keyringExtra = lib.optionalString keyringEnable keyringNiriStartupKdl;
+      extraConfigMerged = keyringExtra + rpi5Extra + (userExtra.extraConfig or "");
+      windowRules = (base.window-rules or [ ]) ++ (userExtra.window-rules or [ ]);
     in
-    lib.recursiveUpdate (niriBaseSettings pkgs) (
-      userExtra
+    lib.recursiveUpdate base (
+      lib.removeAttrs userExtra [ "window-rules" "extraConfig" ]
+      // lib.optionalAttrs (windowRules != [ ]) {
+        window-rules = windowRules;
+      }
       // lib.optionalAttrs (rpi5Extra != "" || (userExtra.extraConfig or "") != "") {
         extraConfig = extraConfigMerged;
       }
@@ -146,7 +156,8 @@ in
     let
       niriOs = osConfig.chiasson.desktop.niri or { };
       niriEnabled = osConfig.chiasson.desktop.niri.enable or false;
-      mergedSettings = mergeNiriSettings pkgs niriOs;
+      keyringEnabled = osConfig.chiasson.desktop.keyring.enable or false;
+      mergedSettings = mergeNiriSettings pkgs niriOs keyringEnabled;
       niriConfigPkg = inputs.wrapper-modules.wrappers.niri.wrap {
         inherit pkgs;
         settings = mergedSettings;