diff --git a/flake.lock b/flake.lock
index 2ee182c..85fbbfe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -332,6 +332,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778240325,
+        "narHash": "sha256-d2HIS7LpfI0lgxiXCXLjxrHl3eIdNvAVexOu0xiM488=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "dd2d0e3f6ba00af01b9498f5697173bdc2524bee",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1777917524,
@@ -529,6 +549,7 @@
         "home-manager": "home-manager",
         "niri": "niri",
         "nix-flatpak": "nix-flatpak",
+        "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixvim": "nixvim",
diff --git a/flake.nix b/flake.nix
index 9861608..c125431 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,11 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     nixos-hardware.url = "github:NixOS/nixos-hardware"; #To Provide Framework13 hardware modules
 
     home-manager.url = "github:nix-community/home-manager/master";
@@ -60,6 +65,7 @@
     niri,
     grub2-themes,
     nix-flatpak,
+    nix-index-database,
     ...
   }: let
     username = "cookiez";
diff --git a/modules/configuration.nix b/modules/configuration.nix
index 6e3826b..b71d16f 100644
--- a/modules/configuration.nix
+++ b/modules/configuration.nix
@@ -21,8 +21,13 @@
   #  device = "/swapfile";
   #  size = 16 * 1024; # 16GB
   #}];
+  nix = {
+    settings.nix-path = config.nix.nixPath;
+    nixPath = ["nixpkgs=${inputs.nixpkgs}"];
+  };
 
   imports = [
+    inputs.nix-index-database.nixosModules.nix-index
     inputs.home-manager.nixosModules.home-manager
     inputs.grub2-themes.nixosModules.default
     inputs.nix-flatpak.nixosModules.nix-flatpak
@@ -222,6 +227,8 @@
   programs = {
     steam.enable = true;
 
+    nix-index-database.comma.enable = true;
+
     direnv = {
       enable = true;
       silent = true; # Suppresses direnv's output in the terminal
@@ -296,7 +303,7 @@
     #  dockerCompat = true;
     #};
 
-    waydroid.enable = true;
+    waydroid.enable = false;
   };
 
   environment = {