From d4fe1a9be97528da6ee591e950d51a5bdbd77fd5 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sun, 22 Dec 2024 16:47:08 -0500 Subject: [PATCH] use fork of nix-index-database --- flake.lock | 19 +++++++++++-------- flake.nix | 11 ++++++++--- modules/home/all/nix-index.nix | 6 ++++-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index a8f0bee..a9eb2d0 100644 --- a/flake.lock +++ b/flake.lock @@ -900,16 +900,19 @@ "nix-index": { "inputs": { "flake-compat": "flake-compat_2", + "nix-index-database": [ + "nix-index-database" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1734697770, - "narHash": "sha256-pPJSqSwVQ1XagigG8sfpBweqTJp6IfEAGmxhcAk4tDg=", + "lastModified": 1734902568, + "narHash": "sha256-X4CzMp+L7jBL9gQemTvhT8rDhE+8LYqn9bAZB8TVIoU=", "owner": "gvolpe", "repo": "nix-index", - "rev": "dc0329df4bfe76b326756c2b7f3a811d5e910e2f", + "rev": "14644fb1a4bfcd1cd620c90875dd5661f26ca94a", "type": "github" }, "original": { @@ -925,15 +928,15 @@ ] }, "locked": { - "lastModified": 1734234111, - "narHash": "sha256-icEMqBt4HtGH52PU5FHidgBrNJvOfXH6VQKNtnD1aw8=", - "owner": "nix-community", + "lastModified": 1734886205, + "narHash": "sha256-vaODlEr6aOLEmbhPrQ8j5xWr8UHcXbZx2ulvBIDMf5w=", + "owner": "gvolpe", "repo": "nix-index-database", - "rev": "311d6cf3ad3f56cb051ffab1f480b2909b3f754d", + "rev": "07f7fcb8de6ee50a472a119a02616fb1ed67a25f", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "gvolpe", "repo": "nix-index-database", "type": "github" } diff --git a/flake.nix b/flake.nix index 713682f..7c59387 100644 --- a/flake.nix +++ b/flake.nix @@ -20,13 +20,18 @@ github-nix-ci.url = "github:juspay/github-nix-ci"; nixos-vscode-server.flake = false; 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"; + + # Fork with flake support https://github.com/gvolpe/nix-index/pull/1 nix-index = { - # Fork with flake support https://github.com/gvolpe/nix-index/pull/1 url = "github:gvolpe/nix-index"; + inputs.nix-index-database.follows = "nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-index-database = { + url = "github:gvolpe/nix-index-database"; + 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/home/all/nix-index.nix b/modules/home/all/nix-index.nix index 178e8da..ddf7bae 100644 --- a/modules/home/all/nix-index.nix +++ b/modules/home/all/nix-index.nix @@ -1,5 +1,5 @@ # Platform-independent terminal setup -{ flake, ... }: +{ flake, pkgs, ... }: let inherit (flake) inputs; @@ -15,7 +15,9 @@ in enable = true; enableZshIntegration = true; enableNixCommand = true; + database = inputs.nix-index-database.packages.${pkgs.system}.nix-index-small-database; }; - nix-index-database.comma.enable = true; + command-not-found.enable = false; + # nix-index-database.comma.enable = true; }; }