From 79d253f2d7190b1dec5d83b2fbb661f5a408441c Mon Sep 17 00:00:00 2001
From: punkfairie <marley@punkfairie.net>
Date: Mon, 26 May 2025 13:16:34 -0700
Subject: [PATCH] fix: use lib.mkMerge instead of //

// doesn't deep merge, so marleyos.openssh.enable didn't stay set to
true after the desktop profile was applied
---
 modules/home/profiles.nix  | 7 ++++---
 modules/nixos/profiles.nix | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/home/profiles.nix b/modules/home/profiles.nix
index 52142e6..4c047d5 100644
--- a/modules/home/profiles.nix
+++ b/modules/home/profiles.nix
@@ -8,7 +8,7 @@
 
   inherit (marleylib.module) enabled;
 in {
-  marleyos =
+  marleyos = lib.mkMerge [
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
@@ -18,9 +18,10 @@ in {
     #
     #
     # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // (lib.optionalAttrs cfg.desktop {})
+    (lib.optionalAttrs cfg.desktop {})
     #
     #
     # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // (lib.optionalAttrs cfg.server {});
+    (lib.optionalAttrs cfg.server {})
+  ];
 }
diff --git a/modules/nixos/profiles.nix b/modules/nixos/profiles.nix
index a8ea8bf..44ca8b1 100644
--- a/modules/nixos/profiles.nix
+++ b/modules/nixos/profiles.nix
@@ -8,7 +8,7 @@
 
   inherit (marleylib.module) enabled;
 in {
-  marleyos =
+  marleyos = lib.mkMerge [
     # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     {
       programs = {
@@ -24,7 +24,7 @@ in {
     #
     #
     # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // (lib.optionalAttrs cfg.desktop {
+    (lib.optionalAttrs cfg.desktop {
       mounts.babeshare = enabled;
 
       shell = {
@@ -40,9 +40,10 @@ in {
     #
     #
     # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-    // (lib.optionalAttrs cfg.server {
+    (lib.optionalAttrs cfg.server {
       services = {
         prometheus = enabled;
       };
-    });
+    })
+  ];
 }