From cde3db64dec1dfe6fb91021982c57aadedca92a0 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 20 Dec 2024 10:44:58 -0500
Subject: [PATCH] WIP

---
 flake.lock                          | 40 ++++++++++++++++++++++++++++-
 flake.nix                           |  5 ++++
 modules/flake-parts/nixos-flake.nix |  1 +
 modules/home/all/terminal.nix       |  5 +++-
 modules/nixos/default.nix           |  1 +
 5 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/flake.lock b/flake.lock
index 143e219..a8f0bee 100644
--- a/flake.lock
+++ b/flake.lock
@@ -250,6 +250,22 @@
       }
     },
     "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
       "locked": {
         "lastModified": 1696426674,
         "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -881,6 +897,27 @@
         "type": "github"
       }
     },
+    "nix-index": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734697770,
+        "narHash": "sha256-pPJSqSwVQ1XagigG8sfpBweqTJp6IfEAGmxhcAk4tDg=",
+        "owner": "gvolpe",
+        "repo": "nix-index",
+        "rev": "dc0329df4bfe76b326756c2b7f3a811d5e910e2f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gvolpe",
+        "repo": "nix-index",
+        "type": "github"
+      }
+    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": [
@@ -1163,7 +1200,7 @@
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
         "flake-parts": "flake-parts_3",
         "git-hooks": "git-hooks_2",
         "home-manager": "home-manager_3",
@@ -1296,6 +1333,7 @@
         "hyprland": "hyprland",
         "nix-darwin": "nix-darwin",
         "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
+        "nix-index": "nix-index",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixos-unified": "nixos-unified_2",
diff --git a/flake.nix b/flake.nix
index 3f92e8f..713682f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,11 @@
     nixos-vscode-server.url = "github:nix-community/nixos-vscode-server";
     nix-index-database.url = "github:nix-community/nix-index-database";
     nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+    nix-index = {
+      # Fork with flake support https://github.com/gvolpe/nix-index/pull/1
+      url = "github:gvolpe/nix-index";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     actualism-app.url = "github:srid/actualism-app";
     omnix.url = "github:juspay/omnix";
     hyprland.url = "github:hyprwm/Hyprland/v0.45.2";
diff --git a/modules/flake-parts/nixos-flake.nix b/modules/flake-parts/nixos-flake.nix
index a0addbf..26c031c 100644
--- a/modules/flake-parts/nixos-flake.nix
+++ b/modules/flake-parts/nixos-flake.nix
@@ -16,6 +16,7 @@
         "nix-darwin"
         "nixos-unified"
         "nix-index-database"
+        "nix-index"
         "nixvim"
         "omnix"
       ];
diff --git a/modules/home/all/terminal.nix b/modules/home/all/terminal.nix
index fe7b683..ff1c77c 100644
--- a/modules/home/all/terminal.nix
+++ b/modules/home/all/terminal.nix
@@ -60,11 +60,14 @@ in
   };
 
   programs = {
-    nix-index = {
+    # Command not found handler based on nixpkgs
+    nix-index-fork = {
       enable = true;
       enableZshIntegration = true;
+      enableNixCommand = true;
     };
     nix-index-database.comma.enable = true;
+
     lsd = {
       enable = true;
       enableAliases = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index f82329b..18ec3a5 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -11,6 +11,7 @@ in
       users.users.${config.me.username}.isNormalUser = true;
       home-manager.users.${config.me.username} = { };
       home-manager.sharedModules = [
+        inputs.nix-index.homeManagerModules.${pkgs.system}.default
         self.homeModules.default
         self.homeModules.linux-only
       ];