punkfairie/marleyos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: use lib.mkMerge instead of //

Browse source 
// doesn't deep merge, so marleyos.openssh.enable didn't stay set to
true after the desktop profile was applied
This commit is contained in:
punkfairie 2025-05-26 13:16:34 -07:00
parent 2b98d371f1
commit 79d253f2d7
Signed by: punkfairie
GPG key ID: B3C5488E9A1A7CA6
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/home/profiles.nix
View file

@ -8,7 +8,7 @@
inherit (marleylib.module) enabled; inherit (marleylib.module) enabled;
in { in {
marleyos = marleyos = lib.mkMerge [
# Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ {
programs = { programs = {
@ -18,9 +18,10 @@ in {
# #
# #
# Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// (lib.optionalAttrs cfg.desktop {}) (lib.optionalAttrs cfg.desktop {})
# #
# #
# Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// (lib.optionalAttrs cfg.server {}); (lib.optionalAttrs cfg.server {})
];
} }

9
modules/nixos/profiles.nix
View file

@ -8,7 +8,7 @@
inherit (marleylib.module) enabled; inherit (marleylib.module) enabled;
in { in {
marleyos = marleyos = lib.mkMerge [
# Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Universal - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{ {
programs = { programs = {
@ -24,7 +24,7 @@ in {
# #
# #
# Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Graphical Desktop - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// (lib.optionalAttrs cfg.desktop { (lib.optionalAttrs cfg.desktop {
mounts.babeshare = enabled; mounts.babeshare = enabled;
shell = { shell = {
@ -40,9 +40,10 @@ in {
# #
# #
# Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Server - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// (lib.optionalAttrs cfg.server { (lib.optionalAttrs cfg.server {
services = { services = {
prometheus = enabled; prometheus = enabled;
}; };
}); })
];
} }