diff --git a/options/custom/programs/direnv.nix b/options/custom/programs/direnv.nix
index e59b7f9..510a6bc 100644
--- a/options/custom/programs/direnv.nix
+++ b/options/custom/programs/direnv.nix
@@ -10,17 +10,23 @@ in {
 
   config = mkIf cfg.enable {
     # https://github.com/direnv/direnv
-    programs.direnv = {
-      enable = true;
-      loadInNixShell = false; # nix develop
-      silent = true;
-    };
-
-    home-manager.users.${config.custom.username} = {
-      programs.direnv = {
+    programs.direnv =
+      {
         enable = true;
+        loadInNixShell = false; # nix develop
+      }
+      // optionalAttrs (versionAtLeast version "24.11") {
         silent = true;
       };
+
+    home-manager.users.${config.custom.username} = {
+      programs.direnv =
+        {
+          enable = true;
+        }
+        // optionalAttrs (versionAtLeast version "24.11") {
+          silent = true;
+        };
     };
   };
 }
diff --git a/options/custom/programs/nautilus.nix b/options/custom/programs/nautilus.nix
index b37d654..ae3c6ac 100644
--- a/options/custom/programs/nautilus.nix
+++ b/options/custom/programs/nautilus.nix
@@ -23,13 +23,15 @@ in {
     services = {
       gvfs.enable = true; # Trash dependency
 
-      gnome = {
-        sushi.enable = true; # Quick preview with spacebar
-
-        # File indexing
-        localsearch.enable = cfg.index;
-        tinysparql.enable = cfg.index;
-      };
+      gnome =
+        {
+          sushi.enable = true; # Quick preview with spacebar
+        }
+        // optionalAttrs (versionAtLeast version "24.11") {
+          # File indexing
+          localsearch.enable = cfg.index;
+          tinysparql.enable = cfg.index;
+        };
     };
 
     # Alternative fix to services.gnome.core-utilities.enable