From f11b4310b3dede19ad437e75270af5b4f07a4e07 Mon Sep 17 00:00:00 2001
From: EinEtwas <ein@etwas.me>
Date: Mon, 21 Oct 2024 14:30:37 +0200
Subject: [PATCH] feat: add nix-index-database with comma

---
 flake.lock        | 21 +++++++++++++++++++++
 flake.nix         | 15 +++++++++++++--
 home/default.nix  |  1 +
 home/packages.nix |  1 -
 home/zsh.nix      |  2 ++
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9b1692d..bab3802 100644
--- a/flake.lock
+++ b/flake.lock
@@ -115,6 +115,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729394935,
+        "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "04f8a11f247ba00263b060fbcdc95484fd046104",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1729501257,
@@ -168,6 +188,7 @@
         "agenix": "agenix",
         "catppuccin": "catppuccin",
         "home-manager": "home-manager_2",
+        "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "spicetify-nix": "spicetify-nix"
diff --git a/flake.nix b/flake.nix
index 961aacf..9ea59bf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,20 +3,30 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    
     catppuccin.url = "github:catppuccin/nix";
+
     agenix.url = "github:ryantm/agenix";
+
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    nix-index-database = {
+      url = "github:nix-community/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
  };
 
-  outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, ... } @ inputs: {
+  outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, ... } @ inputs: {
     nixosConfigurations.rhea-laptop = nixpkgs.lib.nixosSystem {
       specialArgs = { 
         inherit inputs;
@@ -28,9 +38,10 @@
       # List all Modules to load
       modules = [
         nixos-hardware.nixosModules.framework-13-7040-amd
+        nix-index-database.nixosModules.nix-index
+        agenix.nixosModules.default
         ./modules
         ./home
-        agenix.nixosModules.default
       ];
     };
   };
diff --git a/home/default.nix b/home/default.nix
index 837c171..8c838c3 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -31,6 +31,7 @@
       imports = [
         inputs.catppuccin.homeManagerModules.catppuccin
         inputs.spicetify-nix.homeManagerModules.default
+        inputs.nix-index-database.hmModules.nix-index
         ./hyprland.nix
         ./git.nix
         ./waybar
diff --git a/home/packages.nix b/home/packages.nix
index ce134d7..a6586a8 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -23,7 +23,6 @@
     pavucontrol
 
     # nix-tools
-    nix-index
     nix-output-monitor
     nil
     nh
diff --git a/home/zsh.nix b/home/zsh.nix
index 9957c45..551e6a4 100644
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -1,4 +1,6 @@
 {
+  programs.nix-index-database.comma.enable = true;
+
   programs.zsh = {
     enable = true;