diff --git a/homeManagerModules/apps/default.nix b/homeManagerModules/apps/default.nix
index 314fe2e1..fde431b7 100644
--- a/homeManagerModules/apps/default.nix
+++ b/homeManagerModules/apps/default.nix
@@ -17,6 +17,7 @@
     ./keepassxc
     ./librewolf
     ./mako
+    ./nemo
     ./neofetch
     ./neovim
     ./swaylock
diff --git a/homeManagerModules/apps/nemo/default.nix b/homeManagerModules/apps/nemo/default.nix
new file mode 100644
index 00000000..91cec25e
--- /dev/null
+++ b/homeManagerModules/apps/nemo/default.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  config = lib.mkIf config.alyraffauf.apps.nemo.enable {
+    home.packages = with pkgs; [
+      cinnamon.nemo
+    ];
+
+    dconf = {
+      enable = true;
+      settings = {
+        "org/nemo/preferences".show-image-thumbnails = "always";
+        "org/nemo/preferences/menu-config".background-menu-open-as-root =
+          !(config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable);
+        "org/nemo/preferences/menu-config".selection-menu-open-as-root =
+          !(config.alyraffauf.desktop.hyprland.enable || config.alyraffauf.desktop.sway.enable);
+      };
+    };
+  };
+}
diff --git a/homeManagerModules/desktop/waylandComp.nix b/homeManagerModules/desktop/waylandComp.nix
index 84c589db..f150a6c5 100644
--- a/homeManagerModules/desktop/waylandComp.nix
+++ b/homeManagerModules/desktop/waylandComp.nix
@@ -9,24 +9,20 @@
       apps = {
         fuzzel.enable = lib.mkDefault true;
         mako.enable = lib.mkDefault true;
+        nemo.enable = lib.mkDefault true;
         swaylock.enable = lib.mkDefault true;
-        thunar.enable = lib.mkDefault true;
         waybar.enable = lib.mkDefault true;
         wlogout.enable = lib.mkDefault true;
       };
-      theme.enable = lib.mkDefault true;
-      defaultApps.enable = lib.mkDefault true;
     };
 
     dconf = {
       enable = true;
       settings = {
-        "org/gnome/nm-applet".disable-connected-notifications = true;
-        "org/nemo/preferences/menu-config".background-menu-open-as-root = false;
-        "org/nemo/preferences/menu-config".selection-menu-open-as-root = false;
         "org/gnome/desktop/wm/preferences" = {
           button-layout = "";
         };
+        "org/gnome/nm-applet".disable-connected-notifications = true;
       };
     };
 
diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index 4ffdc638..eaa6445b 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -34,6 +34,7 @@
         };
         librewolf.enable = lib.mkEnableOption "Librewolf web browser.";
         mako.enable = lib.mkEnableOption "Mako notification daemon.";
+        nemo.enable = lib.mkEnableOption "Cinnamon Nemo file manager.";
         neofetch.enable = lib.mkEnableOption "Neofetch.";
         neovim.enable = lib.mkEnableOption "Neovim text editor.";
         swaylock.enable = lib.mkEnableOption "Swaylock screen locker.";