diff --git a/modules/nixos/desktop/browser/firefox/default.nix b/modules/nixos/desktop/browser/firefox/default.nix
index 7a5de17..bde4707 100644
--- a/modules/nixos/desktop/browser/firefox/default.nix
+++ b/modules/nixos/desktop/browser/firefox/default.nix
@@ -2,7 +2,7 @@
 let
   inherit (lib)
     mkEnableOption
-    mkIf
+    optional
     singleton
     ;
   cfg = config.desktop.browser.firefox;
@@ -10,11 +10,9 @@ in
 {
   options.desktop.browser.firefox.enable = mkEnableOption "";
 
-  config = mkIf cfg.enable {
-    home-manager.sharedModules = singleton {
-      persistDirs = singleton ".mozilla/firefox";
-      programs.firefox.enable = true;
-      stylix.targets.firefox.colorTheme.enable = true;
-    };
+  config.home-manager.sharedModules = optional cfg.enable {
+    persistDirs = singleton ".mozilla/firefox";
+    programs.firefox.enable = true;
+    stylix.targets.firefox.colorTheme.enable = true;
   };
 }
diff --git a/modules/nixos/desktop/media-player/default.nix b/modules/nixos/desktop/media-player/default.nix
index b230856..2c71170 100644
--- a/modules/nixos/desktop/media-player/default.nix
+++ b/modules/nixos/desktop/media-player/default.nix
@@ -5,22 +5,14 @@
   ...
 }:
 let
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkMerge
-    singleton
-    ;
+  inherit (lib) mkEnableOption optional singleton;
   inherit (pkgs) vlc;
   cfg = config.desktop.media-player;
-  addToHome = condition: attrs: mkIf condition { home-manager.sharedModules = singleton attrs; };
 in
 {
   options.desktop.media-player = {
     vlc.enable = mkEnableOption "";
   };
 
-  config = mkMerge [
-    (addToHome cfg.vlc.enable { home.packages = singleton vlc; })
-  ];
+  config.home-manager.sharedModules = optional cfg.vlc.enable { home.packages = singleton vlc; };
 }