From 231fd1675602a43d40f1799ebbc57d75e6ee0d95 Mon Sep 17 00:00:00 2001
From: matt1432 <matt@nelim.org>
Date: Wed, 22 Nov 2023 14:36:42 -0500
Subject: [PATCH] feat: add nix-index and wrapped comma

---
 common/default.nix | 13 ++++++++++++-
 flake.lock         | 21 +++++++++++++++++++++
 flake.nix          |  5 +++++
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/common/default.nix b/common/default.nix
index af15052..9589a3e 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -3,6 +3,7 @@
 , lib
 , nixpkgs
 , nixpkgs-wayland
+, nix-index-database
 , nh
 , nur
 , nix-melt
@@ -65,6 +66,17 @@
     default = {
       imports = [
         nur.hmModules.nur
+        nix-index-database.hmModules.nix-index
+        {
+          programs = {
+            nix-index-database.comma.enable = true;
+            nix-index = {
+              enable = true;
+              enableBashIntegration = true;
+            };
+          };
+        }
+
         ./home/bash
         ./home/git.nix
         ./home/neovim
@@ -90,7 +102,6 @@
       ]) ++
 
       (with pkgs; [
-        comma
         dracula-theme
         neofetch
         progress
diff --git a/flake.lock b/flake.lock
index 7bd4261..419258d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -482,6 +482,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1700363379,
+        "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=",
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "rev": "27920146e671a0d565aaa7452907383be14d8d82",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Mic92",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nix-melt": {
       "inputs": {
         "nixpkgs": "nixpkgs_3"
@@ -727,6 +747,7 @@
         "neovim-flake": "neovim-flake",
         "nh": "nh",
         "nix-gaming": "nix-gaming",
+        "nix-index-database": "nix-index-database",
         "nix-melt": "nix-melt",
         "nixpkgs": "nixpkgs_4",
         "nixpkgs-wayland": "nixpkgs-wayland",
diff --git a/flake.nix b/flake.nix
index 98541ff..9db6e28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,11 @@
     nh.url = "github:viperML/nh";
     nix-melt.url = "github:nix-community/nix-melt";
     nurl.url = "github:nix-community/nurl";
+
+    nix-index-database = {
+      url = "github:Mic92/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { self, nixpkgs, home-manager, nur, nix-gaming, ... }@attrs: let