diff --git a/homeManagerModules/desktop/cinnamon/default.nix b/homeManagerModules/desktop/cinnamon/default.nix
index 5fd4a54c..4e71835b 100644
--- a/homeManagerModules/desktop/cinnamon/default.nix
+++ b/homeManagerModules/desktop/cinnamon/default.nix
@@ -5,11 +5,6 @@
   ...
 }: {
   config = lib.mkIf config.alyraffauf.desktop.cinnamon.enable {
-    alyraffauf = {
-      apps = {
-        nemo.enable = lib.mkDefault true;
-      };
-    };
     dconf = {
       enable = true;
       settings = {
diff --git a/homeManagerModules/desktop/waylandComp.nix b/homeManagerModules/desktop/waylandComp.nix
index f150a6c5..55c0dab2 100644
--- a/homeManagerModules/desktop/waylandComp.nix
+++ b/homeManagerModules/desktop/waylandComp.nix
@@ -9,7 +9,6 @@
       apps = {
         fuzzel.enable = lib.mkDefault true;
         mako.enable = lib.mkDefault true;
-        nemo.enable = lib.mkDefault true;
         swaylock.enable = lib.mkDefault true;
         waybar.enable = lib.mkDefault true;
         wlogout.enable = lib.mkDefault true;
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index 417918dd..c9d76d4f 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -34,11 +34,19 @@
         };
         librewolf.enable = lib.mkEnableOption "Librewolf web browser.";
         mako.enable = lib.mkEnableOption "Mako notification daemon.";
-        nemo.enable = lib.mkEnableOption "Cinnamon Nemo file manager.";
+        nemo.enable = lib.mkOption {
+          description = "Cinnamon Nemo file manager.";
+          default = config.alyraffauf.defaultApps.fileManager.package == pkgs.cinnamon.nemo;
+          type = lib.types.bool;
+        };
         neofetch.enable = lib.mkEnableOption "Neofetch.";
         neovim.enable = lib.mkEnableOption "Neovim text editor.";
         swaylock.enable = lib.mkEnableOption "Swaylock screen locker.";
-        thunar.enable = lib.mkEnableOption "Thunar file manager.";
+        thunar.enable = lib.mkOption {
+          description = "Thunar file manager.";
+          default = config.alyraffauf.defaultApps.fileManager.package == pkgs.xfce.thunar;
+          type = lib.types.bool;
+        };
         tmux.enable = lib.mkEnableOption "Tmux shell session manager.";
         vsCodium.enable = lib.mkEnableOption "VSCodium text editor.";
         waybar.enable = lib.mkEnableOption "Waybar wayland panel.";