Skip to content

Revert "treewide: disable programs.nix-index.enable option by default" #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2025
Merged

Revert "treewide: disable programs.nix-index.enable option by default" #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 6 additions & 27 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,8 @@ Include the nixos module in your configuration:
modules = [
./configuration.nix
nix-index-database.nixosModules.nix-index

{
programs = {
# Optionally wrap and install pkgs.comma.
nix-index-database.comma.enable = true;

nix-index.enable = true;
};
}
# optional to also wrap and install comma
# { programs.nix-index-database.comma.enable = true; }
];
};
};
Expand Down Expand Up @@ -80,15 +73,8 @@ You can then call `nix-locate` as usual, it will automatically use the database
modules = [
./configuration.nix
nix-index-database.darwinModules.nix-index

{
programs = {
# Optionally wrap and install pkgs.comma.
nix-index-database.comma.enable = true;

nix-index.enable = true;
};
}
# optional to also wrap and install comma
# { programs.nix-index-database.comma.enable = true; }
];
};
};
Expand Down Expand Up @@ -128,15 +114,8 @@ You can then call `nix-locate` as usual, it will automatically use the database

modules = [
nix-index-database.hmModules.nix-index

{
programs = {
# Optionally wrap and install pkgs.comma.
nix-index-database.comma.enable = true;

nix-index.enable = true;
};
}
# optional to also wrap and install comma
# { programs.nix-index-database.comma.enable = true; }
];
};
};
Expand Down
2 changes: 2 additions & 0 deletions nix/shared.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@
options = {
programs.nix-index-database.comma.enable = lib.mkEnableOption "wrapping comma with nix-index-database and put it in the PATH";
};

config.programs.nix-index.enable = lib.mkDefault true;
}
6 changes: 1 addition & 5 deletions tests.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@
{
programs.command-not-found.enable = false;

programs = {
nix-index-database.comma.enable = true;
nix-index.enable = true;
};

programs.nix-index-database.comma.enable = true;
# Point comma at our nixpkgs instance.
# Passing --nixpkgs-flake instead seems to fail when nix tries to use the network.
nix.nixPath = [ "nixpkgs=${nixpkgs}" ];
Expand Down